diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2017-06-16 21:08:04 -0400 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2017-06-16 21:08:04 -0400 |
| commit | 827bf9ce2d279da2d00983938897ee7c46b86cc4 (patch) | |
| tree | 7833daad5a6d359754d6b4a856bb6214bea26ea6 /config-scripts | |
| parent | 3a6962171c2bb85e790df265ac91544b1a8b6c4e (diff) | |
Fix some of the Linux-specific configure tests.
Diffstat (limited to 'config-scripts')
| -rw-r--r-- | config-scripts/cups-common.m4 | 2 | ||||
| -rw-r--r-- | config-scripts/cups-defaults.m4 | 26 | ||||
| -rw-r--r-- | config-scripts/cups-directories.m4 | 2 | ||||
| -rw-r--r-- | config-scripts/cups-sharedlibs.m4 | 4 | ||||
| -rw-r--r-- | config-scripts/cups-startup.m4 | 4 |
5 files changed, 22 insertions, 16 deletions
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index 6e65fc011..8136ce161 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -181,7 +181,7 @@ AC_CHECK_FUNCS(vsyslog) dnl Checks for signal functions. case "$host_os_name" in - linux | gnu) + linux* | gnu*) # Do not use sigset on Linux or GNU HURD ;; *) diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4 index 9de4efc51..22c193884 100644 --- a/config-scripts/cups-defaults.m4 +++ b/config-scripts/cups-defaults.m4 @@ -40,11 +40,14 @@ fi dnl Default executable file permissions AC_ARG_WITH(exe_file_perm, [ --with-exe-file-perm set default exectuable permissions value, default=0555], CUPS_EXE_FILE_PERM="$withval", - if test "x$host_os_name" = xlinux; then - CUPS_EXE_FILE_PERM="755" - else - CUPS_EXE_FILE_PERM="555" - fi) + case "$host_os_name" in + linux* | gnu*) + CUPS_EXE_FILE_PERM="755" + ;; + *) + CUPS_EXE_FILE_PERM="555" + ;; + esac) AC_SUBST(CUPS_EXE_FILE_PERM) dnl Default ConfigFilePerm @@ -61,11 +64,14 @@ AC_DEFINE_UNQUOTED(CUPS_DEFAULT_CONFIG_FILE_PERM, 0$CUPS_CONFIG_FILE_PERM) dnl Default permissions for cupsd AC_ARG_WITH(cupsd_file_perm, [ --with-cupsd-file-perm set default cupsd permissions, default=0500], CUPS_CUPSD_FILE_PERM="$withval", - if test "x$host_os_name" = xlinux; then - CUPS_CUPSD_FILE_PERM="700" - else - CUPS_CUPSD_FILE_PERM="500" - fi) + case "$host_os_name" in + linux* | gnu*) + CUPS_CUPSD_FILE_PERM="700" + ;; + *) + CUPS_CUPSD_FILE_PERM="500" + ;; + esac) AC_SUBST(CUPS_CUPSD_FILE_PERM) dnl Default LogFilePerm diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 index 78d2f8f36..c99550710 100644 --- a/config-scripts/cups-directories.m4 +++ b/config-scripts/cups-directories.m4 @@ -231,7 +231,7 @@ AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$CUPS_FONTPATH") # Locale data if test "$localedir" = "\${datarootdir}/locale"; then case "$host_os_name" in - linux | gnu | *bsd* | darwin*) + linux* | gnu* | *bsd* | darwin*) CUPS_LOCALEDIR="$datarootdir/locale" ;; diff --git a/config-scripts/cups-sharedlibs.m4 b/config-scripts/cups-sharedlibs.m4 index 9f8bab8c5..6e6b58239 100644 --- a/config-scripts/cups-sharedlibs.m4 +++ b/config-scripts/cups-sharedlibs.m4 @@ -32,7 +32,7 @@ if test x$enable_shared != xno; then DSOXX="\$(CXX)" DSOFLAGS="$DSOFLAGS -Wl,-h\`basename \$@\` -G \$(OPTIM)" ;; - linux | gnu | *bsd*) + linux* | gnu* | *bsd*) LIBCUPS="lib$cupsbase.so.2" LIBCUPSCGI="libcupscgi.so.1" LIBCUPSIMAGE="libcupsimage.so.2" @@ -137,7 +137,7 @@ if test "$DSO" != ":"; then EXPORT_LDFLAGS="-Wl,-R$libdir" fi ;; - linux | gnu) + linux* | gnu*) # Linux, and HURD... if test $exec_prefix != /usr; then DSOFLAGS="-Wl,-rpath,$libdir $DSOFLAGS" diff --git a/config-scripts/cups-startup.m4 b/config-scripts/cups-startup.m4 index 7a999ed4e..978daae75 100644 --- a/config-scripts/cups-startup.m4 +++ b/config-scripts/cups-startup.m4 @@ -118,7 +118,7 @@ fi if test "x$rcstart" = x; then case "$host_os_name" in - linux | gnu | gnu/k*bsd*) + linux* | gnu*) # Linux rcstart="81" ;; @@ -137,7 +137,7 @@ fi if test "x$rcstop" = x; then case "$host_os_name" in - linux | gnu | gnu/k*bsd*) + linux* | gnu*) # Linux rcstop="36" ;; |