Made OpenGL enabled by default.

2 files changed, 17 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 423f74d7..016fac87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,19 +1,24 @@
-2007-02-26  Philipp Sehmisch  <tmw@crushnet.org>
+2007-02-26  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* configure.ac: Made OpenGL enabled by default.
+
+2007-02-26  Philipp Sehmisch  <tmw@crushnet.org>
+
 	* data/sfx/maggot-dying1.ogg, data/sfx/maggot-hit1.ogg,
 	data/sfx/maggot-hit2.ogg, data/sfx/maggot-miss1.ogg,
-	data/sfx/pinkie-hit1.ogg, data/sfx/pinkie-miss1.ogg, , data/monsters.xml:
-	New sound effects by Cosmostrator.
+	data/sfx/pinkie-hit1.ogg, data/sfx/pinkie-miss1.ogg,
+	data/monsters.xml: New sound effects by Cosmostrator.
 
 2007-02-21  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* src/gui/char-server.cpp, src/gui/updatewindow.cpp, src/gui/main.cpp,
 	src/gui/main.h: Added a new state "LOADDATA_STATE" that loads the XML
 	databases.
-	* src/resourcemanager.cpp, src/resourcemanager.h, src/main.cpp, customdata/:
-	Added a customdata dir that allows to add custom user data easily. Just
-	create a zip file with the same structure like the update archives and drop
-	it in the customdata folder and the files in it override the default data
-	and the updates.
+	* src/resourcemanager.cpp, src/resourcemanager.h, src/main.cpp,
+	customdata/: Added a customdata dir that allows to add custom user
+	data easily. Just create a zip file with the same structure like the
+	update archives and drop it in the customdata folder and the files in
+	it override the default data and the updates.
 
 2007-02-20  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
diff --git a/configure.ac b/configure.ac
index 8293650f..9ccf1411 100755
--- a/configure.ac
+++ b/configure.ac
@@ -77,15 +77,15 @@ AC_MSG_ERROR([*** Library found but cannot find headers (guichan.sf.net) *** ]))
 AM_INIT_AUTOMAKE
 
 # Option to enable OpenGL
-AC_ARG_WITH(opengl,[  --with-opengl           use OpenGL ] )
-if test "x$with_opengl" == "xyes"; then
+AC_ARG_WITH(opengl,[  --without-opengl        don't use OpenGL ] )
+if test "x$with_opengl" == "xno"; then
+    with_opengl=no
+else
     with_opengl=yes
     OPENGL_CFLAGS=' -DUSE_OPENGL'
     OPENGL_LIBS=' -lGL -lguichan_opengl'
     AC_SUBST(OPENGL_CFLAGS)
     AC_SUBST(OPENGL_LIBS)
-else
-    with_opengl=no
 fi
 
 # Search for sdl-config