Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 210624 | Differences between
and this patch

Collapse All | Expand All

(-)configure.old (-9 / +10 lines)
Lines 8-14 if test "`uname`" = "SunOS"; then Link Here
8
	LDFLAGS="$LDFLAGS -L/usr/X/lib"
8
	LDFLAGS="$LDFLAGS -L/usr/X/lib"
9
	CFLAGS="$CFLAGS I/usr/include/X11"
9
	CFLAGS="$CFLAGS I/usr/include/X11"
10
else
10
else
11
	X11_PATH="/usr/X11R6"
11
	X11_PATH="/usr"
12
fi
12
fi
13
if test -e "$X11_PATH"; then
13
if test -e "$X11_PATH"; then
14
	echo $X11_PATH
14
	echo $X11_PATH
Lines 20-26 else Link Here
20
fi
20
fi
21
21
22
CFLAGS="$CFLAGS -I$X11_PATH/include"
22
CFLAGS="$CFLAGS -I$X11_PATH/include"
23
LDFLAGS="$LDFLAGS -L$X11_PATH/lib -lX11"
23
LDFLAGS="$LDFLAGS -L$X11_PATH/lib"
24
LIBS="-lX11"
24
25
25
if test "_$CC" = "_"; then
26
if test "_$CC" = "_"; then
26
	CC="cc"
27
	CC="cc"
Lines 41-47 echo -n "checking for X11/xpm.h... " Link Here
41
xpm=no
42
xpm=no
42
if test -e "$X11_PATH/include/X11/xpm.h"; then
43
if test -e "$X11_PATH/include/X11/xpm.h"; then
43
	echo yes
44
	echo yes
44
	LDFLAGS="$LDFLAGS -lXpm"
45
	LIBS="${LIBS} -lXpm"
45
	CFLAGS="$CFLAGS -DHAVE_XPM"
46
	CFLAGS="$CFLAGS -DHAVE_XPM"
46
	xpm=yes
47
	xpm=yes
47
else
48
else
Lines 52-59 echo -n "checking for X11/Xft/Xft.h... " Link Here
52
xft=no
53
xft=no
53
if test -e "$X11_PATH/include/X11/Xft/Xft.h"; then
54
if test -e "$X11_PATH/include/X11/Xft/Xft.h"; then
54
	echo yes
55
	echo yes
55
	LDFLAGS="$LDFLAGS -lXft"
56
	LIBS="${LIBS} -lXft"
56
	CFLAGS="$CFLAGS -DXFT"
57
	CFLAGS="$CFLAGS -DXFT -I/usr/include/freetype2"
57
	xft=yes
58
	xft=yes
58
else
59
else
59
	echo no
60
	echo no
Lines 72-87 echo -n "creating Makefile... " Link Here
72
echo CC="$CC" > Makefile
73
echo CC="$CC" > Makefile
73
echo CFLAGS="$CFLAGS" >> Makefile
74
echo CFLAGS="$CFLAGS" >> Makefile
74
echo LDFLAGS="$LDFLAGS" >> Makefile
75
echo LDFLAGS="$LDFLAGS" >> Makefile
76
echo LIBS="${LIBS}" >> Makefile
75
echo PROGNAME="$PROGNAME" >> Makefile
77
echo PROGNAME="$PROGNAME" >> Makefile
78
echo BINDIR="${BINDIR}" >> Makefile
76
echo >> Makefile
79
echo >> Makefile
77
echo $\(PROGNAME\): Makefile fspanel.c fspanel.h icon.xpm >> Makefile
80
echo $\(PROGNAME\): Makefile fspanel.c fspanel.h icon.xpm >> Makefile
78
echo \	$\(CC\) $\(CFLAGS\) $\(LDFLAGS\) fspanel.c -o $\(PROGNAME\) >> Makefile
81
echo \	$\(CC\) $\(CFLAGS\) $\(LDFLAGS\) fspanel.c -o $\(PROGNAME\) $\(LIBS\) >> Makefile
79
echo \	@ls -l $\(PROGNAME\) >> Makefile
80
echo \	strip $\(PROGNAME\) >> Makefile
82
echo \	strip $\(PROGNAME\) >> Makefile
81
echo \	@ls -l $\(PROGNAME\) >> Makefile
82
echo >> Makefile
83
echo >> Makefile
83
echo install: >> Makefile
84
echo install: >> Makefile
84
echo \	install $\(PROGNAME\) /usr/local/bin >> Makefile
85
echo \	install -D $\(PROGNAME\) $\(BINDIR\)/$\(PROGNAME\) >> Makefile
85
86
86
echo done
87
echo done
87
echo
88
echo

Return to bug 210624