From 1d1b0f15db4ed511b222ec8c67169f649fba3c14 Mon Sep 17 00:00:00 2001
From: meep-eep <meep-eep@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Thu, 26 Sep 2002 23:26:19 +0000
Subject: [PATCH] Removed SMPEG dependancy. Added --enable-debug support from
 Mudrony (with additions).

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@85 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/configure.ac                              | 181 ++++++++++--------
 sc2/src/Makefile.am                           |   4 +-
 sc2/src/sc2code/Makefile.am                   |   2 +-
 sc2/src/sc2code/comm/Makefile.am              |   2 +-
 sc2/src/sc2code/libs/Makefile.am              |   2 +-
 sc2/src/sc2code/libs/decomp/Makefile.am       |   2 +-
 sc2/src/sc2code/libs/graphics/Makefile.am     |   4 +-
 sc2/src/sc2code/libs/graphics/sdl/Makefile.am |   2 +-
 sc2/src/sc2code/libs/input/Makefile.am        |   2 +-
 sc2/src/sc2code/libs/input/sdl/Makefile.am    |   2 +-
 sc2/src/sc2code/libs/math/Makefile.am         |   2 +-
 sc2/src/sc2code/libs/memory/Makefile.am       |   2 +-
 sc2/src/sc2code/libs/resource/Makefile.am     |   2 +-
 sc2/src/sc2code/libs/sound/Makefile.am        |   2 +-
 sc2/src/sc2code/libs/sound/sdl/Makefile.am    |   2 +-
 sc2/src/sc2code/libs/strings/Makefile.am      |   2 +-
 sc2/src/sc2code/libs/task/Makefile.am         |   2 +-
 sc2/src/sc2code/libs/threads/Makefile.am      |   2 +-
 sc2/src/sc2code/libs/threads/sdl/Makefile.am  |   2 +-
 sc2/src/sc2code/libs/time/Makefile.am         |   2 +-
 sc2/src/sc2code/libs/time/sdl/Makefile.am     |   2 +-
 sc2/src/sc2code/libs/video/Makefile.am        |   2 +-
 sc2/src/sc2code/planets/Makefile.am           |   2 +-
 sc2/src/sc2code/ships/Makefile.am             |   2 +-
 24 files changed, 122 insertions(+), 109 deletions(-)

diff --git a/sc2/configure.ac b/sc2/configure.ac
index 34ce03b2a..a4c20d520 100644
--- a/sc2/configure.ac
+++ b/sc2/configure.ac
@@ -67,59 +67,56 @@ AC_CHECK_FUNCS([strupr])
 
 # Check for SDL
 SDL_VERSION=1.2.2
-SMPEG_VERSION=0.4.0
 AM_PATH_SDL($SDL_VERSION, , AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]))
-AM_PATH_SMPEG($SMPEG_VERSION, , AC_MSG_ERROR([*** smpeg version $SMPEG_VERSION not found!]))
 AC_CHECK_LIB(SDL_mixer, main, , AC_MSG_ERROR([Your system is missing libSDL_mixer!]),`sdl-config --libs`)
 AC_CHECK_LIB(SDL_image, main, , AC_MSG_ERROR([Your system is missing libSDL_image!]),`sdl-config --libs`)
-AC_CHECK_LIB(smpeg, main, , AC_MSG_ERROR([Your system is missing libsmpeg!]),`smpeg-config --libs`)
 #AC_CHECK_HEADERS(SDL/SDL_image.h, , AC_MSG_ERROR([Your system is missing SDL_image.h!]))
 #AC_CHECK_HEADERS(SDL/SDL_mixer.h, , AC_MSG_ERROR([Your system is missing SDL_mixer.h!]))
 
 # Select platform dependent OpenGL libs.. (tweak your platform here)
 case "$target" in
-    *-*-linux-gnu*)
-        SYS_GL_LIBS="-lGL"
-        ;;
-    *-*-cygwin* | *-*-mingw32*)
-        SYS_GL_LIBS="-lopengl32"
-	SYS_GL_CFLAGS="-DGL_VERSION_1_2"
-        ;;
-    *-*-beos*)
-        SYS_GL_LIBS="-lGL"
-        ;;
-    *-*-darwin*)
-        SYS_GL_LIBS=""
-        ;;
-    *-*-freebsd*)
-        AC_PATH_X
-	if test x$no_x != xyes; then
-            CFLAGS="$CFLAGS -L $x_libraries"
-        fi
-	SYS_GL_LIBS="-lGL"
-	;;
-    *)
-        if test x$have_x = xyes; then
-            CFLAGS="$CFLAGS $X_CFLAGS"
-            SYS_GL_LIBS="$X_LIBS -lGL"
-        else
-            SYS_GL_LIBS="-lGL"
-        fi
-        ;;
+	*-*-linux-gnu*)
+		SYS_GL_LIBS="-lGL"
+		;;
+	*-*-cygwin* | *-*-mingw32*)
+		SYS_GL_LIBS="-lopengl32"
+		SYS_GL_CFLAGS="-DGL_VERSION_1_2"
+		;;
+	*-*-beos*)
+		SYS_GL_LIBS="-lGL"
+		;;
+	*-*-darwin*)
+		SYS_GL_LIBS=""
+		;;
+	*-*-freebsd*)
+		AC_PATH_X
+		if test x$no_x != xyes; then
+			CFLAGS="$CFLAGS -L $x_libraries"
+		fi
+		SYS_GL_LIBS="-lGL"
+		;;
+	*)
+		if test x$have_x = xyes; then
+			CFLAGS="$CFLAGS $X_CFLAGS"
+			SYS_GL_LIBS="$X_LIBS -lGL"
+		else
+			SYS_GL_LIBS="-lGL"
+		fi
+		;;
 esac
 
 # Check for OpenGL
 AC_MSG_CHECKING(for OpenGL support)
 have_opengl=no
 AC_TRY_COMPILE([
- #if defined(__APPLE__) && defined(__MACH__)
- #include <OpenGL/gl.h>
- #else
- #include <GL/gl.h>
- #endif
+#if defined(__APPLE__) && defined(__MACH__)
+#include <OpenGL/gl.h>
+#else
+#include <GL/gl.h>
+#endif
 ],[
 ],[
-have_opengl=yes
+	have_opengl=yes
 ])
 AC_MSG_RESULT($have_opengl)
 GL_LIBS=$SYS_GL_LIBS
@@ -127,26 +124,26 @@ AC_SUBST(GL_LIBS)
 
 # Figure out which math library to use
 case "$target" in
-    *-*-linux-gnu*)
-        MATHLIB=""
-        ;;
-    *-*-cygwin* | *-*-mingw32*)
-        MATHLIB=""
-        ;;
-    *-*-beos*)
-        MATHLIB=""
-        ;;
-    *-*-darwin*)
-        MATHLIB=""
-        ;;
-    *)
-        MATHLIB="-lm"
-        AC_PATH_X
-        AC_PATH_XTRA
-        if test x$have_x = xyes; then
-            CFLAGS="$CFLAGS $X_CFLAGS"
-        fi
-        ;;
+	*-*-linux-gnu*)
+		MATHLIB=""
+		;;
+	*-*-cygwin* | *-*-mingw32*)
+		MATHLIB=""
+		;;
+	*-*-beos*)
+		MATHLIB=""
+		;;
+	*-*-darwin*)
+		MATHLIB=""
+		;;
+	*)
+		MATHLIB="-lm"
+		AC_PATH_X
+		AC_PATH_XTRA
+		if test x$have_x = xyes; then
+			CFLAGS="$CFLAGS $X_CFLAGS"
+		fi
+		;;
 esac
 AC_SUBST(MATHLIB)
 
@@ -163,16 +160,32 @@ AM_PROG_LIBTOOL
 # LIBADD_DL=-dlopen
 
 # Internationalization support
-# AM_GNU_GETTEXT  
+# AM_GNU_GETTEXT
 
 # supported languages:
 # ALL_LINGUAS=""
 
 # Set PACKAGE_LOCALE_DIR in config.h.
 if test "x${prefix}" = "xNONE"; then
-  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${ac_default_prefix}/${DATADIRNAME}/locale$", "Locale files")
+	AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${ac_default_prefix}/${DATADIRNAME}/locale$", "Locale files")
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale", "Locale files")
+	AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale", "Locale files")
+fi
+
+# --------------------------------------------------------------------------
+# User selectable features (conditionals)
+
+AC_ARG_ENABLE(debug,
+	[  --enable-debug          Turn on debugging],
+	[case "${enableval}" in
+	 yes) debug=true ; AC_DEFINE(DEBUG,,Include debugging code) ;;
+	 no)  debug=false ;;
+	 *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
+	esac],
+	[debug=false])
+AM_CONDITIONAL(DEBUG, test x$debug = xtrue)
+if [ "x$debug" = "xtrue" ]; then
+	CFLAGS="$CFLAGS -g"
 fi
 
 # --------------------------------------------------------------------------
@@ -185,30 +198,30 @@ AM_CONFIG_HEADER(config.h)
 # autogen.sh runs. 
 
 AC_CONFIG_FILES([
-  Makefile
-  src/Makefile 
-  src/sc2code/Makefile
-  src/sc2code/libs/Makefile
-  src/sc2code/libs/decomp/Makefile
-  src/sc2code/libs/memory/Makefile
-  src/sc2code/libs/strings/Makefile
-  src/sc2code/libs/resource/Makefile
-  src/sc2code/libs/math/Makefile
-  src/sc2code/libs/input/Makefile
-  src/sc2code/libs/input/sdl/Makefile
-  src/sc2code/libs/sound/Makefile
-  src/sc2code/libs/sound/sdl/Makefile
-  src/sc2code/libs/graphics/Makefile
-  src/sc2code/libs/graphics/sdl/Makefile
-  src/sc2code/libs/task/Makefile
-  src/sc2code/libs/threads/Makefile
-  src/sc2code/libs/threads/sdl/Makefile
-  src/sc2code/libs/time/Makefile
-  src/sc2code/libs/time/sdl/Makefile
-  src/sc2code/libs/video/Makefile
-  src/sc2code/planets/Makefile
-  src/sc2code/ships/Makefile
-  src/sc2code/comm/Makefile
+	Makefile
+	src/Makefile 
+	src/sc2code/Makefile
+	src/sc2code/libs/Makefile
+	src/sc2code/libs/decomp/Makefile
+	src/sc2code/libs/memory/Makefile
+	src/sc2code/libs/strings/Makefile
+	src/sc2code/libs/resource/Makefile
+	src/sc2code/libs/math/Makefile
+	src/sc2code/libs/input/Makefile
+	src/sc2code/libs/input/sdl/Makefile
+	src/sc2code/libs/sound/Makefile
+	src/sc2code/libs/sound/sdl/Makefile
+	src/sc2code/libs/graphics/Makefile
+	src/sc2code/libs/graphics/sdl/Makefile
+	src/sc2code/libs/task/Makefile
+	src/sc2code/libs/threads/Makefile
+	src/sc2code/libs/threads/sdl/Makefile
+	src/sc2code/libs/time/Makefile
+	src/sc2code/libs/time/sdl/Makefile
+	src/sc2code/libs/video/Makefile
+	src/sc2code/planets/Makefile
+	src/sc2code/ships/Makefile
+	src/sc2code/comm/Makefile
 ])
 
 AC_OUTPUT
diff --git a/sc2/src/Makefile.am b/sc2/src/Makefile.am
index 5c380b4d1..7bce3b199 100644
--- a/sc2/src/Makefile.am
+++ b/sc2/src/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = sc2code
 
 #CFLAGS =
 
-INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \
+INCLUDES = @SDL_CFLAGS@ \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/sc2code \
 	-I$(top_srcdir)/src/sc2code/libs
@@ -10,6 +10,6 @@ INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \
 bin_PROGRAMS = sc2
 
 sc2_SOURCES = port.c starcon2.c
-sc2_LDADD = sc2code/libsc2.la @SDL_LIBS@ @GL_LIBS@ @SMPEG_LIBS@
+sc2_LDADD = sc2code/libsc2.la @SDL_LIBS@ @GL_LIBS@
 noinst_HEADERS = port.h
 
diff --git a/sc2/src/sc2code/Makefile.am b/sc2/src/sc2code/Makefile.am
index 2d70d7258..4c08b9729 100644
--- a/sc2/src/sc2code/Makefile.am
+++ b/sc2/src/sc2code/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/sc2code \
 	-I$(top_srcdir)/src/sc2code/libs \
-	@SDL_CFLAGS@ @SMPEG_CFLAGS@
+	@SDL_CFLAGS@
 
 noinst_LTLIBRARIES = libsc2.la
 
diff --git a/sc2/src/sc2code/comm/Makefile.am b/sc2/src/sc2code/comm/Makefile.am
index d27b0c5db..4e2b19d1c 100644
--- a/sc2/src/sc2code/comm/Makefile.am
+++ b/sc2/src/sc2code/comm/Makefile.am
@@ -10,7 +10,7 @@ RACES = \
 
 EXTRA_DIRS = $(RACES)
 
-INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \
+INCLUDES = @SDL_CFLAGS@ \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/sc2code \
 	-I$(top_srcdir)/src/sc2code/libs
diff --git a/sc2/src/sc2code/libs/Makefile.am b/sc2/src/sc2code/libs/Makefile.am
index 336bf3513..9ef5b8f29 100644
--- a/sc2/src/sc2code/libs/Makefile.am
+++ b/sc2/src/sc2code/libs/Makefile.am
@@ -6,7 +6,7 @@ noinst_HEADERS = \
 	memlib.h reslib.h sndlib.h strlib.h tasklib.h threadlib.h \
 	timelib.h vargs.h vidlib.h misc.h
 
-INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \
+INCLUDES = @SDL_CFLAGS@ \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/sc2code \
 	-I$(top_srcdir)/src/sc2code/libs
diff --git a/sc2/src/sc2code/libs/decomp/Makefile.am b/sc2/src/sc2code/libs/decomp/Makefile.am
index 0b14bff81..1a4d2792d 100644
--- a/sc2/src/sc2code/libs/decomp/Makefile.am
+++ b/sc2/src/sc2code/libs/decomp/Makefile.am
@@ -3,7 +3,7 @@
 # Written by Mudry <mudry@user.sf.net>, protected by GNU GPL.
 # CVS $ Id: $
 
-INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \
+INCLUDES = @SDL_CFLAGS@ \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/sc2code \
 	-I$(top_srcdir)/src/sc2code/libs
diff --git a/sc2/src/sc2code/libs/graphics/Makefile.am b/sc2/src/sc2code/libs/graphics/Makefile.am
index 1ca484ace..785ded1ff 100644
--- a/sc2/src/sc2code/libs/graphics/Makefile.am
+++ b/sc2/src/sc2code/libs/graphics/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = sdl
 
 #CFLAGS =
 
-INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \
+INCLUDES = @SDL_CFLAGS@ \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/sc2code \
 	-I$(top_srcdir)/src/sc2code/libs 
@@ -16,7 +16,7 @@ libgraphics_la_SOURCES = clipline.c context.c drawable.c filegfx.c font.c \
 
 libgraphics_la_LIBADD = sdl/libsdl.la
 
-#libgraphics_la_LDFLAGS = @SMPEG_LIBS@
+#libgraphics_la_LDFLAGS =
 
 noinst_HEADERS = context.h display.h drawable.h font.h gfxintrn.h \
 	gfx_common.h cmap.h
diff --git a/sc2/src/sc2code/libs/graphics/sdl/Makefile.am b/sc2/src/sc2code/libs/graphics/sdl/Makefile.am
index 54d0b4103..1adb19593 100644
--- a/sc2/src/sc2code/libs/graphics/sdl/Makefile.am
+++ b/sc2/src/sc2code/libs/graphics/sdl/Makefile.am
@@ -1,6 +1,6 @@
 #CFLAGS =
 
-INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \
+INCLUDES = @SDL_CFLAGS@ \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/sc2code \
 	-I$(top_srcdir)/src/sc2code/libs 
diff --git a/sc2/src/sc2code/libs/input/Makefile.am b/sc2/src/sc2code/libs/input/Makefile.am
index 9cad5c6bf..1baade249 100644
--- a/sc2/src/sc2code/libs/input/Makefile.am
+++ b/sc2/src/sc2code/libs/input/Makefile.am
@@ -5,7 +5,7 @@
 
 SUBDIRS = sdl
 
-INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \
+INCLUDES = @SDL_CFLAGS@ \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/sc2code \
 	-I$(top_srcdir)/src/sc2code/libs
diff --git a/sc2/src/sc2code/libs/input/sdl/Makefile.am b/sc2/src/sc2code/libs/input/sdl/Makefile.am
index 98cc1c01a..83ffe1e24 100644
--- a/sc2/src/sc2code/libs/input/sdl/Makefile.am
+++ b/sc2/src/sc2code/libs/input/sdl/Makefile.am
@@ -3,7 +3,7 @@
 # Written by Mudry <mudry@user.sf.net>, protected by GNU GPL.
 # CVS $ Id: $
 
-INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \
+INCLUDES = @SDL_CFLAGS@ \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/sc2code \
 	-I$(top_srcdir)/src/sc2code/libs
diff --git a/sc2/src/sc2code/libs/math/Makefile.am b/sc2/src/sc2code/libs/math/Makefile.am
index 7b190b131..8aa696215 100644
--- a/sc2/src/sc2code/libs/math/Makefile.am
+++ b/sc2/src/sc2code/libs/math/Makefile.am
@@ -3,7 +3,7 @@
 # Written by Mudry <mudry@user.sf.net>, protected by GNU GPL.
 # CVS $ Id: $
 
-INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \
+INCLUDES = @SDL_CFLAGS@ \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/sc2code \
 	-I$(top_srcdir)/src/sc2code/libs
diff --git a/sc2/src/sc2code/libs/memory/Makefile.am b/sc2/src/sc2code/libs/memory/Makefile.am
index b786c6bdb..8156ec1bc 100644
--- a/sc2/src/sc2code/libs/memory/Makefile.am
+++ b/sc2/src/sc2code/libs/memory/Makefile.am
@@ -3,7 +3,7 @@
 # Written by Mudry <mudry@user.sf.net>, protected by GNU GPL.
 # CVS $ Id: $
 
-INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \
+INCLUDES = @SDL_CFLAGS@ \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/sc2code \
 	-I$(top_srcdir)/src/sc2code/libs
diff --git a/sc2/src/sc2code/libs/resource/Makefile.am b/sc2/src/sc2code/libs/resource/Makefile.am
index 4c0f149bf..4a693c130 100644
--- a/sc2/src/sc2code/libs/resource/Makefile.am
+++ b/sc2/src/sc2code/libs/resource/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/sc2code \
 	-I$(top_srcdir)/src/sc2code/libs \
-	@SDL_CFLAGS@ @SMPEG_CFLAGS@
+	@SDL_CFLAGS@
 
 noinst_LTLIBRARIES = libresource.la
 libresource_la_SOURCES = getres.c loadres.c resdata.c resinit.c direct.c filecntl.c
diff --git a/sc2/src/sc2code/libs/sound/Makefile.am b/sc2/src/sc2code/libs/sound/Makefile.am
index 1081f0a9e..8e6b22bcf 100644
--- a/sc2/src/sc2code/libs/sound/Makefile.am
+++ b/sc2/src/sc2code/libs/sound/Makefile.am
@@ -5,7 +5,7 @@
 
 SUBDIRS = sdl
 
-INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \
+INCLUDES = @SDL_CFLAGS@ \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/sc2code \
 	-I$(top_srcdir)/src/sc2code/libs
diff --git a/sc2/src/sc2code/libs/sound/sdl/Makefile.am b/sc2/src/sc2code/libs/sound/sdl/Makefile.am
index d484033b2..7a490376b 100644
--- a/sc2/src/sc2code/libs/sound/sdl/Makefile.am
+++ b/sc2/src/sc2code/libs/sound/sdl/Makefile.am
@@ -3,7 +3,7 @@
 # Written by Mudry <mudry@user.sf.net>, protected by GNU GPL.
 # CVS $ Id: $
 
-INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \
+INCLUDES = @SDL_CFLAGS@ \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/sc2code \
 	-I$(top_srcdir)/src/sc2code/libs
diff --git a/sc2/src/sc2code/libs/strings/Makefile.am b/sc2/src/sc2code/libs/strings/Makefile.am
index 31b22f9da..24a14a42f 100644
--- a/sc2/src/sc2code/libs/strings/Makefile.am
+++ b/sc2/src/sc2code/libs/strings/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/sc2code \
 	-I$(top_srcdir)/src/sc2code/libs \
-	@SDL_CFLAGS@ @SMPEG_CFLAGS@
+	@SDL_CFLAGS@
 
 noinst_LTLIBRARIES = libstrings.la
 libstrings_la_SOURCES = getstr.c sfileins.c sresins.c strings.c 
diff --git a/sc2/src/sc2code/libs/task/Makefile.am b/sc2/src/sc2code/libs/task/Makefile.am
index 891a8ef00..dd15e79f9 100644
--- a/sc2/src/sc2code/libs/task/Makefile.am
+++ b/sc2/src/sc2code/libs/task/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \
+INCLUDES = @SDL_CFLAGS@ \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/sc2code \
 	-I$(top_srcdir)/src/sc2code/libs
diff --git a/sc2/src/sc2code/libs/threads/Makefile.am b/sc2/src/sc2code/libs/threads/Makefile.am
index e29c9f850..e7ea53785 100644
--- a/sc2/src/sc2code/libs/threads/Makefile.am
+++ b/sc2/src/sc2code/libs/threads/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = sdl
 
-INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \
+INCLUDES = @SDL_CFLAGS@ \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/sc2code \
 	-I$(top_srcdir)/src/sc2code/libs
diff --git a/sc2/src/sc2code/libs/threads/sdl/Makefile.am b/sc2/src/sc2code/libs/threads/sdl/Makefile.am
index 4e4e4e565..2fed9c57a 100644
--- a/sc2/src/sc2code/libs/threads/sdl/Makefile.am
+++ b/sc2/src/sc2code/libs/threads/sdl/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \
+INCLUDES = @SDL_CFLAGS@ \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/sc2code \
 	-I$(top_srcdir)/src/sc2code/libs
diff --git a/sc2/src/sc2code/libs/time/Makefile.am b/sc2/src/sc2code/libs/time/Makefile.am
index 42bd69eae..24c78e4da 100644
--- a/sc2/src/sc2code/libs/time/Makefile.am
+++ b/sc2/src/sc2code/libs/time/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = sdl
 
-INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \
+INCLUDES = @SDL_CFLAGS@ \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/sc2code \
 	-I$(top_srcdir)/src/sc2code/libs
diff --git a/sc2/src/sc2code/libs/time/sdl/Makefile.am b/sc2/src/sc2code/libs/time/sdl/Makefile.am
index 315e3810a..10dfd5994 100644
--- a/sc2/src/sc2code/libs/time/sdl/Makefile.am
+++ b/sc2/src/sc2code/libs/time/sdl/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \
+INCLUDES = @SDL_CFLAGS@ \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/sc2code \
 	-I$(top_srcdir)/src/sc2code/libs
diff --git a/sc2/src/sc2code/libs/video/Makefile.am b/sc2/src/sc2code/libs/video/Makefile.am
index a9d401ab2..6edb6f308 100644
--- a/sc2/src/sc2code/libs/video/Makefile.am
+++ b/sc2/src/sc2code/libs/video/Makefile.am
@@ -3,7 +3,7 @@
 # Written by Mudry <mudry@user.sf.net>, protected by GNU GPL.
 # CVS $ Id: $
 
-INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \
+INCLUDES = @SDL_CFLAGS@ \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/sc2code \
 	-I$(top_srcdir)/src/sc2code/libs
diff --git a/sc2/src/sc2code/planets/Makefile.am b/sc2/src/sc2code/planets/Makefile.am
index c39ca1396..ab6819d5b 100644
--- a/sc2/src/sc2code/planets/Makefile.am
+++ b/sc2/src/sc2code/planets/Makefile.am
@@ -3,7 +3,7 @@
 # Written by Mudry <mudry@user.sf.net>, protected by GNU GPL.
 # CVS $ Id: $
 
-INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \
+INCLUDES = @SDL_CFLAGS@ \
 	-I/usr/include/SDL \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/sc2code \
diff --git a/sc2/src/sc2code/ships/Makefile.am b/sc2/src/sc2code/ships/Makefile.am
index 961405012..ce4bc6e7c 100644
--- a/sc2/src/sc2code/ships/Makefile.am
+++ b/sc2/src/sc2code/ships/Makefile.am
@@ -10,7 +10,7 @@ RACES = androsyn arilou blackurq chenjesu chmmr druuge human ilwrath \
 
 EXTRA_DIRS = $(RACES)
 
-INCLUDES = @SDL_CFLAGS@ @SMPEG_CFLAGS@ \
+INCLUDES = @SDL_CFLAGS@ \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/sc2code \
 	-I$(top_srcdir)/src/sc2code/libs