diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-05-23 22:51:18 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-05-23 22:51:18 +0000 |
| commit | a29fd7ddb5d63688a4d44d08e4ab16428921c321 (patch) | |
| tree | d8e716c51da91f08d468e90262417f9a6d6fd5b0 /config-scripts | |
| parent | f3c17241a42a0845eae2099e6970b5aca9bbd836 (diff) | |
| download | cups-a29fd7ddb5d63688a4d44d08e4ab16428921c321.tar.gz | |
Merge changes from CUPS 1.6svn-r10510.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3833 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'config-scripts')
| -rw-r--r-- | config-scripts/cups-common.m4 | 1 | ||||
| -rw-r--r-- | config-scripts/cups-dnssd.m4 | 2 | ||||
| -rw-r--r-- | config-scripts/cups-ssl.m4 | 12 |
3 files changed, 7 insertions, 8 deletions
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index de6996d47..b8c740523 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -51,7 +51,6 @@ AC_PROG_RANLIB AC_PATH_PROG(AR,ar) AC_PATH_PROG(CHMOD,chmod) AC_PATH_PROG(GZIP,gzip) -AC_PATH_PROG(HTMLDOC,htmldoc) AC_PATH_PROG(LD,ld) AC_PATH_PROG(LN,ln) AC_PATH_PROG(MV,mv) diff --git a/config-scripts/cups-dnssd.m4 b/config-scripts/cups-dnssd.m4 index 3ed91f79b..426637a20 100644 --- a/config-scripts/cups-dnssd.m4 +++ b/config-scripts/cups-dnssd.m4 @@ -43,8 +43,6 @@ if test "x$DNSSD_BACKEND" = x -a x$enable_dnssd != xno; then Darwin*) # Darwin and MacOS X... AC_DEFINE(HAVE_DNSSD) - AC_DEFINE(HAVE_COREFOUNDATION) - AC_DEFINE(HAVE_SYSTEMCONFIGURATION) DNSSDLIBS="-framework CoreFoundation -framework SystemConfiguration" DNSSD_BACKEND="dnssd" ;; diff --git a/config-scripts/cups-ssl.m4 b/config-scripts/cups-ssl.m4 index 157ed0f42..28d5d3482 100644 --- a/config-scripts/cups-ssl.m4 +++ b/config-scripts/cups-ssl.m4 @@ -124,7 +124,7 @@ if test x$enable_ssl != xno; then dnl Check for the OpenSSL library last... if test $have_ssl = 0 -a "x$enable_openssl" != "xno"; then - AC_CHECK_HEADER(openssl/ssl.h, + AC_CHECK_HEADER(openssl/ssl.h,[ dnl Save the current libraries so the crypto stuff isn't always dnl included... SAVELIBS="$LIBS" @@ -149,14 +149,16 @@ if test x$enable_ssl != xno; then $libcrypto) if test "x${SSLLIBS}" != "x"; then - LIBS="$SAVELIBS $SSLLIBS" - AC_CHECK_FUNC(SSL_set_tlsext_host_name, - AC_DEFINE(HAVE_SSL_SET_TLSEXT_HOST_NAME)) break fi done - LIBS="$SAVELIBS") + if test "x${SSLLIBS}" != "x"; then + LIBS="$SAVELIBS $SSLLIBS" + AC_CHECK_FUNCS(SSL_set_tlsext_host_name) + fi + + LIBS="$SAVELIBS"]) fi fi |