Merge easysw-1.4svn-r7834

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

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 16e6b2b0e6732d563021012da580afab239b29bf..a9eae2709073303c87a61af7b9ca30b3520086f8 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -51,6 +51,13 @@ AC_PATH_PROG(MV,mv)
 AC_PATH_PROG(RM,rm)
 AC_PATH_PROG(RMDIR,rmdir)
 AC_PATH_PROG(SED,sed)
+AC_PATH_PROG(XDGOPEN,xdg-open)
+if test "x$XDGOPEN" = x; then
+       CUPS_HTMLVIEW="htmlview"
+else
+       CUPS_HTMLVIEW="$XDGOPEN"
+fi
+AC_SUBST(CUPS_HTMLVIEW)
 
 AC_MSG_CHECKING(for install-sh script)
 INSTALL="`pwd`/install-sh -c"
@@ -222,8 +229,11 @@ AC_SUBST(CUPSDLIBS)
 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"
+AC_ARG_ENABLE(acl, [  --enable-acl            enable POSIX ACL support, default=auto])
+if test "x$enable_acl" != xno; then
+       AC_SEARCH_LIBS(acl_init, acl, AC_DEFINE(HAVE_ACL_INIT))
+       CUPSDLIBS="$CUPSDLIBS $LIBS"
+fi
 LIBS="$SAVELIBS"
 
 dnl Check for DBUS support