Remove svn:keywords since they cause svn_load_dirs.pl to complain about every file.

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

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 95ba2d9c5b6c0c573b36d6abaec696a57dea9bce..3a9d68d5026cd7129d41aa827af20a318294bf76 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-common.m4 5025 2006-01-30 03:49:12Z mike $"
+dnl "$Id: cups-common.m4 181 2006-06-22 20:01:18Z jlovell $"
 dnl
 dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
 dnl   property of Easy Software Products and are protected by Federal
@@ -29,10 +29,16 @@ dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)
 
 dnl Versio number information...
-CUPS_VERSION="1.2svn"
+CUPS_VERSION="1.3svn"
+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'`"
+fi
+
 AC_SUBST(CUPS_VERSION)
-AC_DEFINE_UNQUOTED(CUPS_SVERSION, "CUPS v$CUPS_VERSION")
-AC_DEFINE_UNQUOTED(CUPS_MINIMAL, "CUPS/$CUPS_VERSION")
+AC_SUBST(CUPS_REVISION)
+AC_DEFINE_UNQUOTED(CUPS_SVERSION, "CUPS v$CUPS_VERSION$CUPS_REVISION")
+AC_DEFINE_UNQUOTED(CUPS_MINIMAL, "CUPS/$CUPS_VERSION$CUPS_REVISION")
 
 dnl Default compiler flags...
 CFLAGS="${CFLAGS:=}"
@@ -53,9 +59,11 @@ fi
 AC_PROG_RANLIB
 AC_PATH_PROG(AR,ar)
 AC_PATH_PROG(HTMLDOC,htmldoc)
+AC_PATH_PROG(LD,ld)
 AC_PATH_PROG(LN,ln)
 AC_PATH_PROG(MV,mv)
 AC_PATH_PROG(RM,rm)
+AC_PATH_PROG(RMDIR,rmdir)
 AC_PATH_PROG(SED,sed)
 AC_PATH_PROG(STRIP,strip)
 
@@ -71,9 +79,10 @@ fi
 
 dnl Static library option...
 INSTALLSTATIC=""
-AC_ARG_ENABLE(install_static, [  --enable-static         install static libraries, default=no])
+AC_ARG_ENABLE(static, [  --enable-static         install static libraries, default=no])
 
-if test x$enable_install_static = xyes; then
+if test x$enable_static = xyes; then
+       echo Installing static libraries...
        INSTALLSTATIC="installstatic"
 fi
 
@@ -166,11 +175,6 @@ AC_TRY_COMPILE([#include <time.h>],[struct tm t;
        AC_DEFINE(HAVE_TM_GMTOFF),
        AC_MSG_RESULT(no))
 
-dnl See if we have POSIX ACL support...
-dnl TODO: Linux/Solaris/IRIX/etc. version
-
-AC_CHECK_FUNCS(acl_init)
-
 dnl Flags for "ar" command...
 case $uname in
         Darwin* | *BSD*)
@@ -184,6 +188,12 @@ esac
 AC_SUBST(ARFLAGS)
 
 dnl Extra platform-specific libraries...
+BACKLIBS=""
+CUPSDLIBS=""
+DBUSDIR=""
+
+AC_ARG_ENABLE(dbus, [  --enable-dbus           enable DBUS support, default=auto])
+
 case $uname in
         Darwin*)
                 BACKLIBS="-framework IOKit"
@@ -206,7 +216,6 @@ case $uname in
 
                dnl Check for the new membership functions in MacOSX 10.4 (Tiger)...
                AC_CHECK_HEADER(membership.h,AC_DEFINE(HAVE_MEMBERSHIP_H))
-               AC_CHECK_HEADER(membershipPriv.h,AC_DEFINE(HAVE_MEMBERSHIPPRIV_H))
                AC_CHECK_FUNCS(mbr_uid_to_uuid)
 
                dnl Check for notify_post support
@@ -216,31 +225,36 @@ case $uname in
 
        Linux*)
                dnl Check for DBUS support
-                BACKLIBS=""
-               CUPSDLIBS=""
-
-               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"
-                               CUPSDLIBS="`$PKGCONFIG --libs dbus-1`"
-                       else
-                               AC_MSG_RESULT(no)
+               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_CHECK_LIB(dbus-1,
+                                           dbus_message_iter_init_append,
+                                           AC_DEFINE(HAVE_DBUS)
+                                           CFLAGS="$CFLAGS `$PKGCONFIG --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE"
+                                           CUPSDLIBS="`$PKGCONFIG --libs dbus-1`"
+                                           DBUSDIR="/etc/dbus-1/system.d")
+                               else
+                                       AC_MSG_RESULT(no)
+                               fi
                        fi
                fi
                ;;
-
-        *)
-                BACKLIBS=""
-               CUPSDLIBS=""
-                ;;
 esac
 
+dnl See if we have POSIX ACL support...
+SAVELIBS="$LIBS"
+LIBS=""
+AC_SEARCH_LIBS(acl_init, acl, AC_DEFINE(HAVE_ACL_INIT))
+CUPSDLIBS="$CUPSDLIBS $LIBS"
+LIBS="$SAVELIBS"
+
 AC_SUBST(BACKLIBS)
 AC_SUBST(CUPSDLIBS)
+AC_SUBST(DBUSDIR)
 
 dnl New default port definition for IPP...
 AC_ARG_WITH(ipp-port, [  --with-ipp-port         set default port number for IPP ],
@@ -251,5 +265,5 @@ AC_SUBST(DEFAULT_IPP_PORT)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT)
 
 dnl
-dnl End of "$Id: cups-common.m4 5025 2006-01-30 03:49:12Z mike $".
+dnl End of "$Id: cups-common.m4 181 2006-06-22 20:01:18Z jlovell $".
 dnl