Dash:
[t2-trunk.git] / package / graphic / fbv / cc.patch
blob531148f10816147c72ebd79d532924fae2a501bb
1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
3 #
4 # T2 SDE: package/.../fbv/cc.patch
5 # Copyright (C) 2007 The T2 SDE Project
6 #
7 # More information can be found in the files COPYING and README.
8 #
9 # This patch file is dual-licensed. It is available under the license the
10 # patched project is licensed under, as long as it is an OpenSource license
11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
12 # of the GNU General Public License as published by the Free Software
13 # Foundation; either version 2 of the License, or (at your option) any later
14 # version.
15 # --- T2-COPYRIGHT-NOTE-END ---
17 Imported from Atmel.
19 - Rene Rebe <rene@exactcode.de>
21 diff -ur fbv-1.0b/configure fbv-1.0b-avr32/configure
22 --- fbv-1.0b/configure 2004-09-07 13:29:27.000000000 +0200
23 +++ fbv-1.0b-avr32/configure 2006-05-04 11:10:06.000000000 +0200
24 @@ -21,6 +21,7 @@
25 unset png
26 unset bmp
27 unset dfb
28 +unset CC
30 help(){
31 cat << EOF >&2
32 @@ -33,6 +34,7 @@
33 General:
34 --help print this message
35 --libs=LIBS additional libraries required (try -lX11 for ungif, -lz for PNG)
36 + --cc=CC specify compiler to use
38 Directory and file names:
39 --prefix=PREFIX install files in PREFIX [/usr/local]
40 @@ -53,7 +55,7 @@
41 --long help,\
42 prefix:,srcdir:,bindir:,\
43 infodir:,mandir:,\
44 -without-libungif,without-libjpeg,without-libpng,without-bmp,libs: \
45 +without-libungif,without-libjpeg,without-libpng,without-bmp,libs:,cc: \
46 -n "$BASENAME" -- "$@")
48 if [ $? != 0 ] ; then help ; exit 1 ; fi
49 @@ -65,6 +67,7 @@
50 case "$1" in
51 -h|--help) help ; exit 0 ;;
52 --libs) libs="$2"; shift 2 ;;
53 + --cc) CC="$2"; shift 2 ;;
54 --prefix) prefix="$2" ; shift 2 ;;
55 --srcdir) srcdir="$2" ; shift 2 ;;
56 --bindir) bindir="$2" ; shift 2 ;;
57 @@ -80,6 +83,7 @@
58 esac
59 done
61 +[ -z "$CC" ] && CC=cc
62 [ -z "$prefix" ] && prefix="/usr/local"
63 [ -z "$bindir" ] && bindir="${prefix}/bin"
64 [ -z "$mandir" ] && mandir="${prefix}/man"
65 @@ -106,12 +110,12 @@
66 ungif="no"
67 echo "libungif check" >>./config.log
68 echo " 1st:" >>./config.log
69 -cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs
70 +$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs
71 if [ -e \$\$~test ]; then
72 libs="-lungif $libs" ; ungif="yes"
73 else
74 echo " 2nd: -lX11 -L$xdir/lib" >>./config.log
75 - cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs
76 + $CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs
77 if [ -e \$\$~test ]; then
78 libs="-lungif -lX11 -L$xdir/lib $libs" ; ungif="yes"
80 @@ -124,7 +128,7 @@
81 echo -n "checking for libjpeg presence... "
82 if [ "$jpeg" != "disabled" ]; then
83 jpeg="no"
84 -cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg $libs
85 +$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg $libs
86 if [ -e \$\$~test ]; then
87 libs="-ljpeg $libs" ; jpeg="yes"
89 @@ -135,7 +139,7 @@
90 echo -n "checking for libpng presence... "
91 if [ "$png" != "disabled" ]; then
92 png="no"
93 -cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng $libs
94 +$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng $libs
95 if [ -e \$\$~test ]; then
96 libs="-lpng $libs" ; png="yes"