diff options
author | dwcjr <dwcjr@FreeBSD.org> | 2001-12-16 17:56:48 +0000 |
---|---|---|
committer | dwcjr <dwcjr@FreeBSD.org> | 2001-12-16 17:56:48 +0000 |
commit | f08bd48baf3b81fd3793902404e2bc61ea3fc389 (patch) | |
tree | d71a8f6541d7c526a7c2326af3747cfa94f90850 /net/samba/files/patch-ba | |
parent | 90ff5b2e43a97ae4a156b310c9d84315fd910096 (diff) | |
download | FreeBSD-ports-f08bd48baf3b81fd3793902404e2bc61ea3fc389.zip FreeBSD-ports-f08bd48baf3b81fd3793902404e2bc61ea3fc389.tar.gz |
Update to 2.2.2 to make room for 3.0 in samba-devel
Diffstat (limited to 'net/samba/files/patch-ba')
-rw-r--r-- | net/samba/files/patch-ba | 47 |
1 files changed, 29 insertions, 18 deletions
diff --git a/net/samba/files/patch-ba b/net/samba/files/patch-ba index 14c0d89..b6f5a75 100644 --- a/net/samba/files/patch-ba +++ b/net/samba/files/patch-ba @@ -1,28 +1,41 @@ ---- configure.in.orig Tue Apr 17 19:00:52 2001 -+++ configure.in Thu Jun 7 13:49:53 2001 -@@ -234,9 +234,6 @@ - AC_CHECK_TYPE(offset_t,loff_t) +--- configure.in.orig Sat Oct 13 22:09:16 2001 ++++ configure.in Tue Oct 16 17:21:21 2001 +@@ -406,21 +406,6 @@ AC_CHECK_TYPE(ssize_t, int) + AC_CHECK_TYPE(wchar_t, unsigned short) --# we need libcups for CUPS support... +-############################################ +-# for cups support we need libcups, and a handful of header files +- -AC_CHECK_LIB(cups,httpConnect) - - # we need libdl for PAM and the new VFS code - AC_CHECK_LIB(dl,main) +-# I wonder if there is a nicer way of doing this? +- +-if test x"$ac_cv_lib_cups_httpConnect" = x"yes"; then +- AC_CHECK_HEADERS(cups/cups.h cups/language.h) +- if test x"$ac_cv_header_cups_cups_h" = x"yes"; then +- if test x"$ac_cv_header_cups_language_h" = x"yes"; then +- AC_DEFINE(HAVE_CUPS) +- fi +- fi +-fi -@@ -1258,7 +1255,7 @@ - --without-krb5 Don't include Kerberos 5 support (default)], - [ AC_MSG_RESULT(yes) + ############################################ + # we need libdl for PAM and the new VFS code +@@ -1622,7 +1607,7 @@ + yes) + AC_MSG_RESULT(yes) AC_DEFINE(KRB5_AUTH) - LIBS="$LIBS -ldes425 -lkrb5 -lcrypto -lcom_err" + LIBS="$LIBS -ldes425 -lkrb5 -lk5crypto -lcom_err" CFLAGS="$CFLAGS -I$withval/include" - LDFLAGS="$LDFLAGS -L$withval/lib"], - AC_MSG_RESULT(no) -@@ -1486,6 +1483,21 @@ + LDFLAGS="$LDFLAGS -L$withval/lib" + ;; +@@ -1961,6 +1946,20 @@ + ;; esac ], AC_MSG_RESULT(no) - ) ++) + +################################################# +# check for CUPS printing support @@ -36,8 +49,6 @@ + LDFLAGS="$LDFLAGS -L$withval/lib" + AC_CHECK_LIB(cups,httpConnect)], + AC_MSG_RESULT(no) -+) -+ + ) + - ################################################# - # check for experimental disk-quotas support |