--- configure.old	2007-01-19 11:29:19.000000000 +0100
+++ configure	2007-01-19 12:01:05.000000000 +0100
@@ -59,13 +59,18 @@
 	echo "Options: "
 	echo "		-k,--enable-ktoonstyle	Enables KToonStyle"
 	echo "		--enable-kinas 		Enable KINAS"
+	echo "		--disable-gif 		Disable gif support"
+	echo "		--without-spell 		Don't use aspell"
+	echo "		--without-gstreamer 	Don't use gstreamer"
+	echo "		--without-ffmpeg 		Don't use ffmpeg"
+	echo "		--without-ming 			Don't use ming"
 	echo
 	exit 0;
 }
 
 echo "/* Generated automatically by configure script */" > $CONFIG_H 
 
-TEMP=`getopt -o kh:: --long help,enable-ktoonstyle,enable-kinas:: -n "$0" -- "$@"`
+TEMP=`getopt -o kh:: --long help,enable-ktoonstyle,enable-kinas,disable-gif,without-spell,without-gstreamer,without-ffmpeg,without-ming:: -n "$0" -- "$@"`
 
 eval set -- "$TEMP"
 while [ true ]
@@ -74,6 +79,11 @@
 		-h|--help) usage; shift;;
 		-k|--enable-ktoonstyle) defineMacro ENABLE_KTOONSTYLE; shift ;;
 		--enable-kinas) defineMacro ENABLE_KINAS; shift ;;
+		--disable-gif) GIF_NOSUPPORT="1"; shift ;;
+		--without-spell) ASPELL_NOSUPPORT="1"; shift ;;
+		--without-gstreamer) GSTREAMER_NOSUPPORT="1"; shift ;;
+		--without-ffmpeg) FFMPEG_NOSUPPORT="1"; shift ;;
+		--without-ming) MING_NOSUPPORT="1"; shift ;;
 		--) shift ; break ;;
 		*) break;
 	esac
@@ -90,31 +100,35 @@
 echo > $DLIB_CONFIG
 
 # Checking aspell
-check "aspell" aspell && defineDLibConf "LIBS += -laspell" && defineDLibConf  "DEFINES += HAVE_ASPELL"
+[ -z $ASPELL_NOSUPPORT ]  && check "aspell" aspell && defineDLibConf "LIBS += -laspell" && defineDLibConf  "DEFINES += HAVE_ASPELL"
 
 
 # Checking gstreamer
-export GST_LIBS=`pkg-config gstreamer-0.10 --libs --silence-errors`
-export GST_INCLUDE=`pkg-config gstreamer-0.10 --cflags --silence-errors`
-check "sound" sound "${GST_INCLUDE}" "${GST_LIBS}" && INCPATH="$INCPATH $GST_INCLUDE" LIBS="$LIBS $GST_LIBS" && defineMacro HAVE_SOUND && defineDLibConf "LIBS += ${GST_LIBS}" && defineDLibConf "INCLUDEPATH += ${GST_INCLUDE}"
+if [ ! $GSTREAMER_NOSUPPORT ]; then
+	export GST_LIBS=`pkg-config gstreamer-0.10 --libs --silence-errors`
+	export GST_INCLUDE=`pkg-config gstreamer-0.10 --cflags --silence-errors`
+	check "sound" sound "${GST_INCLUDE}" "${GST_LIBS}" && INCPATH="$INCPATH $GST_INCLUDE" LIBS="$LIBS $GST_LIBS" && defineMacro HAVE_SOUND && defineDLibConf "LIBS += ${GST_LIBS}" && defineDLibConf "INCLUDEPATH += ${GST_INCLUDE}"
+fi
 
 # Checking gif
-check "gif" gif && LIBS="$LIBS -lgif" && defineMacro HAVE_LIBGIF
+[ -z $GIF_NOSUPPORT ] && check "gif" gif && LIBS="$LIBS -lgif" && defineMacro HAVE_LIBGIF
 
 # checking ffmpeg
-check "ffmpeg 0.4.9" ffmpeg && LIBS="$LIBS -lavcodec -lavformat" && defineMacro HAVE_FFMPEG
+[ -z $FFMPEG_NOSUPPORT ] && check "ffmpeg 0.4.9" ffmpeg && LIBS="$LIBS -lavcodec -lavformat" && defineMacro HAVE_FFMPEG
 
 
 # Checking ming
 
-if [ -x "`which ming-config`" ]
-then
-	export MING_LIBS=`ming-config --libs`
-	export MING_INCLUDE=`ming-config --cflags`
+if [ ! $MING_NOSUPPORT ] ; then
+	if [ -x "`which ming-config`" ]
+	then
+		export MING_LIBS=`ming-config --libs`
+		export MING_INCLUDE=`ming-config --cflags`
+	fi
+	
+	check "ming" ming "${MING_INCLUDE}" "${MING_LIBS}" && LIBS="$LIBS ${MING_LIBS}" && defineMacro HAVE_MING
 fi
 
-check "ming" ming "${MING_INCLUDE}" "${MING_LIBS}" && LIBS="$LIBS ${MING_LIBS}" && defineMacro HAVE_MING
-
 
 
 ### end checking ###