Done some work on autoconf usage and removed Arial font.

7 files changed, 147 insertions, 52 deletions

diff --git a/Makefile.am b/Makefile.am
index d0307496..6e5da1a4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # Subdirectories to include in a distribution
-#DIST_SUBDIRS = src data docs
+DIST_SUBDIRS = src data docs
 
 # Subdirectories to build
 SUBDIRS = src
diff --git a/configure.ac b/configure.ac
index e627f1f1..f5775626 100755
--- a/configure.ac
+++ b/configure.ac
@@ -119,5 +119,7 @@ AC_SUBST(LIBSDL_LIBS)
 AC_SUBST(LIBSDL_CFLAGS)
 
 AC_CONFIG_FILES([Makefile
-                 src/Makefile])
+                 src/Makefile
+                 data/Makefile
+                 docs/Makefile])
 AC_OUTPUT
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 00000000..0b2f6f9e
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,25 @@
+EXTRA_DIST = map/new_3-1.gat \
+	     core/graphics/gui/mouse.png \
+	     core/graphics/gui/radioout.png \
+	     core/graphics/gui/radioin.png \
+	     core/graphics/gui/dialog_middle.png \
+	     core/graphics/gui/fixedfont.png \
+	     core/graphics/gui/buttonpress.png \
+	     core/graphics/gui/slider.png \
+	     core/graphics/gui/button.png \
+	     core/graphics/gui/buttonhi.png \
+	     core/graphics/gui/dialog_left.png \
+	     core/graphics/gui/vscroll.png \
+	     core/graphics/gui/checkbox.png \
+	     core/graphics/gui/dialog_right.png \
+	     core/graphics/gui/textbox.png \
+	     core/graphics/gui/button_disabled.png \
+	     core/graphics/tiles/desert.png \
+	     core/graphics/sprites/npcs.png \
+	     core/graphics/sprites/monsters.png \
+	     core/graphics/sprites/player_male_base.png \
+	     core/graphics/sprites/emotions.png \
+	     core/graphics/sprites/items.png \
+	     core/graphics/sprites/player_male_hair.png \
+	     core/graphics/images/login_wallpaper.png \
+	     sound/wavs/level.ogg
diff --git a/data/Skin/arial.ttf b/data/Skin/arial.ttf
deleted file mode 100644
index 886789b8..00000000
--- a/data/Skin/arial.ttf
+++ /dev/null
diff --git a/docs/Makefile.am b/docs/Makefile.am
new file mode 100644
index 00000000..0b818af5
--- /dev/null
+++ b/docs/Makefile.am
@@ -0,0 +1,13 @@
+EXTRA_DIST = packages.txt \
+	     FAQ.txt \
+	     SOURCE/tmwdox.sh \
+	     SOURCE/tmw.doxcfg \
+	     HACKING.txt \
+	     items.txt \
+	     server.txt \
+	     progression.txt \
+	     INSTALL/debian.txt \
+	     INSTALL/win32.txt \
+	     INSTALL/linux.txt \
+	     meetings/dev-20050204.txt \
+	     meetings/dev-20050211.txt
diff --git a/src/Makefile.am b/src/Makefile.am
index 9635b08d..8068a6b5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,53 +1,102 @@
 bin_PROGRAMS = tmw
 tmw_SOURCES = sound/sound.cpp \
-	graphic/graphic.cpp \
-	graphic/spriteset.cpp \
-	gui/button.cpp \
-	gui/buy.cpp \
-	gui/buysell.cpp \
-	gui/char_server.cpp \
-	gui/char_select.cpp \
-	gui/chat.cpp \
-	gui/checkbox.cpp \
-	gui/confirm_dialog.cpp \
-	gui/equipment.cpp \
-	gui/gui.cpp \
-	gui/inventory.cpp \
-	gui/itemcontainer.cpp \
-	gui/listbox.cpp \
-	gui/login.cpp \
-	gui/minimap.cpp \
-	gui/npc.cpp \
-	gui/npc_text.cpp \
-	gui/ok_dialog.cpp \
-	gui/passwordfield.cpp \
-	gui/playerbox.cpp \
-	gui/progressbar.cpp \
-	gui/radiobutton.cpp \
-	gui/scrollarea.cpp \
-	gui/sell.cpp \
-	gui/setup.cpp \
-	gui/shop.cpp \
-	gui/skill.cpp \
-	gui/slider.cpp \
-	gui/status.cpp \
-	gui/stats.cpp \
-	gui/textbox.cpp \
-	gui/textfield.cpp \
-	gui/window.cpp \
-	gui/windowcontainer.cpp \
-	net/network.cpp \
-	net/protocol.cpp \
-	resources/image.cpp \
-	resources/resource.cpp \
-	resources/resourcemanager.cpp \
-	base64.cpp \
-	being.cpp \
-	configuration.cpp \
-	game.cpp \
-	log.cpp \
-	main.cpp \
-	map.cpp
+	      sound/sound.h \
+	      graphic/graphic.cpp \
+	      graphic/graphic.h \
+	      graphic/spriteset.cpp \
+	      graphic/spriteset.h \
+	      gui/button.cpp \
+	      gui/button.h \
+	      gui/buy.cpp \
+	      gui/buy.h \
+	      gui/buysell.cpp \
+	      gui/buysell.h \
+	      gui/char_server.cpp \
+	      gui/char_server.h \
+	      gui/char_select.cpp \
+	      gui/char_select.h \
+	      gui/chat.cpp \
+	      gui/chat.h \
+	      gui/checkbox.cpp \
+	      gui/checkbox.h \
+	      gui/confirm_dialog.cpp \
+	      gui/confirm_dialog.h \
+	      gui/equipment.cpp \
+	      gui/equipment.h \
+	      gui/gui.cpp \
+	      gui/gui.h \
+	      gui/inventory.cpp \
+	      gui/inventory.h \
+	      gui/itemcontainer.cpp \
+	      gui/itemcontainer.h \
+	      gui/listbox.cpp \
+	      gui/listbox.h \
+	      gui/login.cpp \
+	      gui/login.h \
+	      gui/minimap.cpp \
+	      gui/minimap.h \
+	      gui/npc.cpp \
+	      gui/npc.h \
+	      gui/npc_text.cpp \
+	      gui/npc_text.h \
+	      gui/ok_dialog.cpp \
+	      gui/ok_dialog.h \
+	      gui/passwordfield.cpp \
+	      gui/passwordfield.h \
+	      gui/playerbox.cpp \
+	      gui/playerbox.h \
+	      gui/progressbar.cpp \
+	      gui/progressbar.h \
+	      gui/radiobutton.cpp \
+	      gui/radiobutton.h \
+	      gui/scrollarea.cpp \
+	      gui/scrollarea.h \
+	      gui/sell.cpp \
+	      gui/sell.h \
+	      gui/setup.cpp \
+	      gui/setup.h \
+	      gui/shop.cpp \
+	      gui/shop.h \
+	      gui/skill.cpp \
+	      gui/skill.h \
+	      gui/slider.cpp \
+	      gui/slider.h \
+	      gui/status.cpp \
+	      gui/status.h \
+	      gui/stats.cpp \
+	      gui/stats.h \
+	      gui/textbox.cpp \
+	      gui/textbox.h \
+	      gui/textfield.cpp \
+	      gui/textfield.h \
+	      gui/window.cpp \
+	      gui/window.h \
+	      gui/windowcontainer.cpp \
+	      gui/windowcontainer.h \
+	      net/network.cpp \
+	      net/network.h \
+	      net/protocol.cpp \
+	      net/protocol.h \
+	      resources/image.cpp \
+	      resources/image.h \
+	      resources/resource.cpp \
+	      resources/resource.h \
+	      resources/resourcemanager.cpp \
+	      resources/resourcemanager.h \
+	      base64.cpp \
+	      base64.h \
+	      being.cpp \
+	      being.h \
+	      configuration.cpp \
+	      configuration.h \
+	      game.cpp \
+	      game.h \
+	      log.cpp \
+	      log.h \
+	      main.cpp \
+	      main.h \
+	      map.cpp\
+	      map.h
 
 # set the include path found by configure
 INCLUDES= $(all_includes)
diff --git a/src/main.cpp b/src/main.cpp
index 99458bad..243c0d01 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -29,9 +29,11 @@
 #include "./sound/sound.h"
 #include "./graphic/graphic.h"
 #include "resources/resourcemanager.h"
+
 #include <iostream>
 #include <guichan.hpp>
 #include <SDL.h>
+#include <libxml/xmlversion.h>
 
 #ifdef __USE_UNIX98
 #include <sys/stat.h>
@@ -58,7 +60,6 @@ char map_name[16];
 unsigned char state;
 unsigned short x, y;
 unsigned char direction;
-//unsigned short job, hair, hair_color;
 unsigned char screen_mode;
 char *dir;
 
@@ -97,7 +98,12 @@ void request_exit() {
 /**
  * Do all initialization stuff
  */
-void init_engine() {
+void init_engine()
+{
+    // Initialize libxml2 and check for potential ABI mismatches between
+    // compiled version and the shared library actually used.
+    LIBXML_TEST_VERSION
+
     // Initialize SDL
     if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) < 0) {
         std::cerr << "Could not initialize SDL: " <<