summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt11
-rwxr-xr-xConfig25
-rw-r--r--Makefile.win3296
-rw-r--r--aclocal.m456
-rw-r--r--anope.m456
-rwxr-xr-xconfigure1607
-rw-r--r--configure.in4
-rw-r--r--include/Makefile4
-rw-r--r--include/makefile.win3225
-rw-r--r--include/sysconf.h.in238
-rw-r--r--include/sysconf.h.win3243
-rw-r--r--install-sh (renamed from install.sh)0
-rw-r--r--lang/Makefile26
-rw-r--r--lang/Makefile.win3275
-rw-r--r--makefile.inc.win3218
-rwxr-xr-xrun-cc.pl17
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/Makefile4
-rw-r--r--src/core/Makefile.win3224
-rw-r--r--src/makefile.win32117
-rw-r--r--src/modules/makefile.inc.win322
-rw-r--r--src/modules/makefile.sub.win3219
-rw-r--r--src/modules/makefile.win3241
-rw-r--r--src/protocol/Makefile.win3229
-rw-r--r--src/tools/Makefile2
-rw-r--r--src/tools/Makefile.win3229
-rw-r--r--src/win32.rc.template90
27 files changed, 355 insertions, 2307 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a56c1d4f6..8b3d6c544 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,11 @@ if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW)
endif(COMMAND cmake_policy)
+# If the Source dir and the Binary dir are the same, we are building in-source, which we will disallow due to Autotools being there (but only on non-Windows)
+if(${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_BINARY_DIR} AND NOT WIN32)
+ message(FATAL_ERROR "You can not use CMake to build Anope from the root of it's source tree! Remove the CMakeCache.txt file from this directory, then create a separate directory (either below this directory or elsewhere), and then re-run CMake from there.")
+endif(${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_BINARY_DIR} AND NOT WIN32)
+
# Detect is we are using CMake 2.6 or better, these versions include functions that require less work than CMake 2.4 does
if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
set(CMAKE26_OR_BETTER TRUE)
@@ -286,9 +291,9 @@ find_program(PERL perl)
# If perl is included on the system and the user wants to use run-cc.pl, change the commands for compiling and linking
if(PERL AND USE_RUN_CC_PL)
- set(CMAKE_CXX_COMPILE_OBJECT "${PERL} ${Anope_SOURCE_DIR}/run-cc.pl ${CMAKE_CXX_COMPILE_OBJECT}")
- set(CMAKE_CXX_LINK_EXECUTABLE "${PERL} ${Anope_SOURCE_DIR}/run-cc.pl ${CMAKE_CXX_LINK_EXECUTABLE}")
- set(CMAKE_CXX_CREATE_SHARED_MODULE "${PERL} ${Anope_SOURCE_DIR}/run-cc.pl ${CMAKE_CXX_CREATE_SHARED_MODULE}")
+ set(CMAKE_CXX_COMPILE_OBJECT "${PERL} ${Anope_SOURCE_DIR}/run-cc.pl -q ${CMAKE_CXX_COMPILE_OBJECT}")
+ set(CMAKE_CXX_LINK_EXECUTABLE "${PERL} ${Anope_SOURCE_DIR}/run-cc.pl -q ${CMAKE_CXX_LINK_EXECUTABLE}")
+ set(CMAKE_CXX_CREATE_SHARED_MODULE "${PERL} ${Anope_SOURCE_DIR}/run-cc.pl -q ${CMAKE_CXX_CREATE_SHARED_MODULE}")
endif(PERL AND USE_RUN_CC_PL)
# If a INSTDIR was passed in to CMake, use it as the install prefix, otherwise set the default install prefix to the services directory under the user's home directory
diff --git a/Config b/Config
index afee1b0a8..dc7f91b5f 100755
--- a/Config
+++ b/Config
@@ -44,9 +44,9 @@ Run_Build_System () {
RUN_CC_PL=""
GEN_TYPE=""
- if [ "$INSTDEST" != "" ] ; then
+ if [ "$INSTDIR" != "" ] ; then
if [ "$BUILD_SYSTEM" = "cmake" ] ; then
- WITH_INST="-DINSTDIR:STRING=$INSTDEST"
+ WITH_INST="-DINSTDIR:STRING=$INSTDIR"
else
WITH_INST="--with-instdir=$INSTDIR"
fi
@@ -84,7 +84,10 @@ Run_Build_System () {
if [ "$BUILD_SYSTEM" = "cmake" ] ; then
RUN_CC_PL="-DUSE_RUN_CC_PL:BOOLEAN=ON"
else
- RUN_CC_PL="--with-makebin=run-cc.pl"
+ pwdsave=`pwd`
+ cd "`dirname $SOURCE_DIR/run-cc.pl`"
+ RUN_CC_PL="--with-makebin=`pwd`/run-cc.pl"
+ cd "$pwdsave"
fi
else
if [ "$BUILD_SYSTEM" = "cmake" ] ; then
@@ -132,10 +135,10 @@ export ECHO2 ECHO2SUF
###########################################################################
BUILD_SYSTEM="cmake"
-INSTDEST=$HOME/services
+INSTDIR=$HOME/services
RUNGROUP=
UMASK=
-DEBUG="no"
+DEBUG="yes"
USE_RUN_CC_PL="no"
CAN_QUICK="no"
SOURCE_DIR=`dirname $0`
@@ -209,7 +212,7 @@ export ok INPUT
ok=0
echo "Note: press Return for the default, or enter a new value."
echo "Are you using configure or cmake?"
-while [ $ok -qe 0 ] ; do
+while [ $ok -eq 0 ] ; do
echo2 "[$BUILD_SYSTEM] "
if read INPUT ; then : ; else echo "" ; exit 1 ; fi
if [ ! "$INPUT" ] ; then
@@ -228,14 +231,16 @@ while [ $ok -qe 0 ] ; do
;;
esac
done
+BUILD_SYSTEM=$INPUT
+echo ""
ok=0
echo "In what directory do you want the binaries to be installed?"
while [ $ok -eq 0 ] ; do
- echo2 "[$INSTDEST] "
+ echo2 "[$INSTDIR] "
if read INPUT ; then : ; else echo "" ; exit 1 ; fi
if [ ! "$INPUT" ] ; then
- INPUT=$INSTDEST
+ INPUT=$INSTDIR
fi
if [ ! -d "$INPUT" ] ; then
if exists "$INPUT" ; then
@@ -256,7 +261,7 @@ while [ $ok -eq 0 ] ; do
ok=1
fi
done
-INSTDEST=$INPUT
+INSTDIR=$INPUT
echo ""
@@ -366,7 +371,7 @@ echo2 "Saving configuration results in config.cache... "
cat <<EOT >$SOURCE_DIR/config.cache
BUILD_SYSTEM="$BUILD_SYSTEM"
-INSTDEST="$INSTDEST"
+INSTDIR="$INSTDIR"
RUNGROUP="$RUNGROUP"
UMASK=$UMASK
DEBUG="$DEBUG"
diff --git a/Makefile.win32 b/Makefile.win32
deleted file mode 100644
index a6dfe119b..000000000
--- a/Makefile.win32
+++ /dev/null
@@ -1,96 +0,0 @@
-# Makefile for Anope.
-#
-# (C) 2003-2008 Anope Team
-# Contact us at info@anope.org
-#
-# This program is free but copyrighted software; see the file COPYING for
-# details.
-#
-# Based on the original code of Epona by Lara.
-# Based on the original code of Services by Andy Church.
-
-include Makefile.inc.win32
-
-###########################################################################
-
-all: src core protocols languages tools modules install
-
-src: include\version.h include\sysconf.h include\language.h include\sysconf.h
- cd src && $(MAKE) && cd ..
-
-install:
- -@mkdir $(DATDEST)\backups
- -@mkdir $(DATDEST)\logs
- -@mkdir $(DATDEST)\languages
- cd lang && $(MAKE) install && cd ..
- cd src && $(MAKE) install && cd ..
- cd src\modules && $(MAKE) install && cd ..
- cd src\modules && $(MAKE) subs-install && cd ..
- cd src\protocol && $(MAKE) install && cd ..
- cd src\core && $(MAKE) install && cd ..
- cd src\tools && $(MAKE) install && cd ..
- -@echo ---
- -@echo Anope has been installed successfully!
- -@echo See docs\INSTALL for details on how to configure Anope for use.
- -@echo ---
-
-spotless:
- cd lang && $(MAKE) spotless && cd ..
- cd src && $(MAKE) spotless && cd ..
- cd src\modules && $(MAKE) spotless && cd ..\..
- cd src\protocol && $(MAKE) spotless && cd ..\..
- cd src\core && $(MAKE) spotless && cd ..\..
- cd src\tools && $(MAKE) spotless && cd ..\..
- -@erase include\language.h include\version.h *.manifest *~ anope.exe version.sh.exe *.obj anopesmtp.exe
- -@echo --
- -@echo NOTICE:
- -@echo You will need to run cscript /nologo install.js again
- -@echo --
-
-mypasql:
- $(MYPASQL_BUILD)
-
-distclean: spotless
-
-clean: spotless
-
-###########################################################################
-
-
-languages: FRC
- cd lang && $(MAKE) && cd ..
-
-tools: FRC
- cd src\tools && $(MAKE) && cd ..\..
-
-core: FRC
- cd src\core && $(MAKE) && cd ..\..
-
-protocols: FRC
- cd src\protocol && $(MAKE) && cd ..\..
-
-modules: FRC
- cd src\modules && $(MAKE) && cd ..\..
-
-###########################################################################
-
-include\sysconf.h:
- copy include\sysconf.h.win32 include\sysconf.h
-
-lang\language.h: lang\Makefile lang\index
- cd lang && $(MAKE) language.h && cd ..
-
-lang\index:
- cd lang && $(MAKE) index && cd ..
-
-include\language.h: lang\language.h
- cd lang && copy language.h ..\include\language.h && cd ..
-
-include\version.h: version.sh.exe version.log include\services.h include\pseudo.h include\messages.h
- version.sh.exe
- move version.h include\version.h
-
-version.sh.exe:
- $(CC) $(BASE_CFLAGS) include\version.sh.c /link $(LFLAGS)
-
-FRC:
diff --git a/aclocal.m4 b/aclocal.m4
index 0d17d95bd..c2a6ca0bb 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -835,29 +835,37 @@ dnl Check the size of several types and define a valid int16_t and int32_t.
dnl
AC_DEFUN(anope_CHECK_TYPE_SIZES,
[dnl Check type sizes
-AC_CHECK_SIZEOF(short)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
-if test "$ac_cv_sizeof_int" = 2 ; then
- AC_CHECK_TYPE(int16_t, int)
- AC_CHECK_TYPE(u_int16_t, unsigned int)
-elif test "$ac_cv_sizeof_short" = 2 ; then
- AC_CHECK_TYPE(int16_t, short)
- AC_CHECK_TYPE(u_int16_t, unsigned short)
-else
- AC_MSG_ERROR([Cannot find a type with size of 16 bits])
-fi
-if test "$ac_cv_sizeof_int" = 4 ; then
- AC_CHECK_TYPE(int32_t, int)
- AC_CHECK_TYPE(u_int32_t, unsigned int)
-elif test "$ac_cv_sizeof_short" = 4 ; then
- AC_CHECK_TYPE(int32_t, short)
- AC_CHECK_TYPE(u_int32_t, unsigned short)
-elif test "$ac_cv_sizeof_long" = 4 ; then
- AC_CHECK_TYPE(int32_t, long)
- AC_CHECK_TYPE(u_int32_t, unsigned long)
-else
- AC_MSG_ERROR([Cannot find a type with size of 32 bits])
-fi
+dnl AC_CHECK_SIZEOF(short)
+dnl AC_CHECK_SIZEOF(int)
+dnl AC_CHECK_SIZEOF(long)
+dnl if test "$ac_cv_sizeof_int" = 2 ; then
+dnl AC_CHECK_TYPE(int16_t, int)
+dnl AC_CHECK_TYPE(u_int16_t, unsigned int)
+dnl elif test "$ac_cv_sizeof_short" = 2 ; then
+dnl AC_CHECK_TYPE(int16_t, short)
+dnl AC_CHECK_TYPE(u_int16_t, unsigned short)
+dnl else
+dnl AC_MSG_ERROR([Cannot find a type with size of 16 bits])
+dnl fi
+dnl if test "$ac_cv_sizeof_int" = 4 ; then
+dnl AC_CHECK_TYPE(int32_t, int)
+dnl AC_CHECK_TYPE(u_int32_t, unsigned int)
+dnl elif test "$ac_cv_sizeof_short" = 4 ; then
+dnl AC_CHECK_TYPE(int32_t, short)
+dnl AC_CHECK_TYPE(u_int32_t, unsigned short)
+dnl elif test "$ac_cv_sizeof_long" = 4 ; then
+dnl AC_CHECK_TYPE(int32_t, long)
+dnl AC_CHECK_TYPE(u_int32_t, unsigned long)
+dnl else
+dnl AC_MSG_ERROR([Cannot find a type with size of 32 bits])
+dnl fi
+AC_CHECK_TYPE(uint8_t, AC_DEFINE(HAVE_UINT8_T, 1, "Has uint8_t type"))
+AC_CHECK_TYPE(u_int8_t, AC_DEFINE(HAVE_U_INT8_T, 1, "Has u_int8_t type"))
+AC_CHECK_TYPE(int16_t, AC_DEFINE(HAVE_INT16_T, 1, "Has int16_t type"))
+AC_CHECK_TYPE(uint16_t, AC_DEFINE(HAVE_UINT16_T, 1, "Has uint16_t type"))
+AC_CHECK_TYPE(u_int16_t, AC_DEFINE(HAVE_U_INT16_T, 1, "Has u_int16_t type"))
+AC_CHECK_TYPE(int32_t, AC_DEFINE(HAVE_INT32_T, 1, "Has int32_t type"))
+AC_CHECK_TYPE(uint32_t, AC_DEFINE(HAVE_UINT32_T, 1, "Has uint32_t type"))
+AC_CHECK_TYPE(u_int32_t, AC_DEFINE(HAVE_U_INT32_T, 1, "Has u_int32_t type"))
])
diff --git a/anope.m4 b/anope.m4
index 56e750dd3..fbcac3f7b 100644
--- a/anope.m4
+++ b/anope.m4
@@ -4,28 +4,36 @@ dnl Check the size of several types and define a valid int16_t and int32_t.
dnl
AC_DEFUN(anope_CHECK_TYPE_SIZES,
[dnl Check type sizes
-AC_CHECK_SIZEOF(short)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
-if test "$ac_cv_sizeof_int" = 2 ; then
- AC_CHECK_TYPE(int16_t, int)
- AC_CHECK_TYPE(u_int16_t, unsigned int)
-elif test "$ac_cv_sizeof_short" = 2 ; then
- AC_CHECK_TYPE(int16_t, short)
- AC_CHECK_TYPE(u_int16_t, unsigned short)
-else
- AC_MSG_ERROR([Cannot find a type with size of 16 bits])
-fi
-if test "$ac_cv_sizeof_int" = 4 ; then
- AC_CHECK_TYPE(int32_t, int)
- AC_CHECK_TYPE(u_int32_t, unsigned int)
-elif test "$ac_cv_sizeof_short" = 4 ; then
- AC_CHECK_TYPE(int32_t, short)
- AC_CHECK_TYPE(u_int32_t, unsigned short)
-elif test "$ac_cv_sizeof_long" = 4 ; then
- AC_CHECK_TYPE(int32_t, long)
- AC_CHECK_TYPE(u_int32_t, unsigned long)
-else
- AC_MSG_ERROR([Cannot find a type with size of 32 bits])
-fi
+dnl AC_CHECK_SIZEOF(short)
+dnl AC_CHECK_SIZEOF(int)
+dnl AC_CHECK_SIZEOF(long)
+dnl if test "$ac_cv_sizeof_int" = 2 ; then
+dnl AC_CHECK_TYPE(int16_t, int)
+dnl AC_CHECK_TYPE(u_int16_t, unsigned int)
+dnl elif test "$ac_cv_sizeof_short" = 2 ; then
+dnl AC_CHECK_TYPE(int16_t, short)
+dnl AC_CHECK_TYPE(u_int16_t, unsigned short)
+dnl else
+dnl AC_MSG_ERROR([Cannot find a type with size of 16 bits])
+dnl fi
+dnl if test "$ac_cv_sizeof_int" = 4 ; then
+dnl AC_CHECK_TYPE(int32_t, int)
+dnl AC_CHECK_TYPE(u_int32_t, unsigned int)
+dnl elif test "$ac_cv_sizeof_short" = 4 ; then
+dnl AC_CHECK_TYPE(int32_t, short)
+dnl AC_CHECK_TYPE(u_int32_t, unsigned short)
+dnl elif test "$ac_cv_sizeof_long" = 4 ; then
+dnl AC_CHECK_TYPE(int32_t, long)
+dnl AC_CHECK_TYPE(u_int32_t, unsigned long)
+dnl else
+dnl AC_MSG_ERROR([Cannot find a type with size of 32 bits])
+dnl fi
+AC_CHECK_TYPE(uint8_t, AC_DEFINE(HAVE_UINT8_T, 1, "Has uint8_t type"))
+AC_CHECK_TYPE(u_int8_t, AC_DEFINE(HAVE_U_INT8_T, 1, "Has u_int8_t type"))
+AC_CHECK_TYPE(int16_t, AC_DEFINE(HAVE_INT16_T, 1, "Has int16_t type"))
+AC_CHECK_TYPE(uint16_t, AC_DEFINE(HAVE_UINT16_T, 1, "Has uint16_t type"))
+AC_CHECK_TYPE(u_int16_t, AC_DEFINE(HAVE_U_INT16_T, 1, "Has u_int16_t type"))
+AC_CHECK_TYPE(int32_t, AC_DEFINE(HAVE_INT32_T, 1, "Has int32_t type"))
+AC_CHECK_TYPE(uint32_t, AC_DEFINE(HAVE_UINT32_T, 1, "Has uint32_t type"))
+AC_CHECK_TYPE(u_int32_t, AC_DEFINE(HAVE_U_INT32_T, 1, "Has u_int32_t type"))
])
diff --git a/configure b/configure
index d266f71f7..04995434f 100755
--- a/configure
+++ b/configure
@@ -4615,17 +4615,12 @@ fi
MODULEFLAGS=$ac_cv_pic
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of short" >&5
-$as_echo_n "checking size of short... " >&6; }
-if test "${ac_cv_sizeof_short+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking for uint8_t" >&5
+$as_echo_n "checking for uint8_t... " >&6; }
+if test "${ac_cv_type_uint8_t+set}" = set; then
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
+ ac_cv_type_uint8_t=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -4636,201 +4631,8 @@ $ac_includes_default
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= 0)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) < 0)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
-test_array [0] = 0
-
+if (sizeof (uint8_t))
+ return 0;
;
return 0;
}
@@ -4853,29 +4655,6 @@ $as_echo "$ac_try_echo") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_short=$ac_lo;;
-'') if test "$ac_cv_type_short" = yes; then
- { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (short)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }
- else
- ac_cv_sizeof_short=0
- fi ;;
-esac
-else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -4883,245 +4662,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-static long int longval () { return (long int) (sizeof (short)); }
-static unsigned long int ulongval () { return (long int) (sizeof (short)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
- if (((long int) (sizeof (short))) < 0)
- {
- long int i = longval ();
- if (i != ((long int) (sizeof (short))))
- return 1;
- fprintf (f, "%ld", i);
- }
- else
- {
- unsigned long int i = ulongval ();
- if (i != ((long int) (sizeof (short))))
- return 1;
- fprintf (f, "%lu", i);
- }
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_short=`cat conftest.val`
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_short" = yes; then
- { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (short)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }
- else
- ac_cv_sizeof_short=0
- fi
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-$as_echo "$ac_cv_sizeof_short" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SHORT $ac_cv_sizeof_short
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of int" >&5
-$as_echo_n "checking size of int... " >&6; }
-if test "${ac_cv_sizeof_int+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= 0)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) < 0)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= $ac_mid)];
-test_array [0] = 0
-
+if (sizeof ((uint8_t)))
+ return 0;
;
return 0;
}
@@ -5144,198 +4689,40 @@ $as_echo "$ac_try_echo") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
+ :
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
+ ac_cv_type_uint8_t=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_lo= ac_hi=
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint8_t" >&5
+$as_echo "$ac_cv_type_uint8_t" >&6; }
+if test $ac_cv_type_uint8_t = yes; then
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_int=$ac_lo;;
-'') if test "$ac_cv_type_int" = yes; then
- { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }
- else
- ac_cv_sizeof_int=0
- fi ;;
-esac
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_UINT8_T 1
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-static long int longval () { return (long int) (sizeof (int)); }
-static unsigned long int ulongval () { return (long int) (sizeof (int)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
- if (((long int) (sizeof (int))) < 0)
- {
- long int i = longval ();
- if (i != ((long int) (sizeof (int))))
- return 1;
- fprintf (f, "%ld", i);
- }
- else
- {
- unsigned long int i = ulongval ();
- if (i != ((long int) (sizeof (int))))
- return 1;
- fprintf (f, "%lu", i);
- }
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_int=`cat conftest.val`
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_int" = yes; then
- { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }
- else
- ac_cv_sizeof_int=0
- fi
fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-$as_echo "$ac_cv_sizeof_int" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT $ac_cv_sizeof_int
-_ACEOF
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if test "${ac_cv_sizeof_long+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking for u_int8_t" >&5
+$as_echo_n "checking for u_int8_t... " >&6; }
+if test "${ac_cv_type_u_int8_t+set}" = set; then
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
+ ac_cv_type_u_int8_t=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5346,100 +4733,8 @@ $ac_includes_default
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_lo=0 ac_mid=0
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid; break
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr $ac_mid + 1`
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
-test_array [0] = 0
-
+if (sizeof (u_int8_t))
+ return 0;
;
return 0;
}
@@ -5462,9 +4757,7 @@ $as_echo "$ac_try_echo") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_hi=-1 ac_mid=-1
- while :; do
- cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5474,9 +4767,8 @@ $ac_includes_default
int
main ()
{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
-test_array [0] = 0
-
+if (sizeof ((u_int8_t)))
+ return 0;
;
return 0;
}
@@ -5499,189 +4791,35 @@ $as_echo "$ac_try_echo") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_lo=$ac_mid; break
+ :
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_hi=`expr '(' $ac_mid ')' - 1`
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- ac_mid=`expr 2 '*' $ac_mid`
+ ac_cv_type_u_int8_t=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_lo= ac_hi=
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_hi=$ac_mid
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_lo=`expr '(' $ac_mid ')' + 1`
fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_u_int8_t" >&5
+$as_echo "$ac_cv_type_u_int8_t" >&6; }
+if test $ac_cv_type_u_int8_t = yes; then
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long=$ac_lo;;
-'') if test "$ac_cv_type_long" = yes; then
- { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }
- else
- ac_cv_sizeof_long=0
- fi ;;
-esac
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-static long int longval () { return (long int) (sizeof (long)); }
-static unsigned long int ulongval () { return (long int) (sizeof (long)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
- if (((long int) (sizeof (long))) < 0)
- {
- long int i = longval ();
- if (i != ((long int) (sizeof (long))))
- return 1;
- fprintf (f, "%ld", i);
- }
- else
- {
- unsigned long int i = ulongval ();
- if (i != ((long int) (sizeof (long))))
- return 1;
- fprintf (f, "%lu", i);
- }
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
-}
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_U_INT8_T 1
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_sizeof_long=`cat conftest.val`
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-( exit $ac_status )
-if test "$ac_cv_type_long" = yes; then
- { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }
- else
- ac_cv_sizeof_long=0
- fi
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-rm -f conftest.val
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
-
-
-if test "$ac_cv_sizeof_int" = 2 ; then
- { $as_echo "$as_me:$LINENO: checking for int16_t" >&5
+{ $as_echo "$as_me:$LINENO: checking for int16_t" >&5
$as_echo_n "checking for int16_t... " >&6; }
if test "${ac_cv_type_int16_t+set}" = set; then
$as_echo_n "(cached) " >&6
@@ -5776,126 +4914,19 @@ fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int16_t" >&5
$as_echo "$ac_cv_type_int16_t" >&6; }
if test $ac_cv_type_int16_t = yes; then
- :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define int16_t int
-_ACEOF
-
-fi
-
- { $as_echo "$as_me:$LINENO: checking for u_int16_t" >&5
-$as_echo_n "checking for u_int16_t... " >&6; }
-if test "${ac_cv_type_u_int16_t+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_type_u_int16_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof (u_int16_t))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof ((u_int16_t)))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_u_int16_t=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_u_int16_t" >&5
-$as_echo "$ac_cv_type_u_int16_t" >&6; }
-if test $ac_cv_type_u_int16_t = yes; then
- :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define u_int16_t unsigned int
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_INT16_T 1
_ACEOF
fi
-elif test "$ac_cv_sizeof_short" = 2 ; then
- { $as_echo "$as_me:$LINENO: checking for int16_t" >&5
-$as_echo_n "checking for int16_t... " >&6; }
-if test "${ac_cv_type_int16_t+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking for uint16_t" >&5
+$as_echo_n "checking for uint16_t... " >&6; }
+if test "${ac_cv_type_uint16_t+set}" = set; then
$as_echo_n "(cached) " >&6
else
- ac_cv_type_int16_t=no
+ ac_cv_type_uint16_t=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5906,7 +4937,7 @@ $ac_includes_default
int
main ()
{
-if (sizeof (int16_t))
+if (sizeof (uint16_t))
return 0;
;
return 0;
@@ -5940,7 +4971,7 @@ $ac_includes_default
int
main ()
{
-if (sizeof ((int16_t)))
+if (sizeof ((uint16_t)))
return 0;
;
return 0;
@@ -5969,7 +5000,7 @@ else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_type_int16_t=yes
+ ac_cv_type_uint16_t=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -5982,19 +5013,17 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int16_t" >&5
-$as_echo "$ac_cv_type_int16_t" >&6; }
-if test $ac_cv_type_int16_t = yes; then
- :
-else
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint16_t" >&5
+$as_echo "$ac_cv_type_uint16_t" >&6; }
+if test $ac_cv_type_uint16_t = yes; then
-cat >>confdefs.h <<_ACEOF
-#define int16_t short
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_UINT16_T 1
_ACEOF
fi
- { $as_echo "$as_me:$LINENO: checking for u_int16_t" >&5
+{ $as_echo "$as_me:$LINENO: checking for u_int16_t" >&5
$as_echo_n "checking for u_int16_t... " >&6; }
if test "${ac_cv_type_u_int16_t+set}" = set; then
$as_echo_n "(cached) " >&6
@@ -6089,231 +5118,14 @@ fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_u_int16_t" >&5
$as_echo "$ac_cv_type_u_int16_t" >&6; }
if test $ac_cv_type_u_int16_t = yes; then
- :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define u_int16_t unsigned short
-_ACEOF
-
-fi
-
-else
- { { $as_echo "$as_me:$LINENO: error: Cannot find a type with size of 16 bits" >&5
-$as_echo "$as_me: error: Cannot find a type with size of 16 bits" >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test "$ac_cv_sizeof_int" = 4 ; then
- { $as_echo "$as_me:$LINENO: checking for int32_t" >&5
-$as_echo_n "checking for int32_t... " >&6; }
-if test "${ac_cv_type_int32_t+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_type_int32_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof (int32_t))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof ((int32_t)))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_int32_t=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int32_t" >&5
-$as_echo "$ac_cv_type_int32_t" >&6; }
-if test $ac_cv_type_int32_t = yes; then
- :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define int32_t int
-_ACEOF
-
-fi
-
- { $as_echo "$as_me:$LINENO: checking for u_int32_t" >&5
-$as_echo_n "checking for u_int32_t... " >&6; }
-if test "${ac_cv_type_u_int32_t+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_type_u_int32_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof (u_int32_t))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof ((u_int32_t)))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_u_int32_t=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_u_int32_t" >&5
-$as_echo "$ac_cv_type_u_int32_t" >&6; }
-if test $ac_cv_type_u_int32_t = yes; then
- :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define u_int32_t unsigned int
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_U_INT16_T 1
_ACEOF
fi
-elif test "$ac_cv_sizeof_short" = 4 ; then
- { $as_echo "$as_me:$LINENO: checking for int32_t" >&5
+{ $as_echo "$as_me:$LINENO: checking for int32_t" >&5
$as_echo_n "checking for int32_t... " >&6; }
if test "${ac_cv_type_int32_t+set}" = set; then
$as_echo_n "(cached) " >&6
@@ -6408,126 +5220,19 @@ fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int32_t" >&5
$as_echo "$ac_cv_type_int32_t" >&6; }
if test $ac_cv_type_int32_t = yes; then
- :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define int32_t short
-_ACEOF
-
-fi
-
- { $as_echo "$as_me:$LINENO: checking for u_int32_t" >&5
-$as_echo_n "checking for u_int32_t... " >&6; }
-if test "${ac_cv_type_u_int32_t+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_type_u_int32_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof (u_int32_t))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof ((u_int32_t)))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_type_u_int32_t=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_u_int32_t" >&5
-$as_echo "$ac_cv_type_u_int32_t" >&6; }
-if test $ac_cv_type_u_int32_t = yes; then
- :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define u_int32_t unsigned short
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_INT32_T 1
_ACEOF
fi
-elif test "$ac_cv_sizeof_long" = 4 ; then
- { $as_echo "$as_me:$LINENO: checking for int32_t" >&5
-$as_echo_n "checking for int32_t... " >&6; }
-if test "${ac_cv_type_int32_t+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking for uint32_t" >&5
+$as_echo_n "checking for uint32_t... " >&6; }
+if test "${ac_cv_type_uint32_t+set}" = set; then
$as_echo_n "(cached) " >&6
else
- ac_cv_type_int32_t=no
+ ac_cv_type_uint32_t=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -6538,7 +5243,7 @@ $ac_includes_default
int
main ()
{
-if (sizeof (int32_t))
+if (sizeof (uint32_t))
return 0;
;
return 0;
@@ -6572,7 +5277,7 @@ $ac_includes_default
int
main ()
{
-if (sizeof ((int32_t)))
+if (sizeof ((uint32_t)))
return 0;
;
return 0;
@@ -6601,7 +5306,7 @@ else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_type_int32_t=yes
+ ac_cv_type_uint32_t=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -6614,19 +5319,17 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int32_t" >&5
-$as_echo "$ac_cv_type_int32_t" >&6; }
-if test $ac_cv_type_int32_t = yes; then
- :
-else
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5
+$as_echo "$ac_cv_type_uint32_t" >&6; }
+if test $ac_cv_type_uint32_t = yes; then
-cat >>confdefs.h <<_ACEOF
-#define int32_t long
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_UINT32_T 1
_ACEOF
fi
- { $as_echo "$as_me:$LINENO: checking for u_int32_t" >&5
+{ $as_echo "$as_me:$LINENO: checking for u_int32_t" >&5
$as_echo_n "checking for u_int32_t... " >&6; }
if test "${ac_cv_type_u_int32_t+set}" = set; then
$as_echo_n "(cached) " >&6
@@ -6721,20 +5424,13 @@ fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_u_int32_t" >&5
$as_echo "$ac_cv_type_u_int32_t" >&6; }
if test $ac_cv_type_u_int32_t = yes; then
- :
-else
-cat >>confdefs.h <<_ACEOF
-#define u_int32_t unsigned long
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_U_INT32_T 1
_ACEOF
fi
-else
- { { $as_echo "$as_me:$LINENO: error: Cannot find a type with size of 32 bits" >&5
-$as_echo "$as_me: error: Cannot find a type with size of 32 bits" >&2;}
- { (exit 1); exit 1; }; }
-fi
if test "${ac_cv_header_strings_h+set}" = set; then
@@ -7009,142 +5705,109 @@ _ACEOF
fi
-if test "${ac_cv_header_execinfo_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for execinfo.h" >&5
-$as_echo_n "checking for execinfo.h... " >&6; }
-if test "${ac_cv_header_execinfo_h+set}" = set; then
+
+
+for ac_func in backtrace
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
$as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_execinfo_h" >&5
-$as_echo "$ac_cv_header_execinfo_h" >&6; }
else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking execinfo.h usability" >&5
-$as_echo_n "checking execinfo.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_includes_default
-#include <execinfo.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
- ac_header_compiler=no
-fi
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking execinfo.h presence" >&5
-$as_echo_n "checking execinfo.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <execinfo.h>
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+ ;
+ return 0;
+}
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
}; then
- ac_header_preproc=yes
+ eval "$as_ac_var=yes"
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: execinfo.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: execinfo.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: execinfo.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: execinfo.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: execinfo.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: execinfo.h: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: execinfo.h: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: execinfo.h: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: execinfo.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: execinfo.h: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: execinfo.h: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: execinfo.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: execinfo.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: execinfo.h: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: execinfo.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: execinfo.h: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for execinfo.h" >&5
-$as_echo_n "checking for execinfo.h... " >&6; }
-if test "${ac_cv_header_execinfo_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_header_execinfo_h=$ac_header_preproc
+ eval "$as_ac_var=no"
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_execinfo_h" >&5
-$as_echo "$ac_cv_header_execinfo_h" >&6; }
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
fi
-if test $ac_cv_header_execinfo_h = yes; then
-
-cat >>confdefs.h <<\_ACEOF
+ac_res=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+ cat >>confdefs.h <<\_ACEOF
#define HAVE_BACKTRACE 1
_ACEOF
fi
-
-
+done
for ac_func in stricmp
diff --git a/configure.in b/configure.in
index 05c90255b..b5a7c9be6 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
dnl autoconf.in for Services.
dnl
-dnl Anope (c) 2003-2007 Anope team
+dnl Anope (c) 2003-2008 Anope team
dnl Contact us at dev@anope.org
dnl This program is free but copyrighted software; see the file COPYING for
@@ -226,8 +226,8 @@ anope_CHECK_TYPE_SIZES
AC_CHECK_HEADER(strings.h,AC_DEFINE(HAVE_STRINGS_H,1,""))
AC_CHECK_HEADER(sys/select.h,AC_DEFINE(HAVE_SYS_SELECT_H,1,""))
-AC_CHECK_HEADER(execinfo.h,AC_DEFINE(HAVE_BACKTRACE,1,""))
+AC_CHECK_FUNCS(backtrace,AC_DEFINE(HAVE_BACKTRACE,1))
AC_CHECK_FUNCS(stricmp,AC_DEFINE(HAVE_STRICMP,1))
AC_CHECK_FUNCS(strcasecmp,AC_DEFINE(HAVE_STRCASECMP,1))
AC_CHECK_FUNCS(gettimeofday,AC_DEFINE(HAVE_GETTIMEOFDAY,1))
diff --git a/include/Makefile b/include/Makefile
index b5641c71b..d4d8f5952 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -2,7 +2,7 @@
all: services.h extern.h pseudo.h version.h
version.h: Makefile version.sh services.h pseudo.h messages.h $(SRCS)
- sh version.sh
+ sh version.sh ../version.log $@
services.h: sysconf.h config.h extern.h
touch $@
@@ -13,7 +13,7 @@ extern.h: slist.h
pseudo.h: commands.h timeout.h encrypt.h datafiles.h slist.h
touch $@
-clean:
+clean:
(rm -f language.h)
distclean: clean
diff --git a/include/makefile.win32 b/include/makefile.win32
deleted file mode 100644
index f66dd48b6..000000000
--- a/include/makefile.win32
+++ /dev/null
@@ -1,25 +0,0 @@
-# Make file for Win32
-#
-# (C) 2003-2008 Anope Team
-# Contact us at info@anope.org
-#
-# Please read COPYING and README for further details.
-#
-# Based on the original code of Epona by Lara.
-# Based on the original code of Services by Andy Church.
-#
-# $Id:$
-#
-
-###########################################################################
-
-clean:
- -@erase language.h
-
-spotless: clean
- -@erase sysconf.h version.h
-
-distclean: spotless
-
-
-FRC:
diff --git a/include/sysconf.h.in b/include/sysconf.h.in
index 5f6137deb..5acfa3d74 100644
--- a/include/sysconf.h.in
+++ b/include/sysconf.h.in
@@ -1,168 +1,122 @@
-/* include/sysconf.h.in. Generated from configure.in by autoheader. */
+#ifndef _SYSCONF_H_
+#define _SYSCONF_H_
-/* "Default umask Permissions" */
#undef DEFUMASK
-
-/* "No prefix needed for dlopen" */
-#undef DL_PREFIX
-
-/* "Has sys/types.h" */
-#undef HAS_SYS_TYPES_H
-
-/* "" */
+#undef HAVE_SYS_TYPES_H
+#undef HAVE_STDINT_H
+#undef HAVE_STDDEF_H
#undef HAVE_BACKTRACE
-
-/* Define to 1 if you have the `fork' function. */
-#undef HAVE_FORK
-
-/* Define to 1 if you have the `gethostbyname' function. */
#undef HAVE_GETHOSTBYNAME
-
-/* Define to 1 if you have the `gethostbyname_r' function. */
-#undef HAVE_GETHOSTBYNAME_R
-
-/* Define to 1 if you have the `gettimeofday' function. */
#undef HAVE_GETTIMEOFDAY
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `setgrent' function. */
#undef HAVE_SETGRENT
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the `strcasecmp' function. */
#undef HAVE_STRCASECMP
-
-/* Define to 1 if you have the `stricmp' function. */
#undef HAVE_STRICMP
-
-/* "" */
#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the `strlcat' function. */
#undef HAVE_STRLCAT
-
-/* Define to 1 if you have the `strlcpy' function. */
#undef HAVE_STRLCPY
-
-/* "" */
#undef HAVE_SYS_SELECT_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the `umask' function. */
#undef HAVE_UMASK
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* va_list as array */
#undef HAVE_VA_LIST_AS_ARRAY
-
-/* "Has mysql/mysql.h" */
-#undef MYSQL_HEADER_PREFIX
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* "Run group" */
#undef RUNGROUP
-
-/* "Binary Dir" */
-#undef SERVICES_BIN
-
-/* "services bin dir" */
-#undef SERVICES_DIR
-
-/* The size of a `int', as computed by sizeof. */
-#undef SIZEOF_INT
-
-/* The size of a `long', as computed by sizeof. */
-#undef SIZEOF_LONG
-
-/* The size of a `short', as computed by sizeof. */
-#undef SIZEOF_SHORT
-
-/* "modules not available" */
-#undef STATIC_LINKING
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define to `short' if <sys/types.h> does not define. */
-#undef int16_t
-
-/* Define to `long' if <sys/types.h> does not define. */
-#undef int32_t
-
-/* Define to `unsigned short' if <sys/types.h> does not define. */
-#undef u_int16_t
-
-/* Define to `unsigned long' if <sys/types.h> does not define. */
-#undef u_int32_t
-
-/* Static config, copy from here to below before running autoheader! */
-
-#ifndef BIG_ENDIAN
-
-/* Big Endian system */
-#undef BIG_ENDIAN
-
+#define SERVICES_BIN "services"
+
+#undef HAVE_UINT8_T
+#undef HAVE_U_INT8_T
+#undef HAVE_INT16_T
+#undef HAVE_UINT16_T
+#undef HAVE_U_INT16_T
+#undef HAVE_INT32_T
+#undef HAVE_UINT32_T
+#undef HAVE_U_INT32_T
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
#endif
-
-#ifndef LITTLE_ENDIAN
-
-/* Little Endian system */
-#undef LITTLE_ENDIAN
-
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
#endif
-
-/**
- * NOTE: BIG_ENDIAN and LITTLE_ENDIAN defines should not be left in
- * by autoheader as they may be defined or may not be, as such we check
- * if there defined before messing with them!
- **/
-
-#ifdef HAS_SYS_TYPES_H
-#include <sys/types.h>
+#ifdef HAVE_STDDEF_H
+# include <stddef.h>
#endif
-#ifdef __STRICT_ANSI__
-#include <stdarg.h>
-#include <stdio.h>
+#ifdef HAVE_UINT8_T
+typedef uint8_t uint8;
+#else
+# ifdef HAVE_U_INT8_T
+typedef u_int8_t uint8;
+# else
+# ifdef _WIN32
+typedef unsigned __int8 uint8;
+# else
+typedef unsigned short uint8;
+# endif
+# endif
#endif
-
+#ifdef HAVE_INT16_T
typedef int16_t int16;
+#else
+# ifdef _WIN32
+typedef signed __int16 int16;
+# else
+typedef int int16;
+# endif
+#endif
+
+#ifdef HAVE_UINT16_T
+typedef uint16_t uint16;
+#else
+# ifdef HAVE_U_INT16_T
typedef u_int16_t uint16;
+# else
+# ifdef _WIN32
+typedef unsigned __int16 uint16;
+# else
+typedef unsigned int uint16;
+# endif
+# endif
+#endif
+
+#ifdef HAVE_INT32_T
typedef int32_t int32;
+#else
+# ifdef _WIN32
+typedef signed __int32 int32;
+# else
+typedef long int32;
+# endif
+#endif
+
+#ifdef HAVE_UINT32_T
+typedef uint32_t uint32;
+#else
+# ifdef HAVE_U_INT32_T
typedef u_int32_t uint32;
+# else
+# ifdef _WIN32
+typedef unsigned __int32 uint32;
+# else
+typedef unsigned long uint32;
+# endif
+# endif
+#endif
+
+#ifdef _WIN32
+# ifdef MSVCPP
+# define snprintf _snprintf
+# endif
+# define popen _popen
+# define pclose _pclose
+# define ftruncate _chsize
+# ifdef MSVCPP
+# define PATH_MAX MAX_PATH
+# endif
+# define MAXPATHLEN MAX_PATH
+# define bzero(buf, size) memset(buf, 0, size)
+# ifdef MSVCPP
+# define strcasecmp stricmp
+# endif
+# define sleep(x) Sleep(x * 1000)
+#endif
+#endif
diff --git a/include/sysconf.h.win32 b/include/sysconf.h.win32
deleted file mode 100644
index 052f140e4..000000000
--- a/include/sysconf.h.win32
+++ /dev/null
@@ -1,43 +0,0 @@
-
-#define SERVICES_DIR "data"
-#define SERVICES_BIN "anope.exe"
-
-typedef signed __int16 int16;
-typedef signed __int16 int16_t;
-typedef unsigned __int16 uint16;
-typedef unsigned __int16 u_int16_t;
-typedef signed __int32 int32;
-typedef signed __int32 int32_t;
-typedef unsigned __int32 uint32;
-typedef unsigned __int32 u_int32_t;
-typedef unsigned __int8 u_int8_t;
-
-#define HAVE_STRINGS_H 0
-#define HAVE_SYS_SELECT_H 0
-#define HAVE_SYS_SYSPROTO_H 0
-
-#define HAVE_STRICMP 1
-#define HAVE_STRCASECMP 0
-#define HAVE_STRSIGNAL 0
-#define HAVE_GETTIMEOFDAY 0
-#define HAVE_SETGRENT 0
-#define HAVE_UMASK 0
-#define HAVE_FORK 0
-#define HAVE_GETHOSTBYNAME 1
-#define HAVE_BACKTRACE 0
-
-/* Enable Module support */
-#define USE_MODULES
-
-/* Windows/MSVC likes to name things differently */
-#define snprintf _snprintf
-#define popen _popen
-#define pclose _pclose
-#define ftruncate _chsize
-#define PATH_MAX MAX_PATH
-#define MAXPATHLEN MAX_PATH
-#define bzero(buf, size) memset(buf, 0, size)
-#define strcasecmp stricmp
-#define sleep(x) Sleep(x*1000)
-
-
diff --git a/install.sh b/install-sh
index e69de29bb..e69de29bb 100644
--- a/install.sh
+++ b/install-sh
diff --git a/lang/Makefile b/lang/Makefile
index 4adce638a..55198e01c 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -44,31 +44,31 @@ spotless: clean
cat: cat.l langcomp index
- @./langcomp $@.l
+ @./langcomp $@.l $@
de: de.l langcomp index
- @./langcomp $@.l
+ @./langcomp $@.l $@
en_us: en_us.l langcomp index
- @./langcomp $@.l
+ @./langcomp $@.l $@
es: es.l langcomp index
- @./langcomp $@.l
+ @./langcomp $@.l $@
fr: fr.l langcomp index
- @./langcomp $@.l
+ @./langcomp $@.l $@
gr: gr.l langcomp index
- @./langcomp $@.l
+ @./langcomp $@.l $@
hun: hun.l langcomp index
- @./langcomp $@.l
+ @./langcomp $@.l $@
it: it.l langcomp index
- @./langcomp $@.l
+ @./langcomp $@.l $@
nl: nl.l langcomp index
- @./langcomp $@.l
+ @./langcomp $@.l $@
pl: pl.l langcomp index
- @./langcomp $@.l
+ @./langcomp $@.l $@
pt: pt.l langcomp index
- @./langcomp $@.l
+ @./langcomp $@.l $@
ru: ru.l langcomp index
- @./langcomp $@.l
+ @./langcomp $@.l $@
tr: tr.l langcomp index
- @./langcomp $@.l
+ @./langcomp $@.l $@
langcomp: langcomp.c
@$(MAKEBIN) $(CC) $(CFLAGS) langcomp.c -o $@
diff --git a/lang/Makefile.win32 b/lang/Makefile.win32
deleted file mode 100644
index 4791287e0..000000000
--- a/lang/Makefile.win32
+++ /dev/null
@@ -1,75 +0,0 @@
-# Makefile for language module
-
-include ../Makefile.inc.win32
-
-
-LANGOBJS = cat de en_us es fr hun gr nl pl pt tr it ru
-LANGSRCS = cat de en_us.l es fr.l hun.l gr.l nl.l pl.l pt.l tr.l it.l ru.l
-
-LANGCOMP = ./langcomp
-#LANGCOMP = ./langcomp -w
-
-
-all: $(LANGOBJS)
-
-
-install: all
- -copy cat ..\$(DATDEST)\languages
- -copy en_us ..\$(DATDEST)\languages
- -copy de ..\$(DATDEST)\languages
- -copy es ..\$(DATDEST)\languages
- -copy fr ..\$(DATDEST)\languages
- -copy hun ..\$(DATDEST)\languages
- -copy gr ..\$(DATDEST)\languages
- -copy nl ..\$(DATDEST)\languages
- -copy pl ..\$(DATDEST)\languages
- -copy pt ..\$(DATDEST)\languages
- -copy tr ..\$(DATDEST)\languages
- -copy it ..\$(DATDEST)\languages
- -copy ru ..\$(DATDEST)\languages
-
-clean:
- -@erase $(LANGOBJS) langcomp.exe langtool.exe *.obj index
-
-spotless: clean
- -@erase language.h
-
-
-cat: cat.l langtool.exe langcomp.exe index
- langcomp $@.l
-de: de.l langtool.exe langcomp.exe index
- langcomp $@.l
-en_us: en_us.l langtool.exe langcomp.exe index
- langcomp $@.l
-es: es.l langtool.exe langcomp.exe index
- langcomp $@.l
-fr: fr.l langtool.exe langcomp.exe index
- langcomp $@.l
-hun: hun.l langtool.exe langcomp.exe index
- langcomp $@.l
-gr: gr.l langtool.exe langcomp.exe index
- langcomp $@.l
-nl: nl.l langtool.exe langcomp.exe index
- langcomp $@.l
-pl: pl.l langtool.exe langcomp.exe index
- langcomp $@.l
-pt: pt.l langtool.exe langcomp.exe index
- langcomp $@.l
-tr: tr.l langtool.exe langcomp.exe index
- langcomp $@.l
-it: it.l langtool.exe langcomp.exe index
- langcomp $@.l
-ru: ru.l langtool.exe langcomp.exe index
- langcomp $@.l
-
-langtool.exe: langtool.c
- $(CC) $(CFLAGS) langtool.c -o $@ /link $(LFLAGS)
-
-langcomp.exe: langcomp.c
- $(CC) $(CFLAGS) langcomp.c -o $@ /link $(LFLAGS)
-
-language.h: langtool.exe index
- langtool language.h
-
-index: langtool.exe en_us.l
- langtool index
diff --git a/makefile.inc.win32 b/makefile.inc.win32
deleted file mode 100644
index 7d430d672..000000000
--- a/makefile.inc.win32
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Generated by install.js
-#
-LIBPATH=/LIBPATH:"C:\Program Files\Microsoft Visual Studio .NET 2003\VC7\Lib" /LIBPATH:"C:\Program Files\Microsoft Visual Studio .NET 2003\VC7\PlatformSDK\Lib"
-INCFLAGS=/I "C:\Program Files\Microsoft Visual Studio .NET 2003\VC7\Include" /I "C:\Program Files\Microsoft Visual Studio .NET 2003\VC7\PlatformSDK\Include"
-VERSION=1.9.0.0-git
-PROGRAM=anope.exe
-DATDEST=data
-CC=cl
-RC=rc
-MAKE=nmake -f Makefile.win32
-BASE_CFLAGS=$(VC6) /Zi /MD /TP /GR /EHs $(INCFLAGS)
-RC_FLAGS=/i "C:\Program Files\Microsoft Visual Studio .NET 2003\VC7\Include" /i "C:\Program Files\Microsoft Visual Studio .NET 2003\VC7\PlatformSDK\Include"
-LIBS=wsock32.lib advapi32.lib /NODEFAULTLIB:libcmtd.lib
-LFLAGS=$(LIBPATH)
-USE_MYSQL=0
-MORE_CFLAGS = /I"../include"
-CFLAGS = /nologo $(CDEFS) $(BASE_CFLAGS) $(MORE_CFLAGS)
diff --git a/run-cc.pl b/run-cc.pl
index 6bd3e5fb6..e7311c398 100755
--- a/run-cc.pl
+++ b/run-cc.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
### THIS IS DESIGNED TO BE RUN BY MAKE! DO NOT RUN FROM THE SHELL (because it MIGHT sigterm the shell)! ###
@@ -16,7 +16,16 @@ use POSIX ();
# The subs are passed the message, and anything the regex captured.
-my $cc = shift(@ARGV);
+my $flag = shift(@ARGV);
+my $quiet = 0;
+my $cc;
+if ($flag eq "-q") {
+ $quiet = 1;
+ $cc = shift(@ARGV);
+}
+else {
+ $cc = $flag;
+}
my $showncmdline = 0;
@@ -151,6 +160,10 @@ die "Cannot fork to start $cc! $!\n" unless defined($pid);
if ($pid) {
+ if ($quiet == 0) {
+ printf "\t\e[1;32m%-20s\e[0m%s\n", $action . ":", $name unless $name eq "";
+ }
+
my $fail = 0;
# Parent - Close child-side pipes.
close $w_stderr;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2a8c01d0e..2d6518f5b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,6 +6,10 @@ set(SRC_SRCS ${SRC_SRCS_C} ${SRC_SRCS_CPP})
if(NOT MSVC)
list(REMOVE_ITEM SRC_SRCS win32_memory.cpp)
endif(NOT MSVC)
+# If not using Windows, don't include windows.cpp, as it's Windows-specific
+if(NOT WIN32)
+ list(REMOVE_ITEM SRC_SRCS windows.cpp)
+endif(NOT WIN32)
if(CMAKE244_OR_BETTER)
list(SORT SRC_SRCS)
endif(CMAKE244_OR_BETTER)
diff --git a/src/Makefile b/src/Makefile
index e6d32c5f2..6395963bb 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,10 +2,6 @@ OBJS = actions.o base64.o bots.o botserv.o channels.o chanserv.o commands.o com
config.o datafiles.o encrypt.o events.o hashcomp.o helpserv.o hostserv.o init.o ircd.o language.o log.o mail.o main.o \
memory.o memoserv.o messages.o misc.o modules.o news.o nickserv.o operserv.o \
process.o send.o servers.o sessions.o slist.o sockutil.o timeout.o users.o module.o modulemanager.o configreader.o
-SRCS = actions.c base64.c bots.cpp botserv.c channels.c chanserv.c commands.c compat.c \
- config.c datafiles.c encrypt.c events.c hashcomp.cpp helpserv.c hostserv.c init.c ircd.c language.c log.c mail.c main.c \
- memory.c memoserv.c messages.c misc.c modules.c news.c nickserv.c operserv.c \
- process.c send.c servers.c sessions.c s sockutil.c timeout.c users.c module.cpp modulemanager.cpp configreader.cpp
INCLUDES = ../include/commands.h ../include/defs.h ../include/language.h \
../include/pseudo.h ../include/sysconf.h ../include/config.h \
diff --git a/src/core/Makefile.win32 b/src/core/Makefile.win32
deleted file mode 100644
index 75e629b8d..000000000
--- a/src/core/Makefile.win32
+++ /dev/null
@@ -1,24 +0,0 @@
-include ../../Makefile.inc.win32
-
-SRCS=bs_act.c bs_assign.c bs_badwords.c bs_bot.c bs_botlist.c bs_fantasy.c bs_fantasy_kick.c bs_fantasy_kickban.c bs_fantasy_owner.c bs_fantasy_seen.c bs_help.c bs_info.c bs_kick.c bs_say.c bs_set.c bs_unassign.c cs_access.c cs_akick.c cs_ban.c cs_clear.c cs_drop.c cs_forbid.c cs_getkey.c cs_getpass.c cs_help.c cs_identify.c cs_info.c cs_invite.c cs_kick.c cs_list.c cs_logout.c cs_modes.c cs_register.c cs_sendpass.c cs_set.c cs_status.c cs_suspend.c cs_topic.c cs_xop.c enc_none.c enc_md5.c enc_old.c he_help.c hs_del.c hs_delall.c hs_group.c hs_help.c hs_list.c hs_off.c hs_on.c hs_set.c hs_setall.c ms_cancel.c ms_check.c ms_del.c ms_help.c ms_info.c ms_list.c ms_read.c ms_rsend.c ms_send.c ms_sendall.c ms_set.c ms_staff.c ns_access.c ns_alist.c ns_drop.c ns_forbid.c ns_getemail.c ns_getpass.c ns_ghost.c ns_group.c ns_help.c ns_identify.c ns_info.c ns_list.c ns_logout.c ns_recover.c ns_register.c ns_release.c ns_sendpass.c ns_set.c ns_saset.c ns_status.c ns_suspend.c ns_update.c os_admin.c os_akill.c os_chankill.c os_chanlist.c os_clearmodes.c os_defcon.c os_global.c os_help.c os_ignore.c os_jupe.c os_kick.c os_logonnews.c os_mode.c os_modinfo.c os_modlist.c os_modload.c os_modunload.c os_noop.c os_oline.c os_oper.c os_opernews.c os_quit.c os_randomnews.c os_raw.c os_reload.c os_restart.c os_session.c os_set.c os_sgline.c os_shutdown.c os_sqline.c os_staff.c os_stats.c os_svsnick.c os_szline.c os_umode.c os_update.c os_userlist.c ss_main.c
-OBJECTS= $(SRCS:.c=.dll)
-CFLAGS=/LD /MD /D MODULE_COMPILE $(CFLAGS) /I"../../include"
-LFLAGS=/link ../anope.lib wsock32.lib $(LIBS) $(LFLAGS) $(MYSQL_LIB_PATH) /export:init_module /export:destroy_module /VERSION:$(VERSION)
-
-all: $(OBJECTS)
-
-distclean: clean spotless
-
-.c.dll:
- $(CC) $(CFLAGS) $< ..\mod_version.c $(LFLAGS)
-
-clean:
- -@del *.obj
-
-spotless: clean
- -@del *.dll *.lib *.exp *.manifest
-
-install:
- -@mkdir ..\..\$(DATDEST)\modules
- -@mkdir ..\..\$(DATDEST)\modules\runtime
- -@copy *.dll ..\..\$(DATDEST)\modules
diff --git a/src/makefile.win32 b/src/makefile.win32
deleted file mode 100644
index 7558c1ad6..000000000
--- a/src/makefile.win32
+++ /dev/null
@@ -1,117 +0,0 @@
-# Make file for Win32
-#
-# (C) 2003-2008 Anope Team
-# Contact us at info@anope.org
-#
-# Please read COPYING and README for further details.
-#
-# Based on the original code of Epona by Lara.
-# Based on the original code of Services by Andy Church.
-#
-# $Id:$
-#
-
-# Source Makefile
-
-include ../Makefile.inc.win32
-
-###########################################################################
-
-OBJS = actions.obj base64.obj bots.obj botserv.obj channels.obj chanserv.obj commands.obj compat.obj \
- config.obj datafiles.obj encrypt.obj events.obj helpserv.obj hostserv.obj \
- init.obj ircd.obj language.obj log.obj mail.obj main.obj memory.obj \
- memoserv.obj messages.obj misc.obj modules.obj mod_version.obj news.obj nickserv.obj operserv.obj \
- process.obj send.obj servers.obj sessions.obj slist.obj sockutil.obj \
- timeout.obj users.obj module.obj modulemanager.obj hashcomp.obj configreader.obj
-
-SRCS = actions.c base64.c botserv.c bots.cpp channels.c chanserv.c commands.c compat.c \
- config.c datafiles.c encrypt.c events.c helpserv.c hostserv.c init.c ircd.c \
- language.c log.c mail.c main.c memory.c memoserv.c messages.c misc.c \
- modules.c mod_version.c news.c nickserv.c operserv.c process.c send.c servers.obj sessions.c \
- slist.c sockutil.c timeout.c users.c module.cpp modulemanager.cpp hashcomp.cpp configreader.cpp
-
-###########################################################################
-
-.c.obj:
- $(CC) $(CFLAGS) -c $<
-
-.cpp.obj:
- $(CC) $(CFLAGS) -c $<
-
-
-all: $(PROGRAM)
-
-$(PROGRAM): $(OBJS) win32.res
- $(CC) $(OBJS) win32.res /link /debug /out:$(PROGRAM) /implib:anope.lib $(LIBS) $(LFLAGS) $(MLIBS) $(ELIBS)
-
-spotless:
- -@erase *.obj *.exe *.exp *.lib tools\*.exe *.res win32.rc *.manifest
-
-install:
- -@copy anope.exe ..\anope.exe
- -@mkdir ..\$(DATDEST)\bin
- -@copy bin\* ..\$(DATDEST)\bin
- -@copy anope.exe.manifest ..\anope.exe.manifest
-
-win32.res: win32.rc
- $(RC) /l 0x409 $(RC_FLAGS) /fowin32.res win32.rc
-
-
-###########################################################################
-
-# Catch any changes in compilation options at the top of this file
-$(OBJS):
-
-actions.obj: actions.c ..\include\services.h
-base64.obj: base64.c ..\include\services.h
-bots.obj: bots.cpp ..\include\services.h
-botserv.obj: botserv.c ..\include\services.h ..\include\pseudo.h ..\include\language.h
-channels.obj: channels.c ..\include\services.h
-chanserv.obj: chanserv.c ..\include\services.h ..\include\pseudo.h
-commands.obj: commands.c ..\include\services.h ..\include\commands.h ..\include\language.h
-compat.obj: compat.c ..\include\services.h
-config.obj: config.c ..\include\services.h
-datafiles.obj: datafiles.c ..\include\services.h ..\include\datafiles.h
-encrypt.obj: encrypt.c ..\include\encrypt.h ..\include\sysconf.h
-events.obj: events.c ..\include\modules.h ..\include\language.h ..\include\version.h
-init.obj: init.c ..\include\services.h
-ircd.obj: ircd.c ..\include\services.h
-hashcomp.obj: hashcomp.cpp ..\include\services.h ..\include\hashcomp.h
-hostserv.obj: hostserv.c ..\include\services.h ..\include\pseudo.h
-language.obj: language.c ..\include\services.h ..\include\language.h
-list.obj: list.c ..\include\services.h
-log.obj: log.c ..\include\services.h ..\include\pseudo.h
-mail.obj: mail.c ..\include\services.h ..\include\language.h
-main.obj: main.c ..\include\services.h ..\include\timeout.h ..\include\version.h
-memory.obj: memory.c ..\include\services.h
-memoserv.obj: memoserv.c ..\include\services.h ..\include\pseudo.h
-messages.obj: messages.c ..\include\services.h ..\include\messages.h ..\include\language.h
-modules.obj: modules.c ..\include\modules.h ..\include\language.h ..\include\version.h
-module.obj: module.cpp ..\include\modules.h ..\include\language.h ..\include\version.h
-modulemanager.obj: modulemanager.cpp ..\include\modules.h ..\include\language.h ..\include\version.h
-mod_version.obj: mod_version.c ..\include\modules.h ..\include\version.h
-misc.obj: misc.c ..\include\services.h ..\include\language.h
-news.obj: news.c ..\include\services.h ..\include\pseudo.h
-nickserv.obj: nickserv.c ..\include\services.h ..\include\pseudo.h
-operserv.obj: operserv.c ..\include\services.h ..\include\pseudo.h
-process.obj: process.c ..\include\services.h ..\include\messages.h
-send.obj: send.c ..\include\services.h
-servers.obj: servers.c ..\include\services.h
-sessions.obj: sessions.c ..\include\services.h ..\include\pseudo.h
-slist.obj: slist.c ..\include\services.h ..\include\slist.h
-sockutil.obj: sockutil.c ..\include\services.h
-timeout.obj: timeout.c ..\include\services.h ..\include\timeout.h
-users.obj: users.c ..\include\services.h
-vsnprintf.obj: vsnprintf.c
-
-###########################################################################
-
-..\include\services.h: ..\include\sysconf.h ..\include\config.h ..\include\extern.h
-
-..\include\extern.h: ..\include\slist.h
-
-..\include\pseudo.h: ..\include\commands.h ..\include\language.h ..\include\timeout.h ..\include\encrypt.h ..\include\datafiles.h ..\include\slist.h
-
-###########################################################################
-
-FRC:
diff --git a/src/modules/makefile.inc.win32 b/src/modules/makefile.inc.win32
deleted file mode 100644
index f6a646329..000000000
--- a/src/modules/makefile.inc.win32
+++ /dev/null
@@ -1,2 +0,0 @@
-SRCS=cs_appendtopic.c cs_enforce.c cs_tban.c ns_maxemail.c hs_request.c os_info.c bs_fantasy_unban.c
-SUBS=test
diff --git a/src/modules/makefile.sub.win32 b/src/modules/makefile.sub.win32
deleted file mode 100644
index 4a811622e..000000000
--- a/src/modules/makefile.sub.win32
+++ /dev/null
@@ -1,19 +0,0 @@
-include ../../../Makefile.inc.win32
-
-OBJECTS= $(SRCS:.c=.obj)
-CFLAGS=/nologo /LD /MD /D MODULE_COMPILE $(CFLAGS) /I"../../../include" /I "../"
-LFLAGS=/nologo ../../anope.lib wsock32.lib $(LIBS) $(LFLAGS) $(MYSQL_LIB_PATH) /export:AnopeInit /export:AnopeFini /OUT:$(TARGET)
-
-all:
- $(CC) $(SRCS) $(CFLAGS) ..\..\mod_version.c /link $(LFLAGS)
-
-distclean: clean spotless
-
-clean:
- -@del *.obj
-
-spotless: clean
- -@del *.dll *.lib *.exp *.manifest
-
-install:
- -@copy *.dll ..\..\..\$(DATDEST)\modules
diff --git a/src/modules/makefile.win32 b/src/modules/makefile.win32
deleted file mode 100644
index fffa51d74..000000000
--- a/src/modules/makefile.win32
+++ /dev/null
@@ -1,41 +0,0 @@
-include ../../Makefile.inc.win32
-include ./Makefile.inc.win32
-
-OBJECTS= $(SRCS:.c=.dll)
-CFLAGS=/LD /MD /D MODULE_COMPILE $(CFLAGS) /I"../../include"
-LFLAGS=/link ../anope.lib wsock32.lib $(LIBS) $(LFLAGS) $(MYSQL_LIB_PATH) /export:init_module /export:destroy_module
-
-all: $(OBJECTS) subs
-
-distclean: clean spotless
-
-.c.dll:
- $(CC) $(CFLAGS) $(IRCTYPE) $< ..\mod_version.c $(LFLAGS)
-
-subs:
- @for %i in ( $(SUBS) ); do \
- @if exist %i; @cd %i && $(MAKE) $(MAKEARGS) && cd ..
-
-clean: subs-clean
- -@del *.obj
-
-subs-clean:
- @for %i in ( $(SUBS) ); do \
- @if exist %i; @cd %i && $(MAKE) $(MAKEARGS) clean && cd ..
-
-spotless: clean subs-spotless
- -@del *.dll *.lib *.exp *.manifest
-
-subs-spotless:
- @for %i in ( $(SUBS) ); do \
- @if exist %i; @cd %i && $(MAKE) $(MAKEARGS) spotless && cd ..
-
-install:
- -@mkdir ..\..\$(DATDEST)\modules
- -@mkdir ..\..\$(DATDEST)\modules\runtime
- -@copy *.dll ..\..\$(DATDEST)\modules
-
-subs-install: install
- @for %i in ( $(SUBS) ); do \
- @if exist %i; @cd %i && $(MAKE) $(MAKEARGS) install && cd ..
-
diff --git a/src/protocol/Makefile.win32 b/src/protocol/Makefile.win32
deleted file mode 100644
index aec850976..000000000
--- a/src/protocol/Makefile.win32
+++ /dev/null
@@ -1,29 +0,0 @@
-include ../../Makefile.inc.win32
-
-SRCS=bahamut.c inspircd11.c inspircd12.cpp \
- ratbox.c unreal32.c
-OBJECTS=bahamut.dll inspircd11.dll inspircd12.dll ratbox.dll unreal32.dll
-
-CFLAGS=/LD /MD /D MODULE_COMPILE $(CFLAGS) /I"../../include"
-LFLAGS=/link ../anope.lib wsock32.lib $(LIBS) $(LFLAGS) $(MYSQL_LIB_PATH) /export:init_module /export:destroy_module /VERSION:$(VERSION)
-
-all: $(OBJECTS)
-
-distclean: clean spotless
-
-.c.dll:
- $(CC) $(CFLAGS) $< ..\mod_version.c $(LFLAGS)
-
-.cpp.dll:
- $(CC) $(CFLAGS) $< ..\mod_version.c $(LFLAGS)
-
-clean:
- -@del *.obj
-
-spotless: clean
- -@del *.dll *.lib *.exp *.manifest
-
-install:
- -@mkdir ..\..\$(DATDEST)\modules
- -@mkdir ..\..\$(DATDEST)\modules\runtime
- -@copy *.dll ..\..\$(DATDEST)\modules
diff --git a/src/tools/Makefile b/src/tools/Makefile
index 9de555f55..5e8ec178c 100644
--- a/src/tools/Makefile
+++ b/src/tools/Makefile
@@ -10,7 +10,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
'RUNGROUP=${RUNGROUP}' 'MAKEBIN=${MAKEBIN}'
.c.o:
- @$(MAKEBIN) $(CC) $(CFLAGS) -I../include/ -c $<
+ @$(MAKEBIN) $(CC) $(CFLAGS) -I../../include/ -c $<
all: ${OBJS}
diff --git a/src/tools/Makefile.win32 b/src/tools/Makefile.win32
deleted file mode 100644
index 49cd6b032..000000000
--- a/src/tools/Makefile.win32
+++ /dev/null
@@ -1,29 +0,0 @@
-include ../../Makefile.inc.win32
-
-SRCS=anopesmtp.c db-merger.c db-convert.c
-OBJECTS= $(SRCS:.c=.exe)
-CFLAGS=$(CFLAGS) /I"../../include"
-LFLAGS=/link wsock32.lib $(LIBS) $(LFLAGS)
-
-all: $(OBJECTS)
-
-distclean: clean spotless
-
-.c.exe:
- $(CC) $(CFLAGS) $< $(LFLAGS)
-
-clean:
- -@del *.obj
-
-spotless: clean
- -@del *.exe *.lib *.exp
-
-install: exe_install manifest_install
-
-exe_install: FRC
- -@copy *.exe ..\..\$(DATDEST)\
-
-manifest_install: FRC
- -@copy *.manifest ..\..\$(DATDEST)\
-
-FRC:
diff --git a/src/win32.rc.template b/src/win32.rc.template
deleted file mode 100644
index 7f1ee7e32..000000000
--- a/src/win32.rc.template
+++ /dev/null
@@ -1,90 +0,0 @@
-///Microsoft Developer Studio generated resource script.
-//
-#include "../include/resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#define APSTUDIO_HIDDEN_SYMBOLS
-#include "windows.h"
-#undef APSTUDIO_HIDDEN_SYMBOLS
-#include "../include/resource.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifndef _MAC
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VER_ANOPE VERSIONINFO
- FILEVERSION VERSION_COMMA
- PRODUCTVERSION VERSION_COMMA
- FILEFLAGSMASK 0x17L10
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "Anope Team"
- VALUE "FileDescription", "Anope IRC Services"
- VALUE "FileVersion", "VERSION_FULL"
- VALUE "InternalName", "Anope"
- VALUE "LegalCopyright", "Copyright (C) 2003-2008 Anope Team"
- VALUE "OriginalFilename", "anope.exe"
- VALUE "ProductName", "Anope"
- VALUE "ProductVersion", "VERSION_DOTTED"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#endif // !_MAC
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-ICON_APP ICON "anope-icon.ico"
-#endif // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
generated by cgit (git 2.34.1) at 2025-06-17 03:10:10 +0000