diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 66 | ||||
| -rw-r--r-- | ext/Makefile.am | 6 |
3 files changed, 7 insertions, 72 deletions
@@ -1,3 +1,10 @@ +2004-09-28 Christian Schaller <christian@fluendo.com> + + * configure.ac: + Remove kioslave plugin. Markey is brewing a new working one + * ext/Makefile.am: Remove kioslave plugin + * ext/kio: remove + 2004-09-27 Wim Taymans <wim@fluendo.com> * gst/tcp/gstmultifdsink.c: (gst_multifdsink_add), diff --git a/configure.ac b/configure.ac index b650ce88..cba07ad1 100644 --- a/configure.ac +++ b/configure.ac @@ -1111,71 +1111,6 @@ for dir in $qt_lib_dirs; do fi done -dnl * KDE * - -translit(dnm, m, l) AM_CONDITIONAL(USE_KIO, true) -GST_CHECK_FEATURE(KIO, [kio], kio, [ - AC_PATH_PROG(KDE_MOC, moc, no) - if test x$KDE_MOC = xno; then - HAVE_KIO="no" - else - AC_PATH_PROG(KDE_CONFIG, kde-config, no) - - if test x$KDE_CONFIG != xno; then - KDE_PREFIX=`$KDE_CONFIG --prefix` - fi - - kde_include_dirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include" - kde_lib_dirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib" - - if test -n "$KDE_PREFIX"; then - kde_include_dirs="$KDE_PREFIX/include $KDE_PREFIX/include/kde $KDE_PREFIX $kde_include_dirs" - kde_lib_dirs="$KDE_PREFIX/lib $KDE_PREFIX $kde_lib_dirs" - fi - if test -n "$KDEDIR"; then - kde_include_dirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_include_dirs" - kde_lib_dirs="$KDEDIR/lib $KDEDIR $kde_lib_dirs" - fi - - for dir in $kde_include_dirs; do - if test -r "$dir/kglobal.h" && test -r "$dir/kdemacros.h"; then - kde_include_dir=$dir - break - fi - done - - for dir in $kde_lib_dirs; do - try="ls -1 $dir/libkio.*" - if test -n "`$try 2> /dev/null`"; then - kde_lib_dir=$dir - break - fi - done - - if test -n $kde_include_dir && test -n $kde_lib_dir; then - KIO_CFLAGS="-I$kde_include_dir -I$qt_include_dir" - KIO_LIBS="-L$KDE_PREFIX/lib -L$qt_lib_dir -lkio -lqt-mt" - AC_LANG_PUSH(C++) - save_LIBS="$LIBS" - save_CPPFLAGS="$CPPFLAGS" - LIBS="$LIBS $KIO_LIBS" - CPPFLAGS="$CPPFLAGS $KIO_CFLAGS" - AC_TRY_LINK([ -#include <kio/job.h> - ], [ - KIO::get ("bla") - ], HAVE_KIO="yes", HAVE_KIO="no") - LIBS="$save_LIBS" - CPPFLAGS="$save_CPPFLAGS" - AC_LANG_POP(C++) - AC_SUBST(KIO_CFLAGS) - AC_SUBST(KIO_LIBS) - else - HAVE_KIO="no" - fi - fi -]) - dnl *** ladspa *** translit(dnm, m, l) AM_CONDITIONAL(USE_LADSPA, true) GST_CHECK_FEATURE(LADSPA, [ladspa], ladspa, [ @@ -1951,7 +1886,6 @@ ext/hermes/Makefile dnl ext/http/Makefile ext/jack/Makefile ext/jpeg/Makefile -ext/kio/Makefile ext/ladspa/Makefile ext/lame/Makefile ext/ivorbis/Makefile diff --git a/ext/Makefile.am b/ext/Makefile.am index 41a029cf..a8fd3c83 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -136,12 +136,6 @@ else JPEG_DIR= endif -if USE_KIO -KIO_DIR=kio -else -KIO_DIR= -endif - if USE_LADSPA LADSPA_DIR=ladspa else |