diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2007-10-17 20:05:25 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2007-10-17 20:05:25 +0000 |
| commit | 2e4ff8afcbae91304495e2c90b4965420422e363 (patch) | |
| tree | c0233dc32abb6409b70bc21ed934e71b7982347f /config-scripts/cups-directories.m4 | |
| parent | 56ab62c60cfb18c20468bbec182c52e7dc184195 (diff) | |
Import CUPS 1.4svn r7023 into easysw/current.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@502 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'config-scripts/cups-directories.m4')
| -rw-r--r-- | config-scripts/cups-directories.m4 | 54 |
1 files changed, 47 insertions, 7 deletions
diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 index 86e1d5562..4105ba17f 100644 --- a/config-scripts/cups-directories.m4 +++ b/config-scripts/cups-directories.m4 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-directories.m4 6976 2007-09-18 20:39:31Z mike $" +dnl "$Id: cups-directories.m4 6975 2007-09-18 20:37:09Z mike $" dnl dnl Directory stuff for the Common UNIX Printing System (CUPS). dnl @@ -163,7 +163,7 @@ if test x$rcdir = x; then RCSTOP="25" ;; - Linux | GNU) + Linux | GNU | GNU/k*BSD*) # Linux/HURD seems to choose an init.d directory at random... if test -d /sbin/init.d; then # SuSE @@ -229,6 +229,47 @@ fi AC_SUBST(XINETD) +dnl LPD sharing support... +AC_ARG_WITH(lpdconfig, [ --with-lpdconfig set URI for LPD config file], + LPDCONFIG="$withval", LPDCONFIG="") + +if test "x$LPDCONFIG" = x; then + if test -f /System/Library/LaunchDaemons/org.cups.cups-lpd.plist; then + LPDCONFIG="launchd:///System/Library/LaunchDaemons/org.cups.cups-lpd.plist" + elif test "x$XINETD" != x; then + LPDCONFIG="xinetd://$XINETD/cups-lpd" + fi +fi + +if test "x$LPDCONFIG" = xoff; then + AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LPD_CONFIG, "") +else + AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LPD_CONFIG, "$LPDCONFIG") +fi + +dnl SMB sharing support... +AC_ARG_WITH(smbconfig, [ --with-smbconfig set URI for Samba config file], + SMBCONFIG="$withval", SMBCONFIG="") + +if test "x$SMBCONFIG" = x; then + if test -f /System/Library/LaunchDaemons/smbd.plist; then + SMBCONFIG="launchd:///System/Library/LaunchDaemons/smbd.plist" + else + for dir in /etc /etc/samba /usr/local/etc; do + if test -f $dir/smb.conf; then + SMBCONFIG="samba://$dir/smb.conf" + break + fi + done + fi +fi + +if test "x$SMBCONFIG" = xoff; then + AC_DEFINE_UNQUOTED(CUPS_DEFAULT_SMB_CONFIG, "") +else + AC_DEFINE_UNQUOTED(CUPS_DEFAULT_SMB_CONFIG, "$SMBCONFIG") +fi + dnl Setup default locations... # Cache data... AC_ARG_WITH(cachedir, [ --with-cachedir set path for cache files],cachedir="$withval",cachedir="") @@ -297,12 +338,11 @@ fi AC_SUBST(CUPS_FONTPATH) AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$CUPS_FONTPATH") -# Locale data (initial assignment allows us not to require autoconf 2.60) -localedir="${localedir:=}" -if test "$localedir" = "\${datarootdir}/locale" -o "$localedir" = ""; then +# Locale data +if test "$localedir" = "\${datarootdir}/locale"; then case "$uname" in Linux | GNU | *BSD* | Darwin*) - CUPS_LOCALEDIR="$datadir/locale" + CUPS_LOCALEDIR="$datarootdir/locale" ;; OSF1* | AIX*) @@ -367,5 +407,5 @@ AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$localstatedir/run/cups") AC_SUBST(CUPS_STATEDIR) dnl -dnl End of "$Id: cups-directories.m4 6976 2007-09-18 20:39:31Z mike $". +dnl End of "$Id: cups-directories.m4 6975 2007-09-18 20:37:09Z mike $". dnl |