Rename macro DATADIR -> PERMDATADIR. Windows SDK's.. just freaking amazing....

Makefile.in

@@ -209,7 +209,7 @@ install: all
 	$(INSTALL) -m 0700 src/modules/extbans/*.so @MODULESDIR@/extbans
 	$(INSTALL) -m 0700 -d @TMPDIR@
 	$(INSTALL) -m 0700 -d @CACHEDIR@
-	$(INSTALL) -m 0700 -d @DATADIR@
+	$(INSTALL) -m 0700 -d @PERMDATADIR@
 	$(INSTALL) -m 0700 -d @LOGDIR@
 	# TODO: ircdcron.. where?
 	-@if [ ! -f "@CONFDIR@/ssl/server.cert.pem" ] ; then \

configure

@@ -651,7 +651,7 @@ TRE_CFLAGS
 FD_SETSIZE
 PIDFILE
 DOCDIR
-DATADIR
+PERMDATADIR
 TMPDIR
 CACHEDIR
 LOGDIR
@@ -6230,17 +6230,17 @@ fi
 if test "${with_datadir+set}" = set; then :
   withval=$with_datadir;
 cat >>confdefs.h <<_ACEOF
-#define DATADIR "$withval"
+#define PERMDATADIR "$withval"
 _ACEOF
 
-		DATADIR="$withval"
+		PERMDATADIR="$withval"
 else
 
 cat >>confdefs.h <<_ACEOF
 #define DATADIR "$HOME/unrealircd/data"
 _ACEOF
 
-		DATADIR="$HOME/unrealircd/data"
+		PERMDATADIR="$HOME/unrealircd/data"
 fi
 
 

configure.ac

@@ -508,10 +508,10 @@ AC_ARG_WITH(tmpdir, [AS_HELP_STRING([--with-tmpdir=path],[Specify the directory
 		TMPDIR="$HOME/unrealircd/tmp"])
 
 AC_ARG_WITH(datadir, [AS_HELP_STRING([--with-datadir=path],[Specify the directory where permanent data is stored])],
-	[AC_DEFINE_UNQUOTED([DATADIR], ["$withval"], [Define the location of permanent data files])
-		DATADIR="$withval"],
+	[AC_DEFINE_UNQUOTED([PERMDATADIR], ["$withval"], [Define the location of permanent data files])
+		PERMDATADIR="$withval"],
 	[AC_DEFINE_UNQUOTED([DATADIR], ["$HOME/unrealircd/data"], [Define the location of permanent data files])
-		DATADIR="$HOME/unrealircd/data"])
+		PERMDATADIR="$HOME/unrealircd/data"])
 
 AC_ARG_WITH(docdir, [AS_HELP_STRING([--with-docdir=path],[Specify the directory where documentation is stored])],
 	[AC_DEFINE_UNQUOTED([DOCDIR], ["$withval"], [Define the location of the documentation])
@@ -532,7 +532,9 @@ AC_SUBST(MODULESDIR)
 AC_SUBST(LOGDIR)
 AC_SUBST(CACHEDIR)
 AC_SUBST(TMPDIR)
-AC_SUBST(DATADIR)
+dnl Why o why PERMDATADIR and not DATADIR you ask?
+dnl well, Because DATADIR conflicts with the Windows SDK header files.. amazing.
+AC_SUBST(PERMDATADIR)
 AC_SUBST(DOCDIR)
 AC_SUBST(PIDFILE)
 

include/config.h

@@ -243,7 +243,7 @@
 #define	LPATH		LOGDIR"/debug.log"	/* Where the debug file lives, if DEBUGMODE */
 #define VPATH		CONFDIR"/ircd.svsmotd"	/* Services MOTD append. */
 #define BPATH		CONFDIR"/bot.motd"	/* Bot MOTD */
-#define IRCDTUNE 	DATADIR"/ircd.tune"	/* tuning .. */
+#define IRCDTUNE 	PERMDATADIR"/ircd.tune"	/* tuning .. */
 
 /* CHROOTDIR
  *

include/setup.h.in

@@ -20,9 +20,6 @@
 /* Define to 1 if using `alloca.c'. */
 #undef C_ALLOCA
 
-/* Define the location of permanent data files */
-#undef DATADIR
-
 /* The default permissions for configuration files. Set to 0 to prevent
    unrealircd from calling chmod() on the files. */
 #undef DEFAULT_PERMISSIONS
@@ -310,6 +307,9 @@
 /* Define if you have the <sys/param.h> header file. */
 #undef PARAMH
 
+/* Define the location of permanent data files */
+#undef PERMDATADIR
+
 /* Define the path of the pid file */
 #undef PIDFILE
 

include/win32/setup.h

@@ -47,7 +47,7 @@
 #define CONFDIR "conf"
 #define MODULESDIR "modules"
 #define LOGDIR "logs"
-#define DATADIR "data"
+#define PERMDATADIR "data"
 #define CACHEDIR "cache"
 #define TMPDIR "tmp"
 #define NO_U_TYPES