diff options
| author | dominique.leuenberger <dominique.leuenberger@c587cffe-e639-0410-9787-d7902ae8ed56> | 2009-10-03 14:37:21 +0000 |
|---|---|---|
| committer | dominique.leuenberger <dominique.leuenberger@c587cffe-e639-0410-9787-d7902ae8ed56> | 2009-10-03 14:37:21 +0000 |
| commit | 00271cef063eb0a982b81c3d40d06948fbc94038 (patch) | |
| tree | 3da954b90885de35d807490d2a45dd16d7ddeb31 | |
| parent | d31b2b01e4d6ee6d6a2b0a068378e3db9d88102b (diff) | |
| download | libproxy-00271cef063eb0a982b81c3d40d06948fbc94038.tar.gz | |
Properly detect libkdecore required for the KDE Module.
git-svn-id: http://libproxy.googlecode.com/svn/trunk@442 c587cffe-e639-0410-9787-d7902ae8ed56
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index d98caaf..4b37037 100644 --- a/configure.ac +++ b/configure.ac @@ -23,6 +23,8 @@ AC_CHECK_FUNCS(pthread_mutex_init) AC_SEARCH_LIBS([socket],[socket inet]) AC_SEARCH_LIBS([dlopen],[dl]) +AC_CHECK_LIB([kdecore], [main], have_kdecore=yes, have_kdecore=no) + ### Checks for module dependencies. AC_PATH_PROG(GCONFTOOLBIN, gconftool-2) PKG_CHECK_MODULES(x11, x11, have_x11=yes, have_x11=no) @@ -88,22 +90,22 @@ AC_ARG_WITH([kde4], [AS_HELP_STRING([--with-kde4], [build KDE4 configuration module @<:@automatic@:>@])], [], - [test x$have_qtcore = xyes && - test x$have_xmu = xyes && + [test x$have_qtcore = xyes && + test x$have_kdecore = xyes && with_kde4=yes]) if test x$with_kde4 = xyes; then - if test x$have_qtcore = xyes && \ - test x$have_xmu = xyes; then + if test x$have_qtcore = xyes && \ + test x$have_kdecore = xyes; then KDE4_CFLAGS="$QtCore_CFLAGS" - KDE4_LIBS="$QtCore_LIBS" + KDE4_LIBS="$QtCore_LIBS -lkdecore" AC_SUBST(KDE4_CFLAGS) AC_SUBST(KDE4_LIBS) else - echo "KDE4 module requires: QtCore and libkdecore" + echo "KDE4 module requires: QtCore and KDE-Core" exit 1 fi else - with_kde=no + with_kde4=no fi AM_CONDITIONAL([WITH_KDE4], [test x$with_kde4 = xyes]) |