diff options
| author | jlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2006-02-22 16:59:36 +0000 |
|---|---|---|
| committer | jlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2006-02-22 16:59:36 +0000 |
| commit | ecdc06282a65bd04f801c877d2ceb83106d737e1 (patch) | |
| tree | cd00fed2f725d8c7b193bb566974e4d4da30740f /config-scripts | |
| parent | bd7854cb4d663bb0e561eaf5b01bbd47baa71d22 (diff) | |
Load cups into easysw/current.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@63 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'config-scripts')
| -rw-r--r-- | config-scripts/cups-common.m4 | 44 |
1 files changed, 27 insertions, 17 deletions
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index 442cd5325..abad61d56 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-common.m4 5136 2006-02-19 18:46:46Z mike $" +dnl "$Id: cups-common.m4 5144 2006-02-21 20:44:01Z mike $" dnl dnl Common configuration stuff for the Common UNIX Printing System (CUPS). dnl @@ -30,9 +30,15 @@ AC_CONFIG_HEADER(config.h) dnl Versio number information... CUPS_VERSION="1.2svn" +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:=}" @@ -184,6 +190,8 @@ BACKLIBS="" CUPSDLIBS="" DBUSDIR="" +AC_ARG_ENABLE(dbus, [ --enable-dbus enable DBUS support, default=auto]) + case $uname in Darwin*) BACKLIBS="-framework IOKit" @@ -215,19 +223,21 @@ case $uname in Linux*) dnl Check for DBUS support - 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) + 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 ;; @@ -253,5 +263,5 @@ AC_SUBST(DEFAULT_IPP_PORT) AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT) dnl -dnl End of "$Id: cups-common.m4 5136 2006-02-19 18:46:46Z mike $". +dnl End of "$Id: cups-common.m4 5144 2006-02-21 20:44:01Z mike $". dnl |