diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2016-03-15 20:17:28 +0100 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2016-03-15 20:17:28 +0100 |
commit | 1f2f34c1b66b322e58d9459be15b1c01c021c688 (patch) | |
tree | 9dc79fd4c9b66ce9c16f55ff57313962510d9be4 /configure.in.in | |
parent | 6d3b42e175ab9acf02973f2f35d7ef3d3e9d41e0 (diff) | |
download | kcmldap-1f2f34c1b66b322e58d9459be15b1c01c021c688.tar.gz kcmldap-1f2f34c1b66b322e58d9459be15b1c01c021c688.zip |
Revert "Fix krb5 library detection. This resolves FTBFS with heimdal-krb5."
Not required for r14.0.x branch.
This reverts commit 6d3b42e175ab9acf02973f2f35d7ef3d3e9d41e0.
Diffstat (limited to 'configure.in.in')
-rw-r--r-- | configure.in.in | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/configure.in.in b/configure.in.in index 03cae23..18b1486 100644 --- a/configure.in.in +++ b/configure.in.in @@ -4,40 +4,3 @@ AM_INIT_AUTOMAKE(autostart, 0.1) AC_C_BIGENDIAN AC_CHECK_KDEMAXPATHLEN - -PKG_CHECK_MODULES(KRB5, krb5, have_krb5=yes, have_krb5=no) -if test "x$have_krb5" = "xno"; then - # Try to find krb5 without pkg-config file - AC_MSG_CHECKING(krb5) - AC_FIND_FILE(krb5.h, [\ - /usr/local/include/heimdal /usr/local/include \ - /usr/include/heimdal /usr/include \ - ], krb5_includes) - if test "x$krb5_includes" != "xNO"; then - krb5_multiarch="`gcc -print-multiarch 2>/dev/null`" - AC_FIND_FILE(libkrb5.so, [\ - /usr/local/lib/$krb5_multiarch/heimdal /usr/local/lib64/heimdal /usr/local/lib/heimdal \ - /usr/local/lib/$krb5_multiarch /usr/local/lib64 /usr/local/lib \ - /usr/lib/$krb5_multiarch/heimdal /usr/lib64/heimdal /usr/lib/heimdal \ - /usr/lib/$krb5_multiarch /usr/lib64 /usr/lib \ - ], krb5_libs) - if test "x$krb5_libs" != "xNO"; then - AC_MSG_RESULT([libraries $krb5_libs, headers $krb5_includes]) - CPPFLAGS="$CPPFLAGS -I$krb5_includes" - CFLAGS="$CFLAGS -I$krb5_includes" - LDFLAGS="$LDFLAGS -L$krb5_libs" - AC_CHECK_HEADER(krb5.h, have_krb5=yes) - fi - fi - if test "x$have_krb5" != "xno"; then - KRB5_CFLAGS="-I$krb5_includes" - KRB5_LIBS="-L$krb5_libs -lkrb5" - AC_SUBST(KRB5_CFLAGS) - AC_SUBST(KRB5_LIBS) - else - AC_MSG_RESULT(no) - fi -fi -if test "x$have_krb5" = "xno"; then - AC_MSG_ERROR([krb5 library is needed but not found on our system]) -fi |