diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | configure.ac | 27 | ||||
| -rw-r--r-- | ext/Makefile.am | 20 |
3 files changed, 55 insertions, 6 deletions
@@ -1,3 +1,17 @@ +2004-03-30 Benjamin Otte <in7y118@public.uni-hamburg.de> + + * configure.ac: + * ext/Makefile.am: + * ext/kio/Makefile.am: + * ext/kio/kioreceiver.cpp: + * ext/kio/kioreceiver.h: + * ext/kio/kiosrc.cpp: + * ext/kio/kiosrc.h: + add experimental kiosrc plugin + * ext/alsa/gstalsaplugin.c: (plugin_init): + initialize debugging category only when we're sure registering the + plugins worked. + 2004-03-29 Thomas Vander Stichele <thomas at apestaart dot org> * examples/gstplay/player.c: (main): diff --git a/configure.ac b/configure.ac index db294191..39c66087 100644 --- a/configure.ac +++ b/configure.ac @@ -979,6 +979,32 @@ GST_CHECK_FEATURE(JPEG, [jpeg], jpegenc jpegdec, [ AC_SUBST(JPEG_LIBS) ]) +dnl *** KDE *** +AC_PATH_PROG(KDE_CONFIG, kde-config, no) +translit(dnm, m, l) AM_CONDITIONAL(USE_KIO, true) +if test x$KDE_CONFIG != xno; then + KDE_PREFIX=`$KDE_CONFIG --prefix` + KIO_CFLAGS="-I$KDE_PREFIX/include/qt3 -I$KDE_PREFIX/include/kde" + KIO_LIBS="-L$KDE_PREFIX/lib -lkio -lqt-mt" + GST_CHECK_FEATURE(KIO, [kio], kio, [ + 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) +fi + dnl *** ladspa *** translit(dnm, m, l) AM_CONDITIONAL(USE_LADSPA, true) GST_CHECK_FEATURE(LADSPA, [ladspa], ladspa, [ @@ -1675,6 +1701,7 @@ 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 2f51a467..bff4e4bf 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -76,12 +76,6 @@ else FAAD_DIR= endif -if USE_NAS -NAS_DIR=nas -else -NAS_DIR= -endif - ## if USE_FESTIVAL ## FESTIVAL_DIR=festival ## else @@ -130,6 +124,12 @@ else JPEG_DIR= endif +if USE_KIO +KIO_DIR=kio +else +KIO_DIR= +endif + if USE_LADSPA LADSPA_DIR=ladspa else @@ -214,6 +214,12 @@ else MUSICBRAINZ_DIR= endif +if USE_NAS +NAS_DIR=nas +else +NAS_DIR= +endif + if USE_OGG OGG_DIR=ogg else @@ -338,6 +344,7 @@ SUBDIRS=\ $(HERMES_DIR) \ $(JACK_DIR) \ $(JPEG_DIR) \ + $(KIO_DIR) \ $(LADSPA_DIR) \ $(LAME_DIR) \ $(LCS_DIR) \ @@ -393,6 +400,7 @@ DIST_SUBDIRS=\ ivorbis \ jack \ jpeg \ + kio \ ladspa \ lame \ lcs \ |