diff options
| author | Fritz Elfert <felfert@to.com> | 2002-07-07 18:12:48 +0000 |
|---|---|---|
| committer | Fritz Elfert <felfert@to.com> | 2002-07-07 18:12:48 +0000 |
| commit | d2342ca0c79bb97dc386fe06467ec3d77fbf07ea (patch) | |
| tree | 3fcdb10f7747b936239ebbaab202bca1d882e228 /conf | |
| parent | 647cb26ea9ca0529f477f0be22d2436dc5c2a022 (diff) | |
| download | plptools-d2342ca0c79bb97dc386fe06467ec3d77fbf07ea.tar.gz plptools-d2342ca0c79bb97dc386fe06467ec3d77fbf07ea.tar.bz2 plptools-d2342ca0c79bb97dc386fe06467ec3d77fbf07ea.zip | |
- Adaptions for KDE3 and QT3
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/m4/kde/AC_PATH_QT_1_3.m4 | 4 | ||||
| -rw-r--r-- | conf/m4/kde/KDE_CREATE_LIBS_ALIASES.m4 | 14 | ||||
| -rw-r--r-- | conf/m4/kde/KDE_VERSION.m4 | 15 |
3 files changed, 29 insertions, 4 deletions
diff --git a/conf/m4/kde/AC_PATH_QT_1_3.m4 b/conf/m4/kde/AC_PATH_QT_1_3.m4 index 213d79f..81a6b96 100644 --- a/conf/m4/kde/AC_PATH_QT_1_3.m4 +++ b/conf/m4/kde/AC_PATH_QT_1_3.m4 @@ -47,7 +47,7 @@ AC_DEFUN(AC_PATH_QT_1_3,[ AC_CACHE_VAL(ac_cv_have_qt,[ #try to guess Qt locations - qt_incdirs="$QTINC /usr/lib/qt/include /usr/local/qt/include /usr/include/qt /usr/include /usr/lib/qt2/include /usr/X11R6/include/X11/qt $x_includes" + qt_incdirs="$QTINC /usr/lib/qt/include /usr/local/qt/include /usr/include/qt /usr/include /usr/lib/qt3/include /usr/lib/qt2/include /usr/X11R6/include/X11/qt $x_includes" test -n "$QTDIR" && qt_incdirs="$QTDIR/include $QTDIR $qt_incdirs" qt_incdirs="$ac_qt_includes $qt_incdirs" @@ -60,7 +60,7 @@ AC_DEFUN(AC_PATH_QT_1_3,[ AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir) ac_qt_includes="$qt_incdir" - qt_libdirs="$QTLIB /usr/lib/qt/lib /usr/X11R6/lib /usr/lib /usr/local/qt/lib /usr/lib/qt /usr/lib/qt2/lib $x_libraries" + qt_libdirs="$QTLIB /usr/lib/qt/lib /usr/X11R6/lib /usr/lib /usr/local/qt/lib /usr/lib/qt /usr/lib/qt3/lib /usr/lib/qt2/lib $x_libraries" test -n "$QTDIR" && qt_libdirs="$QTDIR/lib $QTDIR $qt_libdirs" if test ! "$ac_qt_libraries" = "NO"; then qt_libdirs="$ac_qt_libraries $qt_libdirs" diff --git a/conf/m4/kde/KDE_CREATE_LIBS_ALIASES.m4 b/conf/m4/kde/KDE_CREATE_LIBS_ALIASES.m4 index 88e9780..481ee60 100644 --- a/conf/m4/kde/KDE_CREATE_LIBS_ALIASES.m4 +++ b/conf/m4/kde/KDE_CREATE_LIBS_ALIASES.m4 @@ -3,6 +3,8 @@ AC_DEFUN(KDE_CREATE_LIBS_ALIASES, AC_REQUIRE([KDE_MISC_TESTS]) AC_REQUIRE([KDE_CHECK_LIBDL]) AC_REQUIRE([K_PATH_X]) + AC_REQUIRE([KDE_VERSION]) + if test $kde_qtver = 2; then LIB_KDECORE='-lkdecore' @@ -15,7 +17,11 @@ if test $kde_qtver = 2; then AC_SUBST(LIB_KIO) LIB_SMB='-lsmb' AC_SUBST(LIB_SMB) - LIB_KFILE='-lkfile' + if test $ac_kde_version = 2; then + LIB_KFILE='-lkfile' + else + LIB_KFILE= + fi AC_SUBST(LIB_KFILE) LIB_KAB='-lkab' AC_SUBST(LIB_KAB) @@ -32,7 +38,11 @@ else AC_SUBST(LIB_KDEUI) LIB_KFM='-lkfm $(LIB_KDECORE)' AC_SUBST(LIB_KFM) - LIB_KFILE='-lkfile $(LIB_KFM) $(LIB_KDEUI)' + if test $ac_kde_version = 2; then + LIB_KFILE='-lkfile $(LIB_KFM) $(LIB_KDEUI)' + else + LIB_KFILE='$(LIB_KFM) $(LIB_KDEUI)' + fi AC_SUBST(LIB_KFILE) LIB_KAB='-lkab $(LIB_KIMGIO) $(LIB_KDECORE)' AC_SUBST(LIB_KAB) diff --git a/conf/m4/kde/KDE_VERSION.m4 b/conf/m4/kde/KDE_VERSION.m4 new file mode 100644 index 0000000..37e47b2 --- /dev/null +++ b/conf/m4/kde/KDE_VERSION.m4 @@ -0,0 +1,15 @@ +dnl +dnl Check KDE version +dnl +AC_DEFUN(KDE_VERSION, +[ + ac_kde_version=2 + AC_MSG_CHECKING(for KDE version) + tmp=`kde-config -v 2>/dev/null | grep KDE:` + case "$tmp" in + KDE:?3.*) + ac_kde_version=3 + ;; + esac + AC_MSG_RESULT($ac_kde_version.x) +]) |