rendered paste bodydiff --git configure.ac configure.acindex a54429c..a4b4fdd 100644--- configure.ac+++ configure.ac@@ -719,9 +719,6 @@ AC_SUBST(GTKHTML_DATADIR) GTKHTML_API_VERSION=`$PKG_CONFIG --variable gtkhtml_apiversion libgtkhtml-3.14` AC_DEFINE_UNQUOTED(GTKHTML_API_VERSION, "$GTKHTML_API_VERSION", [The gtkhtml api version]) --- dnl ****************************** dnl Pilot checking dnl ******************************@@ -737,24 +734,24 @@ if test "x$enable_pilot_conduits" = "xyes"; then LDFLAGS_save="$LDFLAGS" LDFLAGS="$GNOME_PILOT_LIBS $LDFLAGS" - AC_CACHE_CHECK([if pilot-link handles UTF-8 conversions], ac_cv_pilot_link_utf8, AC_TRY_RUN([--#include <stdlib.h>-#include <string.h>-#include <pi-util.h>--int main (int argc, char **argv)-{- const char *utf8 = "\x66\x66\x66\x66\x66\x66\x66\xC2\xA9";- size_t utf8_real_len = strlen (utf8);- char *pstring;-- if (convert_ToPilotChar ("UTF-8", utf8, utf8_real_len, &pstring) == -1)- exit (1);-- exit (0);-}-], ac_cv_pilot_link_utf8=yes, ac_cv_pilot_link_utf8=no, ac_cv_pilot_link_utf8=no))+ AC_CACHE_CHECK([if pilot-link handles UTF-8 conversions],+ [ac_cv_pilot_link_utf8], AC_TRY_RUN([+ #include <stdlib.h>+ #include <string.h>+ #include <pi-util.h>++ int main (int argc, char **argv)+ {+ const char *utf8 = "\x66\x66\x66\x66\x66\x66\x66\xC2\xA9";+ size_t utf8_real_len = strlen (utf8);+ char *pstring;++ if (convert_ToPilotChar ("UTF-8", utf8, utf8_real_len, &pstring) == -1)+ exit (1);+ exit (0);+ }+ ],+ [ac_cv_pilot_link_utf8=yes],[ac_cv_pilot_link_utf8=no],[ac_cv_pilot_link_utf8=no])) CFLAGS="$CFLAGS_save" LDFLAGS="$LDFLAGS_save"@@ -821,7 +818,7 @@ if test "x${with_krb5}" != "xno"; then mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5" heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi" sunlibs="-lkrb5 -lgss"- AC_CACHE_CHECK([for Kerberos 5], ac_cv_lib_kerberos5,+ AC_CACHE_CHECK([for Kerberos 5], [ac_cv_lib_kerberos5], [ LDFLAGS="$LDFLAGS -L$with_krb5_libs $mitlibs" AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$mitlibs",@@ -877,7 +874,7 @@ AC_CHECK_HEADER([com_err.h],[AC_DEFINE([HAVE_COM_ERR_H], 1, [Have comm_err.h])]) msg_krb4="no" if test "x${with_krb4}" != "xno"; then LDFLAGS_save="$LDFLAGS"- AC_CACHE_CHECK(for Kerberos 4, ac_cv_lib_kerberos4,+ AC_CACHE_CHECK([for Kerberos 4], [ac_cv_lib_kerberos4], [ ac_cv_lib_kerberos4="no" @@ -1119,7 +1116,7 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then nsprlibs="$DL_LIB -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" fi - AC_CACHE_CHECK([for Mozilla nspr libraries], ac_cv_moz_nspr_libs,+ AC_CACHE_CHECK([for Mozilla nspr libraries], [ac_cv_moz_nspr_libs], [ LIBS_save="$LIBS" CFLAGS="$CFLAGS $MANUAL_NSPR_CFLAGS"@@ -1198,7 +1195,7 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then nsslibs="-lssl3 -lsmime3 -lnss3" fi - AC_CACHE_CHECK([for Mozilla nss libraries], ac_cv_moz_nss_libs,+ AC_CACHE_CHECK([for Mozilla nss libraries], [ac_cv_moz_nss_libs], [ LIBS_save="$LIBS" LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs"@@ -1344,7 +1341,7 @@ dnl *) with_openssl_libs="-L$with_openssl_libs" ;; dnl esac dnl dnl AC_CHECK_LIB(dl, dlopen, DL_LDFLAGS="-ldl", DL_LDFLAGS="")-dnl AC_CACHE_CHECK([for OpenSSL libraries], openssl_libs,+dnl AC_CACHE_CHECK([for OpenSSL libraries], [ac_cv_openssl_libs], dnl [ dnl LDFLAGS="$LDFLAGS $with_openssl_libs -lssl -lcrypto $DL_LDFLAGS" dnl AC_TRY_LINK_FUNC(SSL_read, openssl_libs="yes", openssl_libs="no")