Remove internal guichan support.stripped1.1.8.21stripeed1.1.8.21

7 files changed, 12 insertions, 128 deletions

diff --git a/bmake b/bmake
index ee9616998..3bfa1b236 100755
--- a/bmake
+++ b/bmake
@@ -41,7 +41,6 @@ autoreconf -i
 --bindir=$dir/run/bin \
 --mandir=$dir/run/share/man \
 --enable-memdebug=yes \
---without-internalguichan \
 --enable-tcmalloc=no \
 --enable-googleprofiler=no
 
diff --git a/bmake0 b/bmake0
index a2d25b40c..921405f86 100755
--- a/bmake0
+++ b/bmake0
@@ -41,7 +41,6 @@ autoreconf -i
 --bindir=$dir/run/bin \
 --mandir=$dir/run/share/man \
 --enable-memdebug=no \
---without-internalguichan \
 --enable-tcmalloc=yes \
 --enable-googleprofiler=yes
 
diff --git a/bmake44 b/bmake44
index 696f0f820..d7730cf78 100755
--- a/bmake44
+++ b/bmake44
@@ -38,8 +38,7 @@ autoreconf -i
 ./configure --prefix=$dir/run \
 --datadir=$dir/run/share/games \
 --bindir=$dir/run/bin \
---mandir=$dir/run/share/man \
---without-internalguichan
+--mandir=$dir/run/share/man
 
 cd po
 #make -j5 update-po 2>../make1.log
diff --git a/bmake46 b/bmake46
index ee953f53b..ecd151e26 100755
--- a/bmake46
+++ b/bmake46
@@ -50,8 +50,7 @@ autoreconf -i
 ./configure --prefix=$dir/run \
 --datadir=$dir/run/share/games \
 --bindir=$dir/run/bin \
---mandir=$dir/run/share/man \
---without-internalguichan
+--mandir=$dir/run/share/man
 
 cd po
 #make -j5 update-po 2>../make1.log
diff --git a/clmake b/clmake
index 19c3285de..eec44c58f 100755
--- a/clmake
+++ b/clmake
@@ -10,8 +10,7 @@ export CXX=clang++
 ./configure --prefix=$dir/run \
 --datadir=$dir/run/share/games \
 --bindir=$dir/run/bin \
---mandir=$dir/run/share/man \
---without-internalguichan
+--mandir=$dir/run/share/man
 
 make -j5 2>make2.log
 
diff --git a/configure.ac b/configure.ac
index 770832999..72db9ed34 100755
--- a/configure.ac
+++ b/configure.ac
@@ -136,31 +136,16 @@ else
     AC_DEFINE(USE_OPENGL, 1, [Defines if ManaPlus should have OpenGL support])
 fi
 
-# Option to enable internal guichan
-AC_ARG_WITH(internalguichan,[  --without-internalguichan        don't use internal guichan ] )
-if test "x$with_internalguichan" == "xno"; then
-    with_internalguichan=no
+AC_CHECK_LIB([guichan], [gcnGuichanVersion], ,
+AC_MSG_ERROR([ *** Unable to find Guichan library (http://guichan.sf.net/)]))
+AC_CHECK_HEADERS([guichan.hpp], ,
+AC_MSG_ERROR([ *** Guichan library found but cannot find headers (http://guichan.sf.net/)]))
 
-    AC_CHECK_LIB([guichan], [gcnGuichanVersion], ,
-    AC_MSG_ERROR([ *** Unable to find Guichan library (http://guichan.sf.net/)]))
-    AC_CHECK_HEADERS([guichan.hpp], ,
-    AC_MSG_ERROR([ *** Guichan library found but cannot find headers (http://guichan.sf.net/)]))
-
-    AC_CHECK_HEADERS([guichan/widgetlistener.hpp], ,
-    AC_MSG_ERROR([ *** Guichan library version is found  but version is < 0.8.0 (http://guichan.sf.net/)]))
-
-    AC_CHECK_LIB([guichan_sdl], [gcnSDL], ,
-    AC_MSG_ERROR([ *** Unable to find Guichan SDL library (http://guichan.sf.net/)]))
-
-else
-    with_internalguichan=yes
-
-    CPPFLAGS="$CPPFLAGS -I./guichan/include"
-
-    AC_DEFINE(USE_INTERNALGUICHAN, 1, [Defines if ManaPlus should use internal guichan classes])
-fi
-AM_CONDITIONAL(USE_INTERNALGUICHAN, test x$with_internalguichan = xyes)
+AC_CHECK_HEADERS([guichan/widgetlistener.hpp], ,
+AC_MSG_ERROR([ *** Guichan library version is found  but version is < 0.8.0 (http://guichan.sf.net/)]))
 
+AC_CHECK_LIB([guichan_sdl], [gcnSDL], ,
+AC_MSG_ERROR([ *** Unable to find Guichan SDL library (http://guichan.sf.net/)]))
 
 AC_CHECK_LIB(SDL_net, SDLNet_Init, ,
 AC_MSG_ERROR([ *** Unable to find SDL_net library]))
diff --git a/src/Makefile.am b/src/Makefile.am
index 00a6713ad..7263592ff 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,101 +21,6 @@ else
 manaplus_SOURCES =
 endif
 
-if USE_INTERNALGUICHAN
-manaplus_CXXFLAGS += -DUSE_INTERNALGUICHAN
-manaplus_SOURCES += guichan/include/guichan/actionevent.hpp \
-	      guichan/include/guichan/actionlistener.hpp \
-	      guichan/include/guichan/basiccontainer.hpp \
-	      guichan/include/guichan/cliprectangle.hpp \
-	      guichan/include/guichan/color.hpp \
-	      guichan/include/guichan/deathlistener.hpp \
-	      guichan/include/guichan/defaultfont.hpp \
-	      guichan/include/guichan/event.hpp \
-	      guichan/include/guichan/exception.hpp \
-	      guichan/include/guichan/focushandler.hpp \
-	      guichan/include/guichan/focuslistener.hpp \
-	      guichan/include/guichan/font.hpp \
-	      guichan/include/guichan/graphics.hpp \
-	      guichan/include/guichan/gui.hpp \
-	      guichan/include/guichan/image.hpp \
-	      guichan/include/guichan/imageloader.hpp \
-	      guichan/include/guichan/input.hpp \
-	      guichan/include/guichan/inputevent.hpp \
-	      guichan/include/guichan/key.hpp \
-	      guichan/include/guichan/keyevent.hpp \
-	      guichan/include/guichan/keyinput.hpp \
-	      guichan/include/guichan/keylistener.hpp \
-	      guichan/include/guichan/listmodel.hpp \
-	      guichan/include/guichan/mouseevent.hpp \
-	      guichan/include/guichan/mouseinput.hpp \
-	      guichan/include/guichan/mouselistener.hpp \
-	      guichan/include/guichan/platform.hpp \
-	      guichan/include/guichan/rectangle.hpp \
-	      guichan/include/guichan/selectionevent.hpp \
-	      guichan/include/guichan/selectionlistener.hpp \
-	      guichan/include/guichan/sdl/sdlgraphics.hpp \
-	      guichan/include/guichan/sdl/sdlimage.hpp \
-	      guichan/include/guichan/sdl/sdlpixel.hpp \
-	      guichan/include/guichan/widget.hpp \
-	      guichan/include/guichan/widgetlistener.hpp \
-	      guichan/include/guichan/widgets/button.hpp \
-	      guichan/include/guichan/widgets/checkbox.hpp \
-	      guichan/include/guichan/widgets/container.hpp \
-	      guichan/include/guichan/widgets/dropdown.hpp \
-	      guichan/include/guichan/widgets/icon.hpp \
-	      guichan/include/guichan/widgets/imagebutton.hpp \
-	      guichan/include/guichan/widgets/label.hpp \
-	      guichan/include/guichan/widgets/listbox.hpp \
-	      guichan/include/guichan/widgets/radiobutton.hpp \
-	      guichan/include/guichan/widgets/scrollarea.hpp \
-	      guichan/include/guichan/widgets/slider.hpp \
-	      guichan/include/guichan/widgets/tabbedarea.hpp \
-	      guichan/include/guichan/widgets/tab.hpp \
-	      guichan/include/guichan/widgets/textbox.hpp \
-	      guichan/include/guichan/widgets/textfield.hpp \
-	      guichan/include/guichan/widgets/window.hpp
-
-manaplus_SOURCES += guichan/actionevent.cpp \
-	      guichan/basiccontainer.cpp \
-	      guichan/cliprectangle.cpp \
-	      guichan/color.cpp \
-	      guichan/defaultfont.cpp \
-	      guichan/event.cpp \
-	      guichan/exception.cpp \
-	      guichan/focushandler.cpp \
-	      guichan/font.cpp \
-	      guichan/graphics.cpp \
-	      guichan/gui.cpp \
-	      guichan/image.cpp \
-	      guichan/inputevent.cpp \
-	      guichan/key.cpp \
-	      guichan/keyevent.cpp \
-	      guichan/keyinput.cpp \
-	      guichan/mouseevent.cpp \
-	      guichan/mouseinput.cpp \
-	      guichan/rectangle.cpp \
-	      guichan/selectionevent.cpp \
-	      guichan/widget.cpp \
-	      guichan/sdl/sdlgraphics.cpp \
-	      guichan/sdl/sdlimage.cpp \
-	      guichan/widgets/button.cpp \
-	      guichan/widgets/checkbox.cpp \
-	      guichan/widgets/container.cpp \
-	      guichan/widgets/dropdown.cpp \
-	      guichan/widgets/icon.cpp \
-	      guichan/widgets/imagebutton.cpp \
-	      guichan/widgets/label.cpp \
-	      guichan/widgets/listbox.cpp \
-	      guichan/widgets/radiobutton.cpp \
-	      guichan/widgets/scrollarea.cpp \
-	      guichan/widgets/slider.cpp \
-	      guichan/widgets/tabbedarea.cpp \
-	      guichan/widgets/tab.cpp \
-	      guichan/widgets/textbox.cpp \
-	      guichan/widgets/textfield.cpp \
-	      guichan/widgets/window.cpp
-endif
-
 manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/widgets/avatarlistbox.h \
 	      gui/widgets/battletab.cpp \
@@ -737,8 +642,7 @@ EXTRA_DIST = CMakeLists.txt \
 	     winver.h.in \
 	     manaplus.rc \
 	     SDLMain.h \
-	     SDLMain.m \
-	     SDL_gfx/SDL_gfxBlitFunc.h
+	     SDLMain.m
 
 # set the include path found by configure
 INCLUDES = $(all_includes)