diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/cups/patches/patch-configure | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/cups/patches/patch-configure')
| -rw-r--r-- | package/cups/patches/patch-configure | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/package/cups/patches/patch-configure b/package/cups/patches/patch-configure index 82550e632..f23196c67 100644 --- a/package/cups/patches/patch-configure +++ b/package/cups/patches/patch-configure @@ -1,26 +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-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 +--- cups-1.4.2.orig/configure 2009-11-10 00:04:25.000000000 +0100 ++++ cups-1.4.2/configure 2010-01-07 23:11:46.635118361 +0100 +@@ -9850,8 +9850,8 @@ if test "$libdir" = "\${exec_prefix}/lib + libdir="$exec_prefix/lib32" ;; Linux*) - if test -d /usr/lib64; then +- if test -d /usr/lib64; then - libdir="$exec_prefix/lib64" ++ if test -d /usr/lib; then + libdir="$exec_prefix/lib" fi ;; HP-UX*) -@@ -9587,11 +9584,6 @@ _ACEOF +@@ -10260,11 +10260,6 @@ _ACEOF # Server executables... case "$uname" in |