more flapping wings about in wild abandonment

[platform/upstream/gstreamer.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 34f5878..3028b41 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -75,11 +75,9 @@ GST_CHECK_FEATURE(EXPERIMENTAL, [enable building of experimental plugins],,
 [HAVE_EXPERIMENTAL=yes],disabled,
 [
   AC_MSG_WARN(building experimental plugins)
-  USE_LIBMIKMOD="yes"
   USE_SMOOTHWAVE="yes"
 ],[
   AC_MSG_NOTICE(not building experimental plugins)
-  USE_LIBMIKMOD="no"
   USE_SMOOTHWAVE="no"
 ])
 
@@ -208,11 +206,26 @@ AC_MSG_RESULT(no)
 dnl Check for essential libraries first:
 dnl ====================================
 
-dnl if test -n "`cat $GST_CFLAGS | grep USE_GLIB2`"; then
-dnl   HAVE_GLIB2=yes
-dnl else
-dnl   HAVE_GLIB2=no
-dnl fi
+if test -n "`echo $GST_CFLAGS | grep USE_GLIB2`"; then
+  USE_GLIB2=yes
+else
+  USE_GLIB2=no
+fi
+
+dnl needed for some plugins and demos, now's a nice time to check for gtk
+if test x$USE_GLIB2 = xno; then
+  AM_PATH_GTK(1.2.0,,
+              AC_MSG_ERROR(Cannot find gtk: Is gtk-config in path?))
+  HAVE_GTK=yes
+  # we have to have it
+else
+  PKG_CHECK_MODULES(GTK2, gtk+-2.0, HAVE_GTK=yes, HAVE_GTK=no)
+
+  GTK_CFLAGS=$GTK2_CFLAGS
+  GTK_LIBS=$GTK2_LIBS
+fi
+AC_SUBST(GTK_LIBS)
+AC_SUBST(GTK_CFLAGS)
 
 dnl Check for X11 extensions
 AC_PATH_XTRA
@@ -254,21 +267,6 @@ AC_ARG_WITH(plugins,
 
 AC_SUBST(GST_PLUGINS_SELECTED)
 
-dnl needed for smoothwave, FIXME!
-if test x$USE_GLIB2 = xno; then
-  AM_PATH_GTK(1.2.0,,
-              AC_MSG_ERROR(Cannot find gtk: Is gtk-config in path?))
-  HAVE_GTK=yes
-  # we have to have it
-else
-  PKG_CHECK_MODULES(GTK2, gtk+-2.0, HAVE_GTK=yes, HAVE_GTK=no)
-
-  GTK_CFLAGS=$GTK2_CFLAGS
-  GTK_LIBS=$GTK2_LIBS
-fi
-AC_SUBST(GTK_LIBS)
-AC_SUBST(GTK_CFLAGS)
-
 dnl ==========================================================================
 dnl ============================= sys plugins ================================
 dnl ==========================================================================
@@ -390,7 +388,7 @@ GST_CHECK_FEATURE(AVIFILE, [avifile], windec winenc, [
 dnl *** CDParanoia ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_CDPARANOIA, true)
 GST_CHECK_FEATURE(CDPARANOIA, [CDParanoia], cdparanoia, [
-  GST_CHECK_LIBHEADER(CDPARANOIA, cdda_interface, cdda_open, , cdda_interface.h, CDPARANOIA_LIBS="-lcdda_interface -lcdda_paranoia")
+  GST_CHECK_LIBHEADER(CDPARANOIA, cdda_interface, cdda_open, -lm, cdda_interface.h, CDPARANOIA_LIBS="-lcdda_interface -lcdda_paranoia")
   AC_SUBST(CDPARANOIA_LIBS)
 ])
 dnl FIXME : add second check somehow if that is necessary
@@ -449,6 +447,12 @@ dnl *** gsm ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_GSM, true)
 GST_CHECK_FEATURE(GSM, [GSM library], gsmenc gsmdec, [
   GST_CHECK_LIBHEADER(GSM, gsm, gsm_create, , gsm.h, GSM_LIBS="-lgsm")
+  if test $HAVE_GSM != "yes"; then
+    GST_CHECK_LIBHEADER(GSM, gsm, gsm_create, , gsm/gsm.h, GSM_LIBS="-lgsm")
+    if test $HAVE_GSM = "yes"; then 
+      AC_DEFINE(GSM_HEADER_IN_SUBDIR)
+    fi
+  fi
   AC_SUBST(GSM_LIBS)
 ])
 
@@ -533,7 +537,7 @@ GST_CHECK_FEATURE(OPENQUICKTIME, [Open Quicktime], quicktime_parser quicktime_de
 dnl *** raw1394 ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_RAW1394, true)
 GST_CHECK_FEATURE(RAW1394, [raw1394 library], dv1394src, [
-  GST_CHECK_LIBHEADER(RAW1394, raw1934, raw1934_get_handle,, libraw1394/raw1394.h, RAW1394_LIBS="-raw1394")
+  GST_CHECK_LIBHEADER(RAW1394, raw1394, raw1394_get_handle,, libraw1394/raw1394.h, RAW1394_LIBS="-raw1394")
   AC_SUBST(RAW1394_LIBS)
 ])
 
@@ -567,11 +571,9 @@ GST_CHECK_FEATURE(SHOUT, [shout plugin], icecastsend, [
 ])
 
 dnl *** sidplay ***
-dnl FIXME : make this work
 translit(dnm, m, l) AM_CONDITIONAL(USE_SIDPLAY, true)
 GST_CHECK_FEATURE(SIDPLAY, [sidplay plugin], sidplay, [
-  GST_CHECK_LIBHEADER(SIDPLAY, sidplay, sidTune(), ,sidplay/sidtune.h,SIDPLAY_LIBS="-lsidplay")
-  AC_SUBST(SIDPLAY_LIBS)
+  GST_PATH_SIDPLAY()
 ])
 
 dnl *** smoothwave ***
@@ -654,7 +656,7 @@ AC_ARG_ENABLE(debug,
   no)  USE_DEBUG=no ;;
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
 esac], 
-[USE_DEBUG=no]) dnl Default value
+[USE_DEBUG=yes]) dnl Default value
 
 AC_ARG_ENABLE(DEBUG,
 [  --enable-DEBUG               compiles in a large number of debugging messages],
@@ -663,7 +665,7 @@ AC_ARG_ENABLE(DEBUG,
   no)  ENABLE_DEBUG=no ;;
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-DEBUG) ;;
 esac], 
-[ENABLE_DEBUG=no]) dnl Default value
+[ENABLE_DEBUG=yes]) dnl Default value
 if test x$ENABLE_DEBUG = xyes; then
   AC_DEFINE(GST_DEBUG_ENABLED, 1, [Define if DEBUG statements should be compiled in])
 fi
@@ -886,7 +888,6 @@ AM_CONDITIONAL(HAVE_LIBDV,          test "x$HAVE_LIBDV" = "xyes")
 AM_CONDITIONAL(HAVE_GNOME_VFS,      test "x$HAVE_GNOME_VFS" = "xyes")
 AM_CONDITIONAL(HAVE_LIBGSM,         test "x$HAVE_LIBGSM" = "xyes")
 AM_CONDITIONAL(PLUGINS_USE_BUILDDIR,  test "x$PLUGINS_USE_BUILDDIR" = "xyes")
-AM_CONDITIONAL(HAVE_SIDPLAY,        test "x$have_sidplay" = "xyes")
 
 
 dnl ############################
@@ -959,18 +960,11 @@ dnl #########################
 dnl # Make the output files #
 dnl #########################
 
-dnl gstreamer.pc
-dnl gstreamer-uninstalled.pc
-dnl gstreamer.spec,
-dnl until ffmpeg is handled by configure plugins/ffmpeg/Makefile
-dnl components/bonobo-gstmediaplay/Makefile
-dnl someone should fix this test/misc/Makefile
-dnl wtay fix this: testsuite/threads/Makefile
-dnl testsuite/refcounting/Makefile
-dnl stamp.h
-dnl echo "$infomessages", infomessages="$infomessages"
 AC_OUTPUT(
 Makefile
+gstreamer-libs.pc
+gstreamer-libs-uninstalled.pc
+gst-plugins.spec
 gst/Makefile
 gst/ac3parse/Makefile
 gst/adder/Makefile
@@ -1058,7 +1052,8 @@ gst-libs/gst/audio/Makefile
 gst-libs/gst/idct/Makefile
 gst-libs/gst/resample/Makefile
 gst-libs/gst/riff/Makefile
-gst-plugins.spec
+examples/capsfilter/Makefile
+examples/Makefile
 )
 
 echo -e "configure: *** Plugins that will be built : $GST_PLUGINS_YES"