Fixed CUPS detection - patch from Michael Sweet.

Jeremy.
(This used to be commit 4c5158d1e5620ccc3f2812a3fbedcb60a67caecc)

diff --git a/source3/configure b/source3/configure
index 427e442019982fb983f54698e96f8a4520ad8c19..b50dfb3284e6c35ddf9c364cddb8ec1a793db279 100755 (executable)
--- a/source3/configure
+++ b/source3/configure
@@ -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

diff --git a/source3/configure.in b/source3/configure.in
index ab26fa4b0b36bad7905cda57199bc12ca6a46851..0b5d807239c9cfd32a4a210d60ef62cfc824939f 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -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)

diff --git a/source3/include/config.h.in b/source3/include/config.h.in
index 29dfcc14ab88c41f56604d883dbea375442b0eb4..7869b296b541449590cc0efdb2349b2c43f6f0b9 100644 (file)
--- a/source3/include/config.h.in
+++ b/source3/include/config.h.in
@@ -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
-