Attachment #257580 for bug #349128




unset png
unset bmp
unset dfb
unset CC

help(){
cat << EOF >&2

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]

--long help,\
prefix:,srcdir:,bindir:,\
infodir:,mandir:,\
without-libungif,without-libjpeg,without-libpng,without-bmp,libs:,cc: \
-n "$BASENAME" -- "$@")

if [ $? != 0 ] ; then help ; exit 1 ; fi

	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 ;;

	esac
done

[ -z "$CC" ] && CC=cc
[ -z "$prefix" ] && prefix="/usr/local"
[ -z "$bindir" ] && bindir="${prefix}/bin"
[ -z "$mandir" ] && mandir="${prefix}/man"

ungif="no"
echo "libungif check" >>./config.log
echo "  1st:" >>./config.log
$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
	if [ -e \$\$~test ]; then
	libs="-lungif -lX11 -L$xdir/lib $libs" ; ungif="yes"
	fi

echo -n "checking for libjpeg presence... "
if [ "$jpeg" != "disabled" ]; then
jpeg="no"
$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg $libs
if [ -e \$\$~test ]; then
	libs="-ljpeg $libs" ; jpeg="yes"
fi

echo -n "checking for libpng presence... "
if [ "$png" != "disabled" ]; then
png="no"
$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng $libs
if [ -e \$\$~test ]; then
	libs="-lpng $libs" ; png="yes"
fi

Return to bug 349128

Lines 21-26 Link Here

(-)fbv-1.0b/configure (-5 / +9 lines)
21	unset png	21	unset png
22	unset bmp	22	unset bmp
23	unset dfb	23	unset dfb
		24	unset CC
24		25
25	help(){	26	help(){
26	cat << EOF >&2	27	cat << EOF >&2
Lines 33-38 Link Here
33	General:	34	General:
34	--help print this message	35	--help print this message
35	--libs=LIBS additional libraries required (try -lX11 for ungif, -lz for PNG)	36	--libs=LIBS additional libraries required (try -lX11 for ungif, -lz for PNG)
		37	--cc=CC specify compiler to use
36		38
37	Directory and file names:	39	Directory and file names:
38	--prefix=PREFIX install files in PREFIX [/usr/local]	40	--prefix=PREFIX install files in PREFIX [/usr/local]
Lines 53-59 Link Here
53	--long help,\	55	--long help,\
54	prefix:,srcdir:,bindir:,\	56	prefix:,srcdir:,bindir:,\
55	infodir:,mandir:,\	57	infodir:,mandir:,\
56	without-libungif,without-libjpeg,without-libpng,without-bmp,libs: \	58	without-libungif,without-libjpeg,without-libpng,without-bmp,libs:,cc: \
57	-n "$BASENAME" -- "$@")	59	-n "$BASENAME" -- "$@")
58		60
59	if [ $? != 0 ] ; then help ; exit 1 ; fi	61	if [ $? != 0 ] ; then help ; exit 1 ; fi
Lines 65-70 Link Here
65	case "$1" in	67	case "$1" in
66	-h\|--help) help ; exit 0 ;;	68	-h\|--help) help ; exit 0 ;;
67	--libs) libs="$2"; shift 2 ;;	69	--libs) libs="$2"; shift 2 ;;
		70	--cc) CC="$2"; shift 2 ;;
68	--prefix) prefix="$2" ; shift 2 ;;	71	--prefix) prefix="$2" ; shift 2 ;;
69	--srcdir) srcdir="$2" ; shift 2 ;;	72	--srcdir) srcdir="$2" ; shift 2 ;;
70	--bindir) bindir="$2" ; shift 2 ;;	73	--bindir) bindir="$2" ; shift 2 ;;
Lines 80-85 Link Here
80	esac	83	esac
81	done	84	done
82		85
		86	[ -z "$CC" ] && CC=cc
83	[ -z "$prefix" ] && prefix="/usr/local"	87	[ -z "$prefix" ] && prefix="/usr/local"
84	[ -z "$bindir" ] && bindir="${prefix}/bin"	88	[ -z "$bindir" ] && bindir="${prefix}/bin"
85	[ -z "$mandir" ] && mandir="${prefix}/man"	89	[ -z "$mandir" ] && mandir="${prefix}/man"
Lines 106-117 Link Here
106	ungif="no"	110	ungif="no"
107	echo "libungif check" >>./config.log	111	echo "libungif check" >>./config.log
108	echo " 1st:" >>./config.log	112	echo " 1st:" >>./config.log
109	cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs	113	$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs
110	if [ -e \$\$~test ]; then	114	if [ -e \$\$~test ]; then
111	libs="-lungif $libs" ; ungif="yes"	115	libs="-lungif $libs" ; ungif="yes"
112	else	116	else
113	echo " 2nd: -lX11 -L$xdir/lib" >>./config.log	117	echo " 2nd: -lX11 -L$xdir/lib" >>./config.log
114	cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs	118	$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs
115	if [ -e \$\$~test ]; then	119	if [ -e \$\$~test ]; then
116	libs="-lungif -lX11 -L$xdir/lib $libs" ; ungif="yes"	120	libs="-lungif -lX11 -L$xdir/lib $libs" ; ungif="yes"
117	fi	121	fi
Lines 124-130 Link Here
124	echo -n "checking for libjpeg presence... "	128	echo -n "checking for libjpeg presence... "
125	if [ "$jpeg" != "disabled" ]; then	129	if [ "$jpeg" != "disabled" ]; then
126	jpeg="no"	130	jpeg="no"
127	cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg $libs	131	$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg $libs
128	if [ -e \$\$~test ]; then	132	if [ -e \$\$~test ]; then
129	libs="-ljpeg $libs" ; jpeg="yes"	133	libs="-ljpeg $libs" ; jpeg="yes"
130	fi	134	fi
Lines 135-141 Link Here
135	echo -n "checking for libpng presence... "	139	echo -n "checking for libpng presence... "
136	if [ "$png" != "disabled" ]; then	140	if [ "$png" != "disabled" ]; then
137	png="no"	141	png="no"
138	cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng $libs	142	$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng $libs
139	if [ -e \$\$~test ]; then	143	if [ -e \$\$~test ]; then
140	libs="-lpng $libs" ; png="yes"	144	libs="-lpng $libs" ; png="yes"
141	fi	145	fi