diff options
Diffstat (limited to 'print/cups/patches/patch-af')
| -rw-r--r-- | print/cups/patches/patch-af | 82 |
1 files changed, 23 insertions, 59 deletions
diff --git a/print/cups/patches/patch-af b/print/cups/patches/patch-af index f7ce9ee4136..8b528e51482 100644 --- a/print/cups/patches/patch-af +++ b/print/cups/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.3 2000/12/21 14:59:38 jlam Exp $ +$NetBSD: patch-af,v 1.4 2000/12/21 16:59:32 jlam Exp $ ---- configure.in.orig Wed Dec 20 13:46:14 2000 +--- configure.in.orig Thu Dec 21 08:45:21 2000 +++ configure.in @@ -117,4 +117,12 @@ AC_ARG_WITH(fontpath, [ --with-fontpath set font path for pstoraster],fontpath="$withval",fontpath="") @@ -15,20 +15,20 @@ $NetBSD: patch-af,v 1.3 2000/12/21 14:59:38 jlam Exp $ + dnl Checks for programs... AC_PROG_AWK -@@ -197,8 +205,25 @@ +@@ -201,9 +209,24 @@ + SAVELIBS="$LIBS" - if test "$enable_ssl" = "yes"; then +- LIBS="-lcrypto $LIBS" - AC_CHECK_LIB(ssl,SSL_new, - SSLLIBS="-lssl -lcrypto" - AC_DEFINE(HAVE_LIBSSL) - ) -+ # -+ # Some ELF systems can't resolve all the symbols in libcrypto -+ # if libcrypto was linked against RSAREF, and fail to link the -+ # test program correctly, even though a correct installation -+ # of OpenSSL exists. So we test the linking three times in -+ # case the RSAREF libraries are needed. -+ # ++ dnl Some ELF systems can't resolve all the symbols in libcrypto ++ dnl if libcrypto was linked against RSAREF, and fail to link the ++ dnl test program correctly, even though a correct installation ++ dnl of OpenSSL exists. So we test the linking three times in ++ dnl case the RSAREF libraries are needed. ++ dnl + for libcrypto in \ + "-lcrypto" \ + "-lcrypto -lrsaref" \ @@ -43,52 +43,22 @@ $NetBSD: patch-af,v 1.3 2000/12/21 14:59:38 jlam Exp $ + break + fi + done - fi -@@ -250,4 +275,5 @@ + LIBS="$SAVELIBS" +@@ -257,4 +280,5 @@ AC_CHECK_HEADER(stddef.h,AC_DEFINE(HAVE_STDDEF_H)) AC_CHECK_HEADER(stdlib.h,AC_DEFINE(HAVE_STDLIB_H)) +AC_CHECK_HEADER(sys/ioctl.h,AC_DEFINE(HAVE_SYS_IOCTL_H)) dnl Checks for string functions. -@@ -384,10 +410,6 @@ - - dnl Fix "datadir" variable if it hasn't been specified... --if test "$datadir" = "\${prefix}/share"; then -- if test "$prefix" = "/"; then -- datadir="/usr/share" -- else -- datadir="$prefix/share" +@@ -396,5 +420,5 @@ + else + datadir="$prefix/share" - fi -+if test "$datadir" = "\${prefix}/share" -a "$prefix" = "/"; then -+ datadir="/usr/share" - fi - -@@ -398,19 +420,11 @@ - - dnl Fix "localstatedir" variable if it hasn't been specified... --if test "$localstatedir" = "\${prefix}/var"; then -- if test "$prefix" = "/"; then -- localstatedir="/var" -- else -- localstatedir="$prefix/var" -- fi -+if test "$localstatedir" = "\${prefix}/var" -a "$prefix" = "/"; then -+ localstatedir="/var" ++ fi fi - dnl Fix "sysconfdir" variable if it hasn't been specified... --if test "$sysconfdir" = "\${prefix}/etc"; then -- if test "$prefix" = "/"; then -- sysconfdir="/etc" -- else -- sysconfdir="$prefix/etc" -- fi -+if test "$sysconfdir" = "\${prefix}/etc" -a "$prefix" = "/"; then -+ sysconfdir="/etc" - fi - -@@ -422,14 +436,23 @@ +@@ -429,9 +453,18 @@ dnl Fix "mandir" variable... if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then - if test "$uname" = "IRIX"; then @@ -112,13 +82,7 @@ $NetBSD: patch-af,v 1.3 2000/12/21 14:59:38 jlam Exp $ + esac fi - dnl Fix "fontpath" variable... - if test "x$fontpath" = "x"; then -- fontpath="$datadir/cups/fonts" -+ fontpath="$exec_prefix/share/cups/fonts" - fi - -@@ -503,11 +526,11 @@ +@@ -510,11 +543,11 @@ dnl Setup default locations... -CUPS_SERVERROOT='${prefix}/etc/cups' @@ -137,16 +101,16 @@ $NetBSD: patch-af,v 1.3 2000/12/21 14:59:38 jlam Exp $ +AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$localstatedir/spool/cups") dnl See what directory to put server executables... -@@ -560,6 +583,6 @@ +@@ -567,6 +600,6 @@ dnl Set the CUPS_DOCROOT directory... -CUPS_DOCROOT='${exec_prefix}/share/doc/cups' -AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$exec_prefix/share/doc/cups") -+CUPS_DOCROOT='${exec_prefix}/share/doc/html/cups' -+AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$exec_prefix/share/doc/html/cups") ++CUPS_DOCROOT='${datadir}/doc/html/cups' ++AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$datadir/doc/html/cups") AC_SUBST(CUPS_DOCROOT) -@@ -567,5 +590,5 @@ +@@ -574,5 +607,5 @@ AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$fontpath") -AC_OUTPUT(Makedefs cups.sh) |