From 35a284df7ea832a3c4beaa873af39441b67cb581 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Sat, 8 Nov 2008 17:55:48 -0600
Subject: [PATCH] [svn] Fix build in Linux. Patch provided by SyRiOCoP.

--HG--
branch : trunk
---
 src/shared/Makefile.am                        | 19 +++--
 .../{SystemConfig.h => SystemConfig.h.in}     | 72 +++++++++----------
 2 files changed, 45 insertions(+), 46 deletions(-)
 rename src/shared/{SystemConfig.h => SystemConfig.h.in} (97%)

diff --git a/src/shared/Makefile.am b/src/shared/Makefile.am
index f624fd0f5e7..4bc54f6e9a9 100644
--- a/src/shared/Makefile.am
+++ b/src/shared/Makefile.am
@@ -9,12 +9,12 @@
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 ## Process this file with automake to produce Makefile.in
 
@@ -31,6 +31,7 @@ noinst_LIBRARIES = libshared.a
 libshared_a_CPPFLAGS = \
 $(MYSQL_INCLUDES) \
 $(POSTGRE_INCLUDES) \
+$(TRINI_INCLUDES) \
 -I$(top_srcdir)/dep/include \
 -I$(top_srcdir)/src/framework
 
@@ -108,14 +109,12 @@ $(srcdir)/Database/dbcfile.h
 ## Additional files to include when running 'make dist'
 #  Disabled packet logger
 EXTRA_DIST = \
-	PacketLog.cpp \
-	PacketLog.h
+    PacketLog.cpp \
+    PacketLog.h
 
 # System Win32 files
 EXTRA_DIST += \
-	ServiceWin32.cpp \
-	ServiceWin32.h \
-	WheatyExceptionReport.cpp \
-	WheatyExceptionReport.h
-
-
+    ServiceWin32.cpp \
+    ServiceWin32.h \
+    WheatyExceptionReport.cpp \
+    WheatyExceptionReport.h
diff --git a/src/shared/SystemConfig.h b/src/shared/SystemConfig.h.in
similarity index 97%
rename from src/shared/SystemConfig.h
rename to src/shared/SystemConfig.h.in
index 262aa9e6355..dea85015374 100644
--- a/src/shared/SystemConfig.h
+++ b/src/shared/SystemConfig.h.in
@@ -1,36 +1,36 @@
-/* 
- * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
- *
- * Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
- *
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-// THIS FILE IS DEPRECATED
-
-#ifndef TRINITY_SYSTEMCONFIG_H
-#define TRINITY_SYSTEMCONFIG_H
-
-#include "Platform/Define.h"
-
-// THIS IS TEMP :)
-#define _FULLVERSION "Trinity"
-
-#define DEFAULT_PLAYER_LIMIT 100
-#define DEFAULT_WORLDSERVER_PORT 8085                       //8129
-#define DEFAULT_REALMSERVER_PORT 3724
-#define DEFAULT_SOCKET_SELECT_TIME 10000
-#endif
+/* 
+ * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
+ *
+ * Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+// THIS FILE IS DEPRECATED
+
+#ifndef TRINITY_SYSTEMCONFIG_H
+#define TRINITY_SYSTEMCONFIG_H
+
+#include "Platform/Define.h"
+
+// THIS IS TEMP :)
+#define _FULLVERSION "Trinity"
+
+#define DEFAULT_PLAYER_LIMIT 100
+#define DEFAULT_WORLDSERVER_PORT 8085                       //8129
+#define DEFAULT_REALMSERVER_PORT 3724
+#define DEFAULT_SOCKET_SELECT_TIME 10000
+#endif