X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=config-scripts%2Fcups-common.m4;h=d47f142789570ca9178716e406c6ab76651ec9c2;hb=41681883895f928191cfa6472b453d9753cc26ec;hp=8fcc1fb85ebb7ab9f4c7647a0e3808783eaa5a14;hpb=745129beebf8651dd9ce221cc7c046460b4ae8f6;p=thirdparty%2Fcups.git diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index 8fcc1fb85..d47f14278 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-common.m4 7900 2008-09-03 13:47:57Z mike $" +dnl "$Id: cups-common.m4 8781 2009-08-28 17:34:54Z mike $" dnl dnl Common configuration stuff for the Common UNIX Printing System (CUPS). dnl @@ -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.4b3" +CUPS_VERSION="1.5svn" 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'`" @@ -49,6 +49,7 @@ AC_PROG_CPP AC_PROG_CXX AC_PROG_RANLIB AC_PATH_PROG(AR,ar) +AC_PATH_PROG(CHMOD,chmod) AC_PATH_PROG(HTMLDOC,htmldoc) AC_PATH_PROG(LD,ld) AC_PATH_PROG(LN,ln) @@ -65,7 +66,7 @@ fi AC_SUBST(CUPS_HTMLVIEW) AC_MSG_CHECKING(for install-sh script) -INSTALL="`pwd`/install-sh -c" +INSTALL="`pwd`/install-sh" AC_SUBST(INSTALL) AC_MSG_RESULT(using $INSTALL) @@ -78,7 +79,7 @@ fi dnl Static library option... INSTALLSTATIC="" -AC_ARG_ENABLE(static, [ --enable-static install static libraries, default=no]) +AC_ARG_ENABLE(static, [ --enable-static install static libraries]) if test x$enable_static = xyes; then echo Installing static libraries... @@ -92,7 +93,7 @@ AC_SEARCH_LIBS(crypt, crypt) AC_SEARCH_LIBS(getspent, sec gen) LIBMALLOC="" -AC_ARG_ENABLE(mallinfo, [ --enable-mallinfo turn on malloc debug information, default=no]) +AC_ARG_ENABLE(mallinfo, [ --enable-mallinfo build with malloc debug logging]) if test x$enable_mallinfo = xyes; then SAVELIBS="$LIBS" @@ -105,7 +106,7 @@ fi AC_SUBST(LIBMALLOC) dnl Check for libpaper support... -AC_ARG_ENABLE(libpaper, [ --enable-libpaper turn on libpaper support, default=no]) +AC_ARG_ENABLE(libpaper, [ --enable-libpaper build with libpaper support]) if test x$enable_libpaper = xyes; then AC_CHECK_LIB(paper,systempapername, @@ -141,10 +142,7 @@ else fi dnl Check for random number functions... -AC_CHECK_FUNCS(random mrand48 lrand48) - -dnl Checks for mkstemp and mkstemps functions. -AC_CHECK_FUNCS(mkstemp mkstemps) +AC_CHECK_FUNCS(random lrand48 arc4random) dnl Check for geteuid function. AC_CHECK_FUNCS(geteuid) @@ -180,7 +178,7 @@ dnl See if we have the removefile(3) function for securely removing files AC_CHECK_FUNCS(removefile) dnl See if we have libusb... -AC_ARG_ENABLE(libusb, [ --enable-libusb use libusb for USB printing, default=auto]) +AC_ARG_ENABLE(libusb, [ --enable-libusb use libusb for USB printing]) LIBUSB="" AC_SUBST(LIBUSB) @@ -201,7 +199,7 @@ if test $check_libusb = yes; then fi dnl See if we have libwrap for TCP wrappers support... -AC_ARG_ENABLE(tcp_wrappers, [ --enable-tcp-wrappers use libwrap for TCP wrappers support, default=no]) +AC_ARG_ENABLE(tcp_wrappers, [ --enable-tcp-wrappers use libwrap for TCP wrappers support]) LIBWRAP="" AC_SUBST(LIBWRAP) @@ -234,7 +232,7 @@ AC_SUBST(CUPSDLIBS) dnl See if we have POSIX ACL support... SAVELIBS="$LIBS" LIBS="" -AC_ARG_ENABLE(acl, [ --enable-acl enable POSIX ACL support, default=auto]) +AC_ARG_ENABLE(acl, [ --enable-acl build with POSIX ACL support]) if test "x$enable_acl" != xno; then AC_SEARCH_LIBS(acl_init, acl, AC_DEFINE(HAVE_ACL_INIT)) CUPSDLIBS="$CUPSDLIBS $LIBS" @@ -248,7 +246,7 @@ else DBUSDIR="" fi -AC_ARG_ENABLE(dbus, [ --enable-dbus enable DBUS support, default=auto]) +AC_ARG_ENABLE(dbus, [ --enable-dbus build with DBUS support]) AC_ARG_WITH(dbusdir, [ --with-dbusdir set DBUS configuration directory ], DBUSDIR="$withval") @@ -264,15 +262,12 @@ if test "x$enable_dbus" != xno; then AC_DEFINE(HAVE_DBUS) CFLAGS="$CFLAGS `$PKGCONFIG --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE" CUPSDLIBS="$CUPSDLIBS `$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`) - if $PKGCONFIG --exists glib-2.0 && $PKGCONFIG --exists dbus-glib-1; then - DBUS_NOTIFIER="dbus" - DBUS_NOTIFIERLIBS="`$PKGCONFIG --libs glib-2.0` `$PKGCONFIG --libs dbus-glib-1` `$PKGCONFIG --libs dbus-1`" - CFLAGS="$CFLAGS `$PKGCONFIG --cflags glib-2.0`" - fi else AC_MSG_RESULT(no) fi @@ -284,14 +279,13 @@ AC_SUBST(DBUS_NOTIFIER) AC_SUBST(DBUS_NOTIFIERLIBS) dnl Extra platform-specific libraries... -CUPS_DEFAULT_PRINTADMIN_AUTH="@SYSTEM" +CUPS_DEFAULT_PRINTOPERATOR_AUTH="@SYSTEM" CUPS_SYSTEM_AUTHKEY="" FONTS="fonts" LEGACY_BACKENDS="parallel scsi" case $uname in Darwin*) -# FONTS="" LEGACY_BACKENDS="" BACKLIBS="$BACKLIBS -framework IOKit" CUPSDLIBS="$CUPSDLIBS -sectorder __TEXT __text cupsd.order -e start -framework IOKit -framework SystemConfiguration -weak_framework ApplicationServices" @@ -307,6 +301,9 @@ case $uname in AC_CHECK_HEADER(membershipPriv.h,AC_DEFINE(HAVE_MEMBERSHIPPRIV_H)) AC_CHECK_FUNCS(mbr_uid_to_uuid) + dnl Check for the vproc_transaction_begin/end stuff... + AC_CHECK_FUNCS(vproc_transaction_begin) + dnl Need header... AC_CHECK_HEADER(dlfcn.h,AC_DEFINE(HAVE_DLFCN_H)) @@ -334,11 +331,11 @@ case $uname in fi if test "x$default_operkey" != xdefault; then - CUPS_DEFAULT_PRINTADMIN_AUTH="@AUTHKEY($default_operkey) @admin @lpadmin" + CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY($default_operkey) @admin @lpadmin" elif grep -q system.print.operator /etc/authorization; then - CUPS_DEFAULT_PRINTADMIN_AUTH="@AUTHKEY(system.print.operator) @admin @lpadmin" + CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.operator) @admin @lpadmin" else - CUPS_DEFAULT_PRINTADMIN_AUTH="@AUTHKEY(system.print.admin) @admin @lpadmin" + CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.admin) @admin @lpadmin" fi]) AC_CHECK_HEADER(Security/SecBasePriv.h,AC_DEFINE(HAVE_SECBASEPRIV_H)) @@ -347,12 +344,12 @@ case $uname in ;; esac -AC_SUBST(CUPS_DEFAULT_PRINTADMIN_AUTH) -AC_DEFINE_UNQUOTED(CUPS_DEFAULT_PRINTADMIN_AUTH, "$CUPS_DEFAULT_PRINTADMIN_AUTH") +AC_SUBST(CUPS_DEFAULT_PRINTOPERATOR_AUTH) +AC_DEFINE_UNQUOTED(CUPS_DEFAULT_PRINTOPERATOR_AUTH, "$CUPS_DEFAULT_PRINTOPERATOR_AUTH") AC_SUBST(CUPS_SYSTEM_AUTHKEY) AC_SUBST(FONTS) AC_SUBST(LEGACY_BACKENDS) dnl -dnl End of "$Id: cups-common.m4 7900 2008-09-03 13:47:57Z mike $". +dnl End of "$Id: cups-common.m4 8781 2009-08-28 17:34:54Z mike $". dnl