Upgrade cups to 1.3.7
[openwrt/svn-archive/archive.git] / net / cups / patches / 150-64bit_host_fix.patch
1 --- cups-1.3.7/cups-config.in 2007-07-11 23:46:42.000000000 +0200
2 +++ cups-1.3.7.new/cups-config.in 2008-07-13 17:17:00.000000000 +0200
3 @@ -53,7 +53,7 @@
4 CFLAGS="$CFLAGS -I$includedir"
5 fi
6
7 - if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then
8 + if test $libdir != /usr/lib -a $libdir != /usr/lib -a $libdir != /usr/lib; then
9 LDFLAGS="$LDFLAGS -L$libdir"
10 fi
11 fi
12 diff -urN cups-1.3.7/config-scripts/cups-3264.m4 cups-1.3.7.new/config-scripts/cups-3264.m4
13 --- cups-1.3.7/config-scripts/cups-3264.m4 2007-07-11 23:46:42.000000000 +0200
14 +++ cups-1.3.7.new/config-scripts/cups-3264.m4 2008-07-13 17:21:36.000000000 +0200
15 @@ -108,7 +108,7 @@
16 LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
17 LIB64DIR="$exec_prefix/lib"
18 if test -d /usr/lib64; then
19 - LIB64DIR="${LIB64DIR}64"
20 + LIB64DIR="${LIB64DIR}"
21 fi
22 UNINSTALL64="uninstall64bit"
23 fi
24 diff -urN cups-1.3.7/config-scripts/cups-directories.m4 cups-1.3.7.new/config-scripts/cups-directories.m4
25 --- cups-1.3.7/config-scripts/cups-directories.m4 2007-09-18 22:39:31.000000000 +0200
26 +++ cups-1.3.7.new/config-scripts/cups-directories.m4 2008-07-13 17:21:51.000000000 +0200
27 @@ -107,7 +107,7 @@
28 ;;
29 Linux*)
30 if test -d /usr/lib64; then
31 - libdir="$exec_prefix/lib64"
32 + libdir="$exec_prefix/lib"
33 fi
34 ;;
35 HP-UX*)
36 --- cups-1.3.7/configure 2008-04-01 23:59:43.000000000 +0200
37 +++ cups-1.3.7.new/configure 2008-07-13 17:20:19.000000000 +0200
38 @@ -9217,7 +9217,7 @@
39 ;;
40 Linux*)
41 if test -d /usr/lib64; then
42 - libdir="$exec_prefix/lib64"
43 + libdir="$exec_prefix/lib"
44 fi
45 ;;
46 HP-UX*)
47 @@ -9761,9 +9761,6 @@
48 LIB32CUPS="32bit/libcups.so.2"
49 LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
50 LIB32DIR="$exec_prefix/lib"
51 - if test -d /usr/lib32; then
52 - LIB32DIR="${LIB32DIR}32"
53 - fi
54 UNINSTALL32="uninstall32bit"
55 fi
56
57 @@ -9773,9 +9770,6 @@
58 LIB64CUPS="64bit/libcups.so.2"
59 LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
60 LIB64DIR="$exec_prefix/lib"
61 - if test -d /usr/lib64; then
62 - LIB64DIR="${LIB64DIR}64"
63 - fi
64 UNINSTALL64="uninstall64bit"
65 fi
66 ;;