aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--configure.ac28
2 files changed, 9 insertions, 31 deletions
diff --git a/ChangeLog b/ChangeLog
index 7e78eedfe..e0ee67314 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,18 @@
-2006-06-09hristian Persch <chpe@cvs.gnome.org>
+2006-06-09 Christian Persch <chpe@cvs.gnome.org>
- * configure.ac:
+ * configure.ac:
+
+ Remove accidentally commited code.
+
+2006-06-09 Christian Persch <chpe@cvs.gnome.org>
+
+ * configure.ac:
Fix the build.
2006-06-09 Christian Persch <chpe@cvs.gnome.org>
- * configure.ac:
+ * configure.ac:
Fix configure output.
diff --git a/configure.ac b/configure.ac
index 831614c89..9ea02b0bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -560,33 +560,6 @@ fi
AM_CONDITIONAL([ENABLE_SPELLCHECKER],[test "$enable_spell_checker" = "yes" -a "$have_gecko_spell_checker" = "yes"])
-# DSP wrapper
-
-AC_MSG_CHECKING([whether to enable the polypaudio DSP wrapper])
-AC_ARG_ENABLE([polypaudio],
- AS_HELP_STRING([--enable-polypaudio],[Whether to wrap calls to /dev/dsp using polypaudio]),
- [],[enable_polypaudio=no])
-AC_MSG_RESULT([$enable_polypaudio])
-
-POLYPDSP_LIBS=
-if test "$enable_polypaudio" = "yes"; then
- PKG_CHECK_MODULES([POLYPDSP],[polyplib])
-
- AC_LANG_PUSH([C])
- _SAVE_LIBS=$LIBS
- LIBS="$LIBS $POLYPDSP_LIBS"
-
- AC_CHECK_LIB([polypdsp],[main],
- [AC_DEFINE([HAVE_POLYPDSP],[1],[Define if libpolypdsp is available])
- POLYPDSP_LIBS="$POLYPDSP_LIBS -lpolypdsp"],
- [AC_MSG_ERROR([Polypaudio DSP wrapper was requested but libpolypdsp not found])])
-
- LIBS="$_SAVE_LIBS"
- AC_LANG_POP([C])
-fi
-
-AC_SUBST([POLYPDSP_LIBS])
-
# ************
# Misc defines
# ************
@@ -697,7 +670,6 @@ echo "NetworkManager support : $enable_network_manager"
echo "Certificate manager : $enable_certificate_manager (experimental)"
echo "Python support : $enable_python"
echo "Desktop file plugin : $enable_desktop_file_plugin"
-echo "Polypaudio DSP wrapper : $enable_polypaudio"
echo "Spellchecker : $enable_spell_checker"
echo "Debug mode : $enable_debug"
echo ""