Author: jensg
Date: Sat Feb 16 12:36:13 2008
New Revision: 8492
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=8492&view=rev
Log:
2008-02-16 Jens Granseuer <[EMAIL PROTECTED]>
* configure.in: remove obsolete checks
Modified:
trunk/ChangeLog
trunk/configure.in
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Sat Feb 16 12:36:13 2008
@@ -308,51 +308,6 @@
AM_GCONF_SOURCE_2
dnl ==============================================
-dnl OSS section
-dnl ==============================================
-have_oss=no
-AC_TRY_COMPILE([
- #ifdef __NetBSD__
- #include <sys/param.h>
- #include <sys/sysctl.h>
- #include <soundcard.h>
- #else
- #include <sys/soundcard.h>
- #endif
- ],[
- int arg = SNDCTL_DSP_SETFRAGMENT;
- ],[
- have_oss=yes
-])
-AC_MSG_CHECKING(for OSS audio support)
-AC_MSG_RESULT($have_oss)
-AM_CONDITIONAL(HAVE_OSS, test x"$have_oss" = "xyes")
-
-dnl ==============================================
-dnl ALSA section
-dnl ==============================================
-have_alsa=no
-AC_ARG_ENABLE(alsa,
- AC_HELP_STRING([--disable-alsa],
- [turn off ALSA audio support]),
- [case "${enableval}" in
- yes) WANT_ALSA=yes ;;
- no) WANT_ALSA=no ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --disable-alsa) ;;
- esac],
- [WANT_ALSA=yes]) dnl Default value
-
-if test x$WANT_ALSA = xyes ; then
- PKG_CHECK_MODULES(ALSA, alsa >= 0.9.0,
- have_alsa=yes,
- AC_MSG_RESULT([disabled]))
-fi
-
-AM_CONDITIONAL(HAVE_ALSA, test x"$have_alsa" = "xyes")
-AC_SUBST(ALSA_LIBS)
-AC_SUBST(ALSA_CFLAGS)
-
-dnl ==============================================
dnl Esd section
dnl ==============================================
have_esd=no
@@ -373,7 +328,6 @@
AC_MSG_RESULT([disabled]))
fi
-AM_CONDITIONAL(HAVE_ESD, test x"$have_esd" = "xyes")
AC_SUBST(ESD_CFLAGS)
AC_SUBST(ESD_LIBS)
@@ -383,7 +337,7 @@
GST_MAJORMINOR=auto
AC_ARG_ENABLE(gstreamer,
-AC_HELP_STRING([--enable-gstreamer],[use gstreamer if available (and
optionally specify a version)]),
+AC_HELP_STRING([--disable-gstreamer],[disable gstreamer support]),
[case "${enableval}" in
yes) ENABLE_GSTREAMER=yes ;;
0.10) ENABLE_GSTREAMER=yes && GST_MAJORMINOR=0.10 ;;
@@ -413,9 +367,8 @@
AC_SUBST(GST_CFLAGS)
if test "x$have_gstreamer" = "xyes"; then
- PKG_CHECK_MODULES(SOUND_CAPPLET, esound)
- SOUND_CAPPLET_LIBS="$SOUND_CAPPLET_LIBS $GST_LIBS -lgstaudio-0.10
-lgstinterfaces-0.10"
- SOUND_CAPPLET_CFLAGS="$SOUND_CAPPLET_CFLAGS $GST_CFLAGS"
+ SOUND_CAPPLET_LIBS="$ESD_LIBS $GST_LIBS -lgstaudio-0.10 -lgstinterfaces-0.10"
+ SOUND_CAPPLET_CFLAGS="$ESD_CFLAGS $GST_CFLAGS"
AC_SUBST(SOUND_CAPPLET_LIBS)
AC_SUBST(SOUND_CAPPLET_CFLAGS)
else
_______________________________________________
SVN-commits-list mailing list (read only)
http://mail.gnome.org/mailman/listinfo/svn-commits-list
Want to limit the commits to a few modules? Go to above URL, log in to edit
your options and select the modules ('topics') you want.
Module maintainer? It is possible to set the reply-to to your development
mailing list. Email [EMAIL PROTECTED] if interested.
