Final modifications to Autotools build system to work alongside CMake build system. CMake build system will only allow out-of-source building now. Removed all old NMake Makefiles for Windows to focus on use of CMake on Windows (it's not as important to require the old system on Windows like it is on *nix).

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1878 5417fbe8-f217-4b02-8779-1006273d7864

4 files changed, 98 insertions, 212 deletions

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)

-

-