X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/8b6ee1a1c6f1781c31cebf63e4395977ec8b7158..refs/remotes/upstream/branch-5.0:/configure.ac

diff --git a/configure.ac b/configure.ac
index 3c1125c..b0290c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,9 +18,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-AC_INIT([disorder], [4.3+], [richard+disorder@sfere.greenend.org.uk])
+AC_INIT([disorder], [5.0], [richard+disorder@sfere.greenend.org.uk])
 AC_CONFIG_AUX_DIR([config.aux])
-AM_INIT_AUTOMAKE(disorder, [4.3+])
+AM_INIT_AUTOMAKE(disorder, [5.0])
 AC_CONFIG_SRCDIR([server/disorderd.c])
 AM_CONFIG_HEADER([config.h])
 
@@ -339,9 +339,6 @@ subdirs="${subdirs} clients doc examples debian"
 
 if test $want_server = yes; then
   subdirs="${subdirs} server plugins sounds"
-  if test "$rjk_cv_libao_plugin_api_works" = yes; then
-    subdirs="${subdirs} driver"
-  fi
 fi
 if test $want_cgi = yes; then
   subdirs="${subdirs} cgi templates images"
@@ -468,19 +465,6 @@ if test $want_server = yes; then
   AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_new],
 	       [AC_SUBST(LIBFLAC,[-lFLAC])],
 	       [missing_libraries="$missing_libraries libFLAC"])
-  if test $ac_cv_lib_ao_ao_initialize = yes; then
-    # libao 1.0.0 breaks the plugin interface
-    AC_CACHE_CHECK([whether libao has a working plugin interface],
-                   [rjk_cv_libao_plugin_api_works],[
-      AC_COMPILE_IFELSE([#include <ao/ao.h>
-#include <ao/plugin.h>
-
-int ao_plugin_device_init(ao_device *d) {
-  d->internal = 0;
-}],[rjk_cv_libao_plugin_api_works=yes],[rjk_cv_libao_plugin_api_works=no])])
-  else
-    rjk_cv_libao_plugin_api_works=no
-  fi
 fi
 AC_CHECK_LIB([pthread], [pthread_create],
              [AC_SUBST(LIBPTHREAD,[-lpthread])],
@@ -849,7 +833,6 @@ AC_CONFIG_FILES([Makefile
 		 doc/Makefile
 		 templates/Makefile
 		 plugins/Makefile
-		 driver/Makefile
 		 debian/Makefile
 		 sounds/Makefile
 		 python/Makefile