Merge changes from CUPS 1.6svn-r9939.

[thirdparty/cups.git] / config-scripts / cups-common.m4

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index db0c6c0c99a0c9fdd0d5fb38959bf1e2abdca731..245d6f6e6eb68cde76f1f3315592507abec8c1dd 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -3,7 +3,7 @@ dnl "$Id: cups-common.m4 8781 2009-08-28 17:34:54Z mike $"
 dnl
 dnl   Common configuration stuff for CUPS.
 dnl
-dnl   Copyright 2007-2010 by Apple Inc.
+dnl   Copyright 2007-2011 by Apple Inc.
 dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
@@ -20,7 +20,7 @@ dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)
 
 dnl Version number information...
-CUPS_VERSION="1.5svn"
+CUPS_VERSION="1.6svn"
 CUPS_REVISION=""
 if test -z "$CUPS_REVISION" -a -d .svn; then
        CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
@@ -88,6 +88,9 @@ fi
 
 AC_SUBST(INSTALLSTATIC)
 
+dnl Check for pkg-config, which is used for some other tests later on...
+AC_PATH_PROG(PKGCONFIG, pkg-config)
+
 dnl Check for libraries...
 AC_SEARCH_LIBS(crypt, crypt)
 AC_SEARCH_LIBS(getspent, sec gen)
@@ -120,6 +123,7 @@ AC_SUBST(LIBPAPER)
 
 dnl Checks for header files.
 AC_HEADER_STDC
+AC_CHECK_HEADER(stdlib.h,AC_DEFINE(HAVE_STDLIB_H))
 AC_CHECK_HEADER(crypt.h,AC_DEFINE(HAVE_CRYPT_H))
 AC_CHECK_HEADER(langinfo.h,AC_DEFINE(HAVE_LANGINFO_H))
 AC_CHECK_HEADER(malloc.h,AC_DEFINE(HAVE_MALLOC_H))
@@ -142,8 +146,15 @@ AC_CHECK_HEADER(iconv.h,
                SAVELIBS="$SAVELIBS $LIBS")
        LIBS="$SAVELIBS")
 
+dnl Checks for statfs and its many headers...
+AC_CHECK_HEADER(sys/mount.h,AC_DEFINE(HAVE_SYS_MOUNT_H))
+AC_CHECK_HEADER(sys/statfs.h,AC_DEFINE(HAVE_SYS_STATFS_H))
+AC_CHECK_HEADER(sys/statvfs.h,AC_DEFINE(HAVE_SYS_STATVFS_H))
+AC_CHECK_HEADER(sys/vfs.h,AC_DEFINE(HAVE_SYS_VFS_H))
+AC_CHECK_FUNCS(statfs statvfs)
+
 dnl Checks for string functions.
-AC_CHECK_FUNCS(strdup strcasecmp strncasecmp strlcat strlcpy)
+AC_CHECK_FUNCS(strdup strlcat strlcpy)
 if test "$uname" = "HP-UX" -a "$uversion" = "1020"; then
        echo Forcing snprintf emulation for HP-UX.
 else
@@ -156,6 +167,9 @@ AC_CHECK_FUNCS(random lrand48 arc4random)
 dnl Check for geteuid function.
 AC_CHECK_FUNCS(geteuid)
 
+dnl Check for setpgid function.
+AC_CHECK_FUNCS(setpgid)
+
 dnl Check for vsyslog function.
 AC_CHECK_FUNCS(vsyslog)
 
@@ -209,7 +223,7 @@ else
 fi
 
 if test $check_libusb = yes; then
-       AC_CHECK_LIB(usb, usb_init,[
+       AC_CHECK_LIB(usb, usb_get_string_simple,[
                AC_CHECK_HEADER(usb.h,
                        AC_DEFINE(HAVE_USB_H)
                        LIBUSB="-lusb")])
@@ -228,6 +242,15 @@ if test x$enable_tcp_wrappers = xyes; then
                        LIBWRAP="-lwrap")])
 fi
 
+dnl ZLIB
+LIBZ=""
+AC_CHECK_HEADER(zlib.h,
+    AC_CHECK_LIB(z, gzgets,
+       AC_DEFINE(HAVE_LIBZ)
+       LIBZ="-lz"
+       LIBS="$LIBS -lz"))
+AC_SUBST(LIBZ)
+
 dnl Flags for "ar" command...
 case $uname in
         Darwin* | *BSD*)
@@ -270,24 +293,22 @@ AC_ARG_WITH(dbusdir, [  --with-dbusdir          set DBUS configuration directory
 DBUS_NOTIFIER=""
 DBUS_NOTIFIERLIBS=""
 
-if test "x$enable_dbus" != xno; then
-       AC_PATH_PROG(PKGCONFIG, pkg-config)
-       if test "x$PKGCONFIG" != x; then
-               AC_MSG_CHECKING(for DBUS)
-               if $PKGCONFIG --exists dbus-1; then
-                       AC_MSG_RESULT(yes)
-                       AC_DEFINE(HAVE_DBUS)
-                       CFLAGS="$CFLAGS `$PKGCONFIG --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE"
-                       SERVERLIBS="$SERVERLIBS `$PKGCONFIG --libs dbus-1`"
-                       DBUS_NOTIFIER="dbus"
-                       DBUS_NOTIFIERLIBS="`$PKGCONFIG --libs dbus-1`"
-                       AC_CHECK_LIB(dbus-1,
-                               dbus_message_iter_init_append,
-                               AC_DEFINE(HAVE_DBUS_MESSAGE_ITER_INIT_APPEND),,
-                               `$PKGCONFIG --libs dbus-1`)
-               else
-                       AC_MSG_RESULT(no)
-               fi
+if test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x; then
+       AC_MSG_CHECKING(for DBUS)
+       if $PKGCONFIG --exists dbus-1; then
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_DBUS)
+               CFLAGS="$CFLAGS `$PKGCONFIG --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE"
+               SERVERLIBS="$SERVERLIBS `$PKGCONFIG --libs dbus-1`"
+               DBUS_NOTIFIER="dbus"
+               DBUS_NOTIFIERLIBS="`$PKGCONFIG --libs dbus-1`"
+               SAVELIBS="$LIBS"
+               LIBS="$LIBS $DBUS_NOTIFIERLIBS"
+               AC_CHECK_FUNC(dbus_message_iter_init_append,
+                             AC_DEFINE(HAVE_DBUS_MESSAGE_ITER_INIT_APPEND))
+               LIBS="$SAVELIBS"
+       else
+               AC_MSG_RESULT(no)
        fi
 fi
 
@@ -298,11 +319,10 @@ AC_SUBST(DBUS_NOTIFIERLIBS)
 dnl Extra platform-specific libraries...
 CUPS_DEFAULT_PRINTOPERATOR_AUTH="@SYSTEM"
 CUPS_SYSTEM_AUTHKEY=""
-LEGACY_BACKENDS="parallel"
+INSTALLXPC=""
 
 case $uname in
         Darwin*)
-               LEGACY_BACKENDS=""
                 BACKLIBS="$BACKLIBS -framework IOKit"
                 SERVERLIBS="$SERVERLIBS -framework IOKit -weak_framework ApplicationServices"
                 LIBS="-framework SystemConfiguration -framework CoreFoundation -framework Security $LIBS"
@@ -312,10 +332,17 @@ case $uname in
                AC_CHECK_HEADER(CoreFoundation/CoreFoundation.h,AC_DEFINE(HAVE_COREFOUNDATION_H))
                AC_CHECK_HEADER(CoreFoundation/CFPriv.h,AC_DEFINE(HAVE_CFPRIV_H))
                AC_CHECK_HEADER(CoreFoundation/CFBundlePriv.h,AC_DEFINE(HAVE_CFBUNDLEPRIV_H))
+               AC_CHECK_HEADER(IOKit/pwr_mgt/IOPMLibPrivate.h,AC_DEFINE(HAVE_IOKIT_PWR_MGT_IOPMLIBPRIVATE_H))
 
                dnl Check for dynamic store function...
                AC_CHECK_FUNCS(SCDynamicStoreCopyComputerName)
 
+               dnl Check for new ColorSync APIs...
+               SAVELIBS="$LIBS"
+               LIBS="$LIBS -framework ApplicationServices"
+               AC_CHECK_FUNCS(ColorSyncRegisterDevice)
+               LIBS="$SAVELIBS"
+
                dnl Check for the new membership functions in MacOSX 10.4...
                AC_CHECK_HEADER(membership.h,AC_DEFINE(HAVE_MEMBERSHIP_H))
                AC_CHECK_HEADER(membershipPriv.h,AC_DEFINE(HAVE_MEMBERSHIPPRIV_H))
@@ -338,7 +365,7 @@ case $uname in
                AC_ARG_WITH(operkey, [  --with-operkey          set the default operator @AUTHKEY value],
                        default_operkey="$withval",
                        default_operkey="default")
- 
+
                AC_CHECK_HEADER(Security/Authorization.h, [
                        AC_DEFINE(HAVE_AUTHORIZATION_H)
 
@@ -360,14 +387,21 @@ case $uname in
                AC_CHECK_HEADER(Security/SecBasePriv.h,AC_DEFINE(HAVE_SECBASEPRIV_H))
 
                dnl Check for sandbox/Seatbelt support
-               AC_CHECK_HEADER(sandbox.h,AC_DEFINE(HAVE_SANDBOX_H))
+               if test $uversion -ge 100; then
+                   AC_CHECK_HEADER(sandbox.h,AC_DEFINE(HAVE_SANDBOX_H))
+               fi
+
+               dnl Check for XPC support
+               AC_CHECK_HEADER(xpc/xpc.h,
+                       AC_DEFINE(HAVE_XPC)
+                       INSTALLXPC="install-xpc")
                 ;;
 esac
 
 AC_SUBST(CUPS_DEFAULT_PRINTOPERATOR_AUTH)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_PRINTOPERATOR_AUTH, "$CUPS_DEFAULT_PRINTOPERATOR_AUTH")
 AC_SUBST(CUPS_SYSTEM_AUTHKEY)
-AC_SUBST(LEGACY_BACKENDS)
+AC_SUBST(INSTALLXPC)
 
 dnl Check for build components
 COMPONENTS="all"
@@ -379,7 +413,7 @@ AC_ARG_WITH(components, [  --with-components       set components to build:
 
 case "$COMPONENTS" in
        all)
-               BUILDDIRS="filter backend berkeley cgi-bin driver monitor notifier ppdc scheduler systemv conf data locale man doc examples templates"
+               BUILDDIRS="filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates"
                ;;
 
        core)