# --- T2-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # T2 SDE: package/.../fbv/cc.patch # Copyright (C) 2007 The T2 SDE Project # # More information can be found in the files COPYING and README. # # This patch file is dual-licensed. It is available under the license the # patched project is licensed under, as long as it is an OpenSource license # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms # of the GNU General Public License as published by the Free Software # Foundation; either version 2 of the License, or (at your option) any later # version. # --- T2-COPYRIGHT-NOTE-END --- Imported from Atmel. - Rene Rebe diff -ur fbv-1.0b/configure fbv-1.0b-avr32/configure --- fbv-1.0b/configure 2004-09-07 13:29:27.000000000 +0200 +++ fbv-1.0b-avr32/configure 2006-05-04 11:10:06.000000000 +0200 @@ -21,6 +21,7 @@ unset png unset bmp unset dfb +unset CC help(){ cat << EOF >&2 @@ -33,6 +34,7 @@ General: --help print this message --libs=LIBS additional libraries required (try -lX11 for ungif, -lz for PNG) + --cc=CC specify compiler to use Directory and file names: --prefix=PREFIX install files in PREFIX [/usr/local] @@ -53,7 +55,7 @@ --long help,\ prefix:,srcdir:,bindir:,\ infodir:,mandir:,\ -without-libungif,without-libjpeg,without-libpng,without-bmp,libs: \ +without-libungif,without-libjpeg,without-libpng,without-bmp,libs:,cc: \ -n "$BASENAME" -- "$@") if [ $? != 0 ] ; then help ; exit 1 ; fi @@ -65,6 +67,7 @@ case "$1" in -h|--help) help ; exit 0 ;; --libs) libs="$2"; shift 2 ;; + --cc) CC="$2"; shift 2 ;; --prefix) prefix="$2" ; shift 2 ;; --srcdir) srcdir="$2" ; shift 2 ;; --bindir) bindir="$2" ; shift 2 ;; @@ -80,6 +83,7 @@ esac done +[ -z "$CC" ] && CC=cc [ -z "$prefix" ] && prefix="/usr/local" [ -z "$bindir" ] && bindir="${prefix}/bin" [ -z "$mandir" ] && mandir="${prefix}/man" @@ -106,12 +110,12 @@ ungif="no" echo "libungif check" >>./config.log echo " 1st:" >>./config.log -cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs +$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs if [ -e \$\$~test ]; then libs="-lungif $libs" ; ungif="yes" else echo " 2nd: -lX11 -L$xdir/lib" >>./config.log - cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs + $CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs if [ -e \$\$~test ]; then libs="-lungif -lX11 -L$xdir/lib $libs" ; ungif="yes" fi @@ -124,7 +128,7 @@ echo -n "checking for libjpeg presence... " if [ "$jpeg" != "disabled" ]; then jpeg="no" -cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg $libs +$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg $libs if [ -e \$\$~test ]; then libs="-ljpeg $libs" ; jpeg="yes" fi @@ -135,7 +139,7 @@ echo -n "checking for libpng presence... " if [ "$png" != "disabled" ]; then png="no" -cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng $libs +$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng $libs if [ -e \$\$~test ]; then libs="-lpng $libs" ; png="yes" fi