--- acinclude.m4 +++ acinclude.m4 @@ -1347,7 +1347,7 @@ ]) AC_ARG_WITH(qt-includes, - [ --with-qt-includes=DIR where the Qt includes are. ], + [ --with-qt-includes=DIR where the Qt includes are ], [ ac_qt_includes="$withval" ]) @@ -1355,11 +1355,31 @@ kde_qt_libs_given=no AC_ARG_WITH(qt-libraries, - [ --with-qt-libraries=DIR where the Qt library is installed.], + [ --with-qt-libraries=DIR where the Qt library is installed ], [ ac_qt_libraries="$withval" kde_qt_libs_given=yes ]) +ac_kde_includes="" +ac_kde_libraries="" +AC_ARG_WITH(kde-dir, + [ --with-kde-dir=DIR where the root of KDE is installed ], + [ ac_kde_includes="$withval"/include + ac_kde_libraries="$withval"/lib + ]) + +AC_ARG_WITH(kde-includes, + [ --with-kde-includes=DIR where the KDE includes are ], + [ + ac_kde_includes="$withval" + ]) + +AC_ARG_WITH(kde-libraries, + [ --with-kde-libraries=DIR where the KDE library is installed ], + [ + ac_kde_libraries="$withval" + ]) + AC_CACHE_VAL(ac_cv_have_qt, [#try to guess Qt locations --- configure.in +++ configure.in @@ -76,25 +76,37 @@ dnl PQT AC_MSG_CHECKING([for KDE or an Install directory]) dnl /PQT -if test "${prefix}" != NONE; then - kde_includes=${prefix}/include - ac_kde_includes=$prefix/include - if test "${exec_prefix}" != NONE; then - kde_libraries=${libdir} - ac_kde_libraries=$libdir - if test "$ac_kde_libraries" = '${exec_prefix}/lib'${kdelibsuff}; then - ac_kde_libraries=$exec_prefix/lib${kdelibsuff} - fi - else - kde_libraries=${prefix}/lib${kdelibsuff} - ac_kde_libraries=$prefix/lib${kdelibsuff} +kde_includes=$ac_kde_includes +kde_libraries=$ac_kde_libraries + +if test "${prefix}" != NONE; then + if test "${kde_includes}" = ""; then + kde_includes=${prefix}/include + ac_kde_includes=$prefix/include + fi + + if test "${kde_libraries}" = ""; then + if test "${exec_prefix}" != NONE; then + kde_libraries=${libdir} + ac_kde_libraries=$libdir + if test "$ac_kde_libraries" = '${exec_prefix}/lib'${kdelibsuff}; then + ac_kde_libraries=$exec_prefix/lib${kdelibsuff} + fi + else + kde_libraries=${prefix}/lib${kdelibsuff} + ac_kde_libraries=$prefix/lib${kdelibsuff} + fi fi else - ac_kde_includes= - ac_kde_libraries= - kde_libraries="" - kde_includes="" + if test "${kde_includes}" = ""; then + ac_kde_includes= + kde_includes="" + fi + if test "${kde_libraries}" = ""; then + ac_kde_libraries= + kde_libraries="" + fi fi AC_CACHE_VAL(ac_cv_have_kde,