diff options
| -rw-r--r-- | acinclude.m4 | 56 | ||||
| -rw-r--r-- | conf.diff | 4 | ||||
| -rw-r--r-- | configure.in.in | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
4 files changed, 34 insertions, 34 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 0fb4150..c457a21 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -371,7 +371,7 @@ AC_DEFUN([KDE_1_CHECK_PATHS], fi AC_MSG_CHECKING([for KDE libraries installed]) -ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5' +ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBTQT $KDE_TEST_RPATH 1>&5' if AC_TRY_EVAL(ac_link) && test -s conftest; then AC_MSG_RESULT(yes) @@ -1253,9 +1253,9 @@ ac_libs_safe="$LIBS" CXXFLAGS="$CXXFLAGS -I$tqt_includes" LDFLAGS="$LDFLAGS $X_LDFLAGS" if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then -LIBS="$LIBQT -lXext -lX11 $LIBSOCKET" +LIBS="$LIBTQT -lXext -lX11 $LIBSOCKET" else -LIBS="$LIBQT $LIBSOCKET" +LIBS="$LIBTQT $LIBSOCKET" fi LD_LIBRARY_PATH= export LD_LIBRARY_PATH @@ -1295,7 +1295,7 @@ fi dnl ------------------------------------------------------------------------ dnl Try to find the Qt headers and libraries. -dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed) +dnl $(QT_LDFLAGS) will be -Ltqtliblocation (if needed) dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed) dnl ------------------------------------------------------------------------ dnl @@ -1348,11 +1348,11 @@ kde_qt_was_given=yes dnl ------------------------------------------------------------------------ dnl If we haven't been told how to link to Qt, we work it out for ourselves. dnl ------------------------------------------------------------------------ -if test -z "$LIBQT_GLOB"; then +if test -z "$LIBTQT_GLOB"; then if test "x$kde_use_qt_emb" = "xyes"; then - LIBQT_GLOB="libqte.*" + LIBTQT_GLOB="libtqte.*" else - LIBQT_GLOB="libqt.*" + LIBTQT_GLOB="libtqt.*" fi fi @@ -1360,12 +1360,12 @@ dnl ------------------------------------------------------------ dnl If we got --enable-embedded then adjust the Qt library name. dnl ------------------------------------------------------------ if test "x$kde_use_qt_emb" = "xyes"; then - qtlib="qte" + tqtlib="qte" else - qtlib="qt" + tqtlib="qt" fi -kde_int_qt="-l$qtlib" +kde_int_qt="-l$tqtlib" if test -z "$LIBQPE"; then dnl ------------------------------------------------------------ @@ -1387,30 +1387,30 @@ dnl If we got --enable-qt-mt then adjust the Qt library name for the host. dnl ------------------------------------------------------------------------ if test "x$kde_use_qt_mt" = "xyes"; then - LIBQT="-l$qtlib-mt" - kde_int_qt="-l$qtlib-mt" - LIBQT_GLOB="lib$qtlib-mt.*" + LIBTQT="-l$tqtlib-mt" + kde_int_qt="-l$tqtlib-mt" + LIBTQT_GLOB="lib$tqtlib-mt.*" USING_QT_MT="using -mt" else - LIBQT="-l$qtlib" + LIBTQT="-l$tqtlib" fi if test $kde_qtver != 1; then AC_REQUIRE([AC_FIND_PNG]) AC_REQUIRE([AC_FIND_JPEG]) - LIBQT="$LIBQT $LIBPNG $LIBJPEG" + LIBTQT="$LIBTQT $LIBPNG $LIBJPEG" fi if test $kde_qtver = 3; then AC_REQUIRE([KDE_CHECK_LIBDL]) - LIBQT="$LIBQT $LIBDL" + LIBTQT="$LIBTQT $LIBDL" fi AC_MSG_CHECKING([for Qt]) if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then -LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET" +LIBTQT="$LIBTQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET" fi ac_tqt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO qt_libraries="" @@ -1461,21 +1461,21 @@ qt_libdirs="" for dir in $kde_qt_dirs; do qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir" done -qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" +qt_libdirs="$TQTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then qt_libdir=$ac_qt_libraries else qt_libdirs="$ac_qt_libraries $qt_libdirs" - # if the Qt was given, the chance is too big that libqt.* doesn't exist + # if the Qt was given, the chance is too big that libtqt.* doesn't exist qt_libdir=NONE for dir in $qt_libdirs; do - try="ls -1 $dir/${LIBQT_GLOB}" + try="ls -1 $dir/${LIBTQT_GLOB}" if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi done fi for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do if test -e "$a"; then - LIBQT="$LIBQT ${kde_int_qt}_incremental" + LIBTQT="$LIBTQT ${kde_int_qt}_incremental" break fi done @@ -1491,7 +1491,7 @@ ac_libs_safe="$LIBS" CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" -LIBS="$LIBS $LIBQT $KDE_MT_LIBS" +LIBS="$LIBS $LIBTQT $KDE_MT_LIBS" KDE_PRINT_QT_PROGRAM @@ -1522,9 +1522,9 @@ if test "$ac_tqt_includes" = NO || test "$ac_qt_libraries" = NO; then if test "x$kde_use_qt_mt" = "xyes"; then missing_qt_mt=" Make sure that you have compiled Qt with thread support!" - ac_qt_notfound="(library $qtlib-mt)"; + ac_qt_notfound="(library $tqtlib-mt)"; else - ac_qt_notfound="(library $qtlib)"; + ac_qt_notfound="(library $tqtlib)"; fi fi @@ -2029,7 +2029,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, kde_libs_safe="$LIBS" kde_cxxflags_safe="$CXXFLAGS" - LIBS="-lkde-qt-addon $LIBQT $LIBS" + LIBS="-lkde-qt-addon $LIBTQT $LIBS" CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" @@ -2590,7 +2590,7 @@ AC_CACHE_VAL(kde_cv_qt_jpeg, AC_LANG_SAVE AC_LANG_CPLUSPLUS ac_save_LIBS="$LIBS" -LIBS="$all_libraries $USER_LDFLAGS $LIBQT" +LIBS="$all_libraries $USER_LDFLAGS $LIBTQT" LIBS=`echo $LIBS | sed "s/$LIBJPEG//"` ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" @@ -4684,7 +4684,7 @@ AC_LANG_SAVE AC_LANG_CPLUSPLUS ac_save_LIBS="$LIBS" ac_save_CXXFLAGS="$CXXFLAGS" -LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBQT" +LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBTQT" CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" AC_TRY_RUN(dnl [ @@ -5490,7 +5490,7 @@ is required.]) CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes" LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" - LIBS="$LIBS $LIB_TQTOPIA $LIBQT" + LIBS="$LIBS $LIB_TQTOPIA $LIBTQT" cat > conftest.$ac_ext <<EOF #include "confdefs.h" @@ -8,7 +8,7 @@ +hasnspr=yes LIBNSPR_LIBS="" LIBNSPR_CFLAGS="" - LIBQTDBUS="" + LIBTQTDBUS="" LIBDBUS_CFLAGS="" AC_ARG_ENABLE(nspr, [ --enable-npplayer Enables building with npp support], [if test "x$enableval" == "xno"; then @@ -22,7 +22,7 @@ PKG_CHECK_MODULES(DBUS, dbus-1 >= $DBUS_REQ, @@ -150,9 +155,22 @@ AC_DEFINE(HAVE_DBUS, 1, [have DBus]) - LIBQTDBUS="`$PKG_CONFIG --libs dbus-1` -ldbus-qt-1" + LIBTQTDBUS="`$PKG_CONFIG --libs dbus-1` -ldbus-qt-1" LIBDBUS_CFLAGS="`$PKG_CONFIG --cflags dbus-1`" - AC_DEFINE(HAVE_NSPR, 1, [build Netscape plugin loader]) - LIBNSPR_LIBS="`$PKG_CONFIG --libs gtk+-x11-2.0` `$PKG_CONFIG --libs dbus-glib-1`" diff --git a/configure.in.in b/configure.in.in index fe247fe..7fbf532 100644 --- a/configure.in.in +++ b/configure.in.in @@ -187,7 +187,7 @@ AM_CONDITIONAL(include_kgstplayer, [test "x$have_gst" = "xyes" && test "x$have_g buildnpp=yes LIBNSPR_LIBS="" LIBNSPR_CFLAGS="" -LIBQTDBUS="" +LIBTQTDBUS="" LIBDBUS_CFLAGS="" AC_ARG_ENABLE(nspr, [ --enable-npplayer Enables building with npp support], [if test "x$enableval" == "xno"; then @@ -201,7 +201,7 @@ if test "$buildnpp" = "yes"; then if test "x$have_dbus" = "xyes"; then have_nspr=yes AC_DEFINE(HAVE_DBUS, 1, [have DBus]) - LIBQTDBUS="`$PKG_CONFIG --libs dbus-tqt`" + LIBTQTDBUS="`$PKG_CONFIG --libs dbus-tqt`" LIBDBUS_CFLAGS="`$PKG_CONFIG --cflags dbus-tqt`" AC_DEFINE(HAVE_NSPR, 1, [build Netscape plugin loader]) LIBNSPR_LIBS="`$PKG_CONFIG --libs gtk+-x11-2.0` `$PKG_CONFIG --libs dbus-glib-1` `$PKG_CONFIG --libs gthread-2.0`" @@ -211,7 +211,7 @@ if test "$buildnpp" = "yes"; then fi AC_SUBST(LIBNSPR_LIBS) AC_SUBST(LIBNSPR_CFLAGS) -AC_SUBST(LIBQTDBUS) +AC_SUBST(LIBTQTDBUS) AC_SUBST(LIBDBUS_CFLAGS) AM_CONDITIONAL(include_knpplayer, test "$have_nspr" = "yes") diff --git a/src/Makefile.am b/src/Makefile.am index 2cadd0e..00f31c5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,7 +6,7 @@ lib_LTLIBRARIES= libkmplayercommon.la libkmplayercommon_la_SOURCES = viewarea.cpp kmplayerview.cpp playlistview.cpp kmplayercontrolpanel.cpp kmplayerconfig.cpp pref.cpp kmplayerprocess.cpp kmplayer_callback.skel kmplayer_backend.stub kmplayerpartbase.cpp kmplayerplaylist.cpp kmplayer_asx.cpp kmplayer_smil.cpp kmplayer_rp.cpp kmplayer_rss.cpp kmplayer_atom.cpp kmplayer_xspf.cpp triestring.cpp kmplayerpartbase.skel libkmplayercommon_la_LDFLAGS = -avoid-version $(all_libraries) $(CFLAGS_XTEST) -libkmplayercommon_la_LIBADD = -ltdemediaplayer $(LIB_TDEPARTS) $(LIB_TDEUTILS) $(LIB_EXPAT) -lm $(LIBCAIRO_LIBS) $(LIBQTDBUS) $(LIB_TQT) -lDCOP $(LIB_TDECORE) -ltdefx $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_XTEST) +libkmplayercommon_la_LIBADD = -ltdemediaplayer $(LIB_TDEPARTS) $(LIB_TDEUTILS) $(LIB_EXPAT) -lm $(LIBCAIRO_LIBS) $(LIBTQTDBUS) $(LIB_TQT) -lDCOP $(LIB_TDECORE) -ltdefx $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_XTEST) if include_koffice_support kofficeplugin_lib= libkmplayerkofficepart.la |