sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
Code

Fixed CUPS detection - patch from Michael Sweet.

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison 0001-01-01 00:00:00 +00:00
parent 1f83184f88
commit 4c5158d1e5
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/configure vendored
View File

@ -934,7 +934,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
for ac_prog in mawk gawk nawk awk
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@ -3421,8 +3421,8 @@ else
fi
done
if x"$ac_cv_header_cups_cups_h" = x"yes"; then
if x"$ac_cv_header_cups_language_h" = x"yes"; then
if test x"$ac_cv_header_cups_cups_h" = x"yes"; then
if test x"$ac_cv_header_cups_language_h" = x"yes"; then
cat >> confdefs.h <<\EOF
#define HAVE_CUPS 1
EOF
@ -5180,7 +5180,7 @@ else
fi
done
for ac_func in strftime sigprocmask sigblock sigaction innetgr setnetgrent getnetgrent endnetgrent
for ac_func in strftime sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetgrent endnetgrent
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:5187: checking for $ac_func" >&5

6
source/configure.in
View File

@ -305,8 +305,8 @@ AC_CHECK_LIB(cups,httpConnect)
if test x"$ac_cv_lib_cups_httpConnect" = x"yes"; then
AC_CHECK_HEADERS(cups/cups.h cups/language.h)
if x"$ac_cv_header_cups_cups_h" = x"yes"; then
if x"$ac_cv_header_cups_language_h" = x"yes"; then
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
@ -534,7 +534,7 @@ fi
AC_CHECK_FUNCS(waitpid getcwd strdup strtoul strerror chown fchown chmod fchmod chroot)
AC_CHECK_FUNCS(fstat strchr utime utimes getrlimit fsync bzero memset)
AC_CHECK_FUNCS(memmove vsnprintf snprintf asprintf vasprintf setsid glob strpbrk pipe crypt16 getauthuid)
AC_CHECK_FUNCS(strftime sigprocmask sigblock sigaction innetgr setnetgrent getnetgrent endnetgrent)
AC_CHECK_FUNCS(strftime sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetgrent endnetgrent)
AC_CHECK_FUNCS(initgroups select poll rdchk getgrnam getgrent pathconf)
AC_CHECK_FUNCS(setpriv setgidx setuidx setgroups sysconf mktime rename ftruncate stat64 fstat64)
AC_CHECK_FUNCS(lstat64 fopen64 atexit grantpt dup2 lseek64 ftruncate64 readdir64)

6
source/include/config.h.in
View File

@ -755,6 +755,9 @@
/* Define if you have the sigprocmask function. */
#undef HAVE_SIGPROCMASK
/* Define if you have the sigset function. */
#undef HAVE_SIGSET
/* Define if you have the snprintf function. */
#undef HAVE_SNPRINTF
@ -1112,6 +1115,3 @@
/* Define if you have working AF_LOCAL sockets */
#undef HAVE_WORKING_AF_LOCAL
/* Used for determining the compile time options */
#undef SSL_DIR