Index: configure.in.in
===================================================================
RCS file: /home/kde/kdeextragear-1/k3b/configure.in.in,v
retrieving revision 1.48.2.1
retrieving revision 1.48.2.2
diff -u -3 -r1.48.2.1 -r1.48.2.2
--- configure.in.in	19 Jan 2005 12:54:41 -0000	1.48.2.1
+++ configure.in.in	23 Feb 2005 17:35:04 -0000	1.48.2.2
@@ -118,68 +118,93 @@
 AC_C_BIGENDIAN()
 
 
-AC_MSG_CHECKING(for ogg/vorbis headers)
-ogg_vorbis=no
-AC_TRY_COMPILE([
-		#include <vorbis/codec.h>
-		#include <vorbis/vorbisfile.h>
+dnl === Ogg Vorbis Test - Begin ===
+AC_ARG_WITH(oggvorbis, AS_HELP_STRING([--without-oggvorbis], [build without OggVorbis support (default=no)]), [ac_cv_use_oggvorbis=$withval], [ac_cv_use_oggvorbis=yes])
+
+if test "$ac_cv_use_oggvorbis" = "yes"; then
+
+  AC_MSG_CHECKING(for ogg/vorbis headers)
+  ogg_vorbis=no
+  AC_TRY_COMPILE([
+  		#include <vorbis/codec.h>
+  		#include <vorbis/vorbisfile.h>
                 ],[
                 ],[
                 ogg_vorbis=yes
                 ])
-AC_MSG_RESULT($ogg_vorbis)
-if test x$ogg_vorbis = xyes; then
-   dnl we need the ogg_vorbis_lib because otherwise we override LIBS !
-   AC_CHECK_LIB(vorbisfile,ov_open,ogg_vorbis_lib=yes,
-                ogg_vorbis=no,[-lvorbisfile -lvorbis -logg])
-fi
-if test x$ogg_vorbis = xyes; then
+  AC_MSG_RESULT($ogg_vorbis)
+  if test x$ogg_vorbis = xyes; then
+     dnl we need the ogg_vorbis_lib because otherwise we override LIBS !
+     AC_CHECK_LIB(vorbisfile,ov_open,ogg_vorbis_lib=yes,
+                  ogg_vorbis=no,[$all_libraries -lvorbisfile -lvorbis -logg])
+  fi
+  if test x$ogg_vorbis = xyes; then
 	AC_DEFINE(OGG_VORBIS,1,[Define if you have ogg/vorbis installed])
+  fi
 fi
 
 AM_CONDITIONAL(include_OGG, [test x$ogg_vorbis = xyes])
+dnl === Ogg Vorbis Test - End ===
 
+dnl === libmad MPEG decoder check - begin ===
+AC_ARG_WITH(libmad, AS_HELP_STRING([--without-libmad], [build without libmad support (default=no)]), [ac_cv_use_libmad=$withval], [ac_cv_use_libmad=yes])
 
-dnl === libmad MPEG decoder check ===
-MAD_LIB=""
-AC_CHECK_HEADER(mad.h, [
+if test "$ac_cv_use_libmad" = "yes"; then
+  MAD_LIB=""
+  KDE_CHECK_HEADER(mad.h, [
 	AC_CHECK_LIB(mad, mad_synth_frame, [
 		MAD_LIB="-lmad"
-		AC_DEFINE(HAVE_LIBMAD,1,[defined if you have libmad headers and libraries])
-	])
-])
-AC_SUBST(MAD_LIB)
+		AC_DEFINE(HAVE_LIBMAD,1,[defined if you have libmad headers and libraries])],
+		[],
+		$all_libraries
+	)
+  ])
+  AC_SUBST(MAD_LIB)
+fi
 
 AM_CONDITIONAL(include_MP3, [test -n "$MAD_LIB"])
+dnl === libmad MPeg decoder check - end ===
 
+dnl === test for FLAC++ and FLAC - begin ====
+AC_ARG_WITH(flac, AS_HELP_STRING([--without-flac], [build without FLAC support (default=no)]), [ac_cv_use_flac=$withval], [ac_cv_use_flac=yes])
 
-
-dnl === test for FLAC++ and FLAC ====
 have_flac=no
-KDE_CHECK_HEADERS(FLAC++/decoder.h, [
-   AC_CHECK_LIB(FLAC,FLAC__seekable_stream_decoder_process_single,
-	        have_flac=yes)])
+if test "$ac_cv_use_flac" = "yes"; then
+  KDE_CHECK_HEADERS(FLAC++/decoder.h, [
+     AC_CHECK_LIB(FLAC,FLAC__seekable_stream_decoder_process_single,
+	        have_flac=yes,[],$all_libraries)])
+fi
+
 AM_CONDITIONAL(include_FLAC, [test x$have_flac = xyes])
+dnl === test for FLAC++ and FLAC - end ====
 
+dnl === check for id3lib - begin ============
+AC_ARG_WITH(id3lib, AS_HELP_STRING([--without-id3lib], [build without id3lib support (default=no)]), [ac_cv_use_id3lib=$withval], [ac_cv_use_id3lib=yes])
 
-dnl === check for id3lib ============
-ID3_LIB=""
-KDE_CHECK_HEADERS(id3/tag.h, [
-	ID3_LIB="-lid3"
-	AC_DEFINE(HAVE_LIBID3,1,[defined if you have libid3 headers and libraries])
-])
-AC_SUBST(ID3_LIB)
+if test "$ac_cv_use_id3lib" = "yes"; then
+  ID3_LIB=""
+  KDE_CHECK_HEADERS(id3/tag.h, [
+  	ID3_LIB="-lid3"
+  	AC_DEFINE(HAVE_LIBID3,1,[defined if you have libid3 headers and libraries])
+  ])
+  AC_SUBST(ID3_LIB)
+fi
+dnl === check for id3lib - end ============
 
+dnl === check for resmgr - begin ============
+AC_ARG_WITH(resmgr, AS_HELP_STRING([--without-resmgr], [build without ResMgr support (default=no)]), [ac_cv_use_resmgr=$withval], [ac_cv_use_resmgr=yes])
 
-dnl === check for resmgr ============
-RESMGR_LIB=""
-AC_CHECK_HEADERS(resmgr.h, [
-       AC_CHECK_LIB(resmgr,rsm_open_device,[
-               RESMGR_LIB="-lresmgr"
-               AC_DEFINE(HAVE_RESMGR,1,[defined if you have resmgr libraries and headers])
-       ])
-])
-AC_SUBST(RESMGR_LIB)
+if test "$ac_cv_use_regmgr" = "yes"; then
+  RESMGR_LIB=""
+  KDE_CHECK_HEADERS(resmgr.h, [
+         KDE_CHECK_LIB(resmgr,rsm_open_device,[
+                 RESMGR_LIB="-lresmgr"
+                 AC_DEFINE(HAVE_RESMGR,1,[defined if you have resmgr libraries and headers])
+         ])
+  ])
+  AC_SUBST(RESMGR_LIB)
+fi
+dnl === check for resmgr - end ============
 
 AC_ARG_WITH(external-libsamplerate,
 	[  --with-external-libsamplerate   use the libsamplerate provided by the system (default=yes)],