Configure script changes for GNU/Hurd (STR #838)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@4358 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES.txt b/CHANGES.txt
index 965756ff813547d52889311859958c878b846513..be70d00d5fda6fdfbc2ae5c1173fa71aefdf9560 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,7 @@ CHANGES.txt - 08/11/2004
 
 CHANGES IN CUPS V1.1.21rc2
 
+       - Configure script changes for GNU/Hurd (STR #838)
        - The lppasswd program was not installed properly by GNU
          install when the installer was not root (STR #836)
        - Updated the cups-lpd man page (STR #843)

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 183ff78e59d1635c5d10e12eaf5732d94229d103..1ed3c9a43de58291432fba51d9adad69b2ab1460 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-common.m4,v 1.46 2004/07/02 04:44:19 mike Exp $"
+dnl "$Id: cups-common.m4,v 1.47 2004/08/11 14:39:26 mike Exp $"
 dnl
 dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -138,7 +138,7 @@ dnl Check OS version and use appropriate format string for strftime...
 AC_MSG_CHECKING(for correct format string to use with strftime)
 
 case "$uname" in
-       IRIX* | SunOS*)
+       IRIX | SunOS*)
                # IRIX and SunOS
                AC_MSG_RESULT(NULL)
                AC_DEFINE(CUPS_STRFTIME_FORMAT, NULL)
@@ -160,9 +160,15 @@ dnl Check for vsyslog function.
 AC_CHECK_FUNCS(vsyslog)
 
 dnl Checks for signal functions.
-if test "$uname" != "Linux"; then
-       AC_CHECK_FUNCS(sigset)
-fi
+case "$uname" in
+       Linux | GNU)
+               # Do not use sigset on Linux or GNU HURD
+               ;;
+       *)
+               # Use sigset on other platforms, if available
+               AC_CHECK_FUNCS(sigset)
+               ;;
+esac
 
 AC_CHECK_FUNCS(sigaction)
 
@@ -206,5 +212,5 @@ AC_SUBST(BACKLIBS)
 AC_SUBST(COMMONLIBS)
 
 dnl
-dnl End of "$Id: cups-common.m4,v 1.46 2004/07/02 04:44:19 mike Exp $".
+dnl End of "$Id: cups-common.m4,v 1.47 2004/08/11 14:39:26 mike Exp $".
 dnl

diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4
index a7f3dfa7f6415c44b3b6f87edd437e72ab4871c5..099afafe377c180b47b8cc58e8f0902fcb94fc32 100644 (file)
--- a/config-scripts/cups-compiler.m4
+++ b/config-scripts/cups-compiler.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-compiler.m4,v 1.27 2004/06/29 03:44:52 mike Exp $"
+dnl "$Id: cups-compiler.m4,v 1.28 2004/08/11 14:39:26 mike Exp $"
 dnl
 dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -119,7 +119,7 @@ else
                                OPTIM="+z $OPTIM"
                        fi
                        ;;
-               IRIX*)
+               IRIX)
                        if test -z "$OPTIM"; then
                                if test "x$with_optim" = x; then
                                        OPTIM="-O2"
@@ -202,5 +202,5 @@ if test $uname = HP-UX; then
 fi
 
 dnl
-dnl End of "$Id: cups-compiler.m4,v 1.27 2004/06/29 03:44:52 mike Exp $".
+dnl End of "$Id: cups-compiler.m4,v 1.28 2004/08/11 14:39:26 mike Exp $".
 dnl

diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4
index f876da84b8f512c084b63b40e404f33b7dc69ce9..fe507a79aa78efcf293de8bfe72b59eaefac80de 100644 (file)
--- a/config-scripts/cups-directories.m4
+++ b/config-scripts/cups-directories.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-directories.m4,v 1.12 2004/06/29 03:44:52 mike Exp $"
+dnl "$Id: cups-directories.m4,v 1.13 2004/08/11 14:39:26 mike Exp $"
 dnl
 dnl   Directory stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -115,8 +115,8 @@ if test x$rcdir = x; then
                        INITDDIR="/System/Library/StartupItems/PrintingServices"
                        ;;
 
-               Linux*)
-                       # Linux seems to choose an init.d directory at random...
+               Linux | GNU)
+                       # Linux/HURD seems to choose an init.d directory at random...
                        if test -d /sbin/init.d; then
                                # SuSE
                                INITDIR="/sbin/init.d"
@@ -197,7 +197,7 @@ AC_SUBST(CUPS_REQUESTS)
 
 dnl Set the CUPS_LOCALE directory...
 case "$uname" in
-       Linux* | *BSD* | Darwin*)
+       Linux | GNU | *BSD* | Darwin*)
                CUPS_LOCALEDIR="$datadir/locale"
                AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$datadir/locale")
                ;;
@@ -238,5 +238,5 @@ AC_SUBST(CUPS_FONTPATH)
 AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$fontpath")
 
 dnl
-dnl End of "$Id: cups-directories.m4,v 1.12 2004/06/29 03:44:52 mike Exp $".
+dnl End of "$Id: cups-directories.m4,v 1.13 2004/08/11 14:39:26 mike Exp $".
 dnl

diff --git a/config-scripts/cups-manpages.m4 b/config-scripts/cups-manpages.m4
index 8105cd3ac7a4c0ed630492d8321cb4e4c4f7ae68..bff5d0fafb733eb2f9fc6ae3ae443786f06b1b9f 100644 (file)
--- a/config-scripts/cups-manpages.m4
+++ b/config-scripts/cups-manpages.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-manpages.m4,v 1.9 2004/06/29 03:44:52 mike Exp $"
+dnl "$Id: cups-manpages.m4,v 1.10 2004/08/11 14:39:26 mike Exp $"
 dnl
 dnl   Manpage stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -25,13 +25,13 @@ dnl
 dnl Fix "mandir" variable...
 if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then
        case "$uname" in
-               Darwin* | Linux* | *BSD* | AIX*)
-                       # Darwin, MacOS X, Linux, *BSD, and AIX
+               Darwin* | Linux | GNU | *BSD* | AIX*)
+                       # Darwin, MacOS X, Linux, GNU HURD, *BSD, and AIX
                        mandir="/usr/share/man"
                        AMANDIR="/usr/share/man"
                        PMANDIR="/usr/share/man"
                        ;;
-               IRIX*)
+               IRIX)
                        # SGI IRIX
                        mandir="/usr/share/catman/u_man"
                        AMANDIR="/usr/share/catman/a_man"
@@ -100,5 +100,5 @@ AC_SUBST(MAN8EXT)
 AC_SUBST(MAN8DIR)
 
 dnl
-dnl End of "$Id: cups-manpages.m4,v 1.9 2004/06/29 03:44:52 mike Exp $".
+dnl End of "$Id: cups-manpages.m4,v 1.10 2004/08/11 14:39:26 mike Exp $".
 dnl

diff --git a/config-scripts/cups-opsys.m4 b/config-scripts/cups-opsys.m4
index 81f676b15e200e0a26787d7da2ef4a4c06b23b53..171a4f6fdd27940051a3c0786416cf0e535dfe21 100644 (file)
--- a/config-scripts/cups-opsys.m4
+++ b/config-scripts/cups-opsys.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-opsys.m4,v 1.12 2004/06/29 03:44:52 mike Exp $"
+dnl "$Id: cups-opsys.m4,v 1.13 2004/08/11 14:39:26 mike Exp $"
 dnl
 dnl   Operating system stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -25,9 +25,17 @@ dnl
 dnl Get the operating system and version number...
 uname=`uname`
 uversion=`uname -r | sed -e '1,$s/[[^0-9]]//g'`
-if test x$uname = xIRIX64; then
-       uname="IRIX"
-fi
+case "$uname" in
+       GNU* | GNU/*)
+               uname="GNU"
+               ;;
+       IRIX*)
+               uname="IRIX"
+               ;;
+       Linux*)
+               uname="Linux"
+               ;;
+esac
 
 dnl Determine the correct username and group for this OS...
 AC_ARG_WITH(cups-user, [  --with-cups-user        set default user for CUPS],
@@ -87,5 +95,5 @@ AC_DEFINE_UNQUOTED(CUPS_DEFAULT_USER, "$CUPS_USER")
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_GROUP, "$CUPS_GROUP")
 
 dnl
-dnl "$Id: cups-opsys.m4,v 1.12 2004/06/29 03:44:52 mike Exp $"
+dnl "$Id: cups-opsys.m4,v 1.13 2004/08/11 14:39:26 mike Exp $"
 dnl

diff --git a/config-scripts/cups-pam.m4 b/config-scripts/cups-pam.m4
index 9062266d1f78541d986352a7c7a2853e048e0c2f..b8e0f178418f48045b97bbe28f110801840bbc47 100644 (file)
--- a/config-scripts/cups-pam.m4
+++ b/config-scripts/cups-pam.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-pam.m4,v 1.10 2004/06/29 03:44:52 mike Exp $"
+dnl "$Id: cups-pam.m4,v 1.11 2004/08/11 14:39:26 mike Exp $"
 dnl
 dnl   PAM stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -65,7 +65,7 @@ if test x$enable_pam != xno; then
                        # Darwin, MacOS X
                        PAMFILE="pam.darwin"
                        ;;
-               IRIX*)
+               IRIX)
                        # SGI IRIX
                        PAMFILE="pam.irix"
                        ;;
@@ -90,5 +90,5 @@ AC_SUBST(PAMLIBS)
 AC_SUBST(PAMMOD)
 
 dnl
-dnl End of "$Id: cups-pam.m4,v 1.10 2004/06/29 03:44:52 mike Exp $".
+dnl End of "$Id: cups-pam.m4,v 1.11 2004/08/11 14:39:26 mike Exp $".
 dnl

diff --git a/config-scripts/cups-sharedlibs.m4 b/config-scripts/cups-sharedlibs.m4
index b94f2d9c14f65d0901f2a59f7e3d1cb089b942ca..c5201465abaa0f41c46ba26e4c32679a65b38e32 100644 (file)
--- a/config-scripts/cups-sharedlibs.m4
+++ b/config-scripts/cups-sharedlibs.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-sharedlibs.m4,v 1.24 2004/06/29 03:44:52 mike Exp $"
+dnl "$Id: cups-sharedlibs.m4,v 1.25 2004/08/11 14:39:26 mike Exp $"
 dnl
 dnl   Shared library support for the Common UNIX Printing System (CUPS).
 dnl
@@ -41,13 +41,13 @@ if test x$enable_shared != xno; then
                        DSO="ld"
                        DSOFLAGS="$DSOFLAGS -b -z +h \$@"
                        ;;
-               IRIX*)
+               IRIX)
                        LIBCUPS="libcups.so.2"
                        LIBCUPSIMAGE="libcupsimage.so.2"
                        DSO="\$(CC)"
                        DSOFLAGS="$DSOFLAGS -Wl,-rpath,\$(libdir),-set_version,sgi2.5,-soname,\$@ -shared \$(OPTIM)"
                        ;;
-               OSF1* | Linux* | *BSD*)
+               OSF1* | Linux | GNU | *BSD*)
                        LIBCUPS="libcups.so.2"
                        LIBCUPSIMAGE="libcupsimage.so.2"
                        DSO="\$(CC)"
@@ -135,8 +135,8 @@ if test "$DSO" != ":"; then
                         LDFLAGS="$LDFLAGS -Wl,-R$libdir"
                         EXPORT_LDFLAGS="-Wl,-R$libdir"
                         ;;
-                Linux*)
-                        # Linux
+                Linux | GNU)
+                        # Linux and HURD
                        DSOFLAGS="-Wl,-rpath,$libdir $DSOFLAGS"
                         LDFLAGS="$LDFLAGS -Wl,-rpath,$libdir"
                         EXPORT_LDFLAGS="-Wl,-rpath,$libdir"
@@ -152,5 +152,5 @@ AC_SUBST(IMGLIBS)
 AC_SUBST(EXPORT_LDFLAGS)
 
 dnl
-dnl End of "$Id: cups-sharedlibs.m4,v 1.24 2004/06/29 03:44:52 mike Exp $".
+dnl End of "$Id: cups-sharedlibs.m4,v 1.25 2004/08/11 14:39:26 mike Exp $".
 dnl