diff options
| -rw-r--r-- | CHANGES.txt | 3 | ||||
| -rw-r--r-- | config-scripts/cups-compiler.m4 | 19 | ||||
| -rw-r--r-- | config-scripts/cups-ssl.m4 | 5 | ||||
| -rw-r--r-- | config.h.in | 7 |
4 files changed, 28 insertions, 6 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 46c017e96..05ce557be 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,4 @@ -CHANGES.txt - 2.0rc1 - 2014-08-25 +CHANGES.txt - 2.0rc1 - 2014-08-28 --------------------------------- CHANGES IN CUPS V2.0rc1 @@ -17,6 +17,7 @@ CHANGES IN CUPS V2.0rc1 accessible via the web interface (STR #4461) - PPD files are now created using the permissions specified by the ConfigFilePerm directive. + - Fixed RPM build issues (STR #4459) CHANGES IN CUPS V2.0b1 diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4 index f5a39f453..f9c1f4df9 100644 --- a/config-scripts/cups-compiler.m4 +++ b/config-scripts/cups-compiler.m4 @@ -110,7 +110,7 @@ if test -n "$GCC"; then # The -fstack-protector option is available with some versions of # GCC and adds "stack canaries" which detect when the return address # has been overwritten, preventing many types of exploit attacks. - AC_MSG_CHECKING(if GCC supports -fstack-protector) + AC_MSG_CHECKING(whether compiler supports -fstack-protector) OLDCFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fstack-protector" AC_TRY_LINK(,, @@ -130,7 +130,7 @@ if test -n "$GCC"; then # exploits that depend on a fixed address for common functions. # # Not available to LSB binaries... - AC_MSG_CHECKING(if GCC supports -fPIE) + AC_MSG_CHECKING(whether compiler supports -fPIE) OLDCFLAGS="$CFLAGS" case "$uname" in Darwin*) @@ -154,9 +154,18 @@ if test -n "$GCC"; then if test "x$with_optim" = x; then # Add useful warning options for tracking down problems... - OPTIM="-Wall -Wno-format-y2k -Wsign-conversion -Wunused $OPTIM" + OPTIM="-Wall -Wno-format-y2k -Wunused $OPTIM" - AC_MSG_CHECKING(if GCC supports -Wno-tautological-compare) + AC_MSG_CHECKING(whether compiler supports -Wsign-conversion) + OLDCFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror -Wsign-conversion" + AC_TRY_COMPILE(,, + [OPTIM="$OPTIM -Wsign-conversion" + AC_MSG_RESULT(yes)], + AC_MSG_RESULT(no)) + CFLAGS="$OLDCFLAGS" + + AC_MSG_CHECKING(whether compiler supports -Wno-tautological-compare) OLDCFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Werror -Wno-tautological-compare" AC_TRY_COMPILE(,, @@ -211,7 +220,7 @@ else # should contribute the necessary options to # cups-support@cups.org... echo "Building CUPS with default compiler optimizations; contact" - echo "cups-bugs@cups.org with uname and compiler options needed" + echo "cups-devel@cups.org with uname and compiler options needed" echo "for your platform, or set the CFLAGS and LDFLAGS environment" echo "variables before running configure." ;; diff --git a/config-scripts/cups-ssl.m4 b/config-scripts/cups-ssl.m4 index 444d7c364..a2ce831c0 100644 --- a/config-scripts/cups-ssl.m4 +++ b/config-scripts/cups-ssl.m4 @@ -78,6 +78,11 @@ if test x$enable_ssl != xno; then if test $have_ssl = 1; then CUPS_SERVERCERT="ssl/server.crt" CUPS_SERVERKEY="ssl/server.key" + + SAVELIBS="$LIBS" + LIBS="$LIBS $SSLLIBS" + AC_CHECK_FUNC(gnutls_transport_set_pull_timeout_function, AC_DEFINE(HAVE_GNUTLS_TRANSPORT_SET_PULL_TIMEOUT_FUNCTION)) + LIBS="$SAVELIBS" fi fi fi diff --git a/config.h.in b/config.h.in index f673a395b..a0257015f 100644 --- a/config.h.in +++ b/config.h.in @@ -301,6 +301,13 @@ /* + * Do we have the gnutls_transport_set_pull_timeout_function function? + */ + +#undef HAVE_GNUTLS_TRANSPORT_SET_PULL_TIMEOUT_FUNCTION + + +/* * What Security framework headers do we have? */ |