diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-06-04 19:52:43 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-06-04 19:52:43 +0200 |
| commit | 4aaa0516b17cc459b7441bb13b6f2676c3da54e4 (patch) | |
| tree | a99b15406e14a88ee3c53a4f5e51b2edf99c7b5f /package/cups/patches/patch-configure | |
| parent | cf7d637ee9c6034152f9f789c8e65893f0295289 (diff) | |
| parent | 8a2754e0fbdea7497281327f2896be2a1253a107 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/cups/patches/patch-configure')
| -rw-r--r-- | package/cups/patches/patch-configure | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/package/cups/patches/patch-configure b/package/cups/patches/patch-configure index 773a2da96..82550e632 100644 --- a/package/cups/patches/patch-configure +++ b/package/cups/patches/patch-configure @@ -1,7 +1,17 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- cups-1.3.10.orig/configure 2009-04-16 22:02:06.000000000 +0200 -+++ cups-1.3.10/configure 2009-05-09 22:44:29.000000000 +0200 -@@ -9254,7 +9254,7 @@ if test "$libdir" = "\${exec_prefix}/lib ++++ cups-1.3.10/configure 2009-05-31 19:41:18.000000000 +0200 +@@ -7460,9 +7460,6 @@ done + + + case $uname in +- Darwin* | *BSD*) +- ARFLAGS="-rcv" +- ;; + *) + ARFLAGS="crvs" + ;; +@@ -9254,7 +9251,7 @@ if test "$libdir" = "\${exec_prefix}/lib ;; Linux*) if test -d /usr/lib64; then @@ -10,3 +20,15 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ fi ;; HP-UX*) +@@ -9587,11 +9584,6 @@ _ACEOF + + # Server executables... + case "$uname" in +- *BSD* | Darwin*) +- # *BSD and Darwin (MacOS X) +- INSTALL_SYSV="" +- CUPS_SERVERBIN="$exec_prefix/libexec/cups" +- ;; + *) + # All others + INSTALL_SYSV="install-sysv" |