Load cups into easysw/current.

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

diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4
index e2e0585e4f1364c36acbd088b7c2d54ea29151be..e0426aa5b39535d1d37d6ec459e65df55ead8659 100644 (file)
--- a/config-scripts/cups-compiler.m4
+++ b/config-scripts/cups-compiler.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-compiler.m4 6447 2007-04-10 18:02:00Z mike $"
+dnl "$Id: cups-compiler.m4 6562 2007-06-18 21:51:10Z mike $"
 dnl
 dnl   Compiler stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -39,11 +39,20 @@ AC_ARG_WITH(archflags, [  --with-archflags="flags"
 
 if test -z "$with_archflags"; then
        ARCHFLAGS=""
+       LDARCHFLAGS=""
 else
        ARCHFLAGS="$with_archflags"
+       if test "$uname" = Darwin; then
+               # Only link 32-bit programs - 64-bit is for the shared
+               # libraries...
+               LDARCHFLAGS="`echo $ARCHFLAGS | sed -e '1,$s/-arch x86_64//' -e '1,$s/-arch ppc64//'`"
+       else
+               LDARCHFLAGS="$ARCHFLAGS"
+       fi
 fi
 
 AC_SUBST(ARCHFLAGS)
+AC_SUBST(LDARCHFLAGS)
 
 dnl Setup support for separate 32/64-bit library generation...
 AC_ARG_WITH(arch32flags, [  --with-arch32flags="flags"
@@ -449,5 +458,5 @@ case $uname in
 esac
 
 dnl
-dnl End of "$Id: cups-compiler.m4 6447 2007-04-10 18:02:00Z mike $".
+dnl End of "$Id: cups-compiler.m4 6562 2007-06-18 21:51:10Z mike $".
 dnl