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

(-)a/configure (-26 / +44 lines)
Lines 8-14 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 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 37-62 Link Here
37
	exit 1
38
	exit 1
38
fi
39
fi
39
40
40
echo -n "checking for X11/xpm.h... "
41
if test "x$USE_XPM" = "xno"; then
41
xpm=no
42
	xpm=no
42
if test -e "$X11_PATH/include/X11/xpm.h"; then
43
	echo yes
44
	LDFLAGS="$LDFLAGS -lXpm"
45
	CFLAGS="$CFLAGS -DHAVE_XPM"
46
	xpm=yes
47
else
43
else
48
	echo no
44
	echo -n "checking for X11/xpm.h... "
49
fi
45
	xpm=no
50
46
	if test -e "$X11_PATH/include/X11/xpm.h"; then
51
echo -n "checking for X11/Xft/Xft.h... "
47
		echo yes
52
xft=no
48
		LIBS="${LIBS} -lXpm"
53
if test -e "$X11_PATH/include/X11/Xft/Xft.h"; then
49
		CFLAGS="$CFLAGS -DHAVE_XPM"
54
	echo yes
50
		xpm=yes
55
	LDFLAGS="$LDFLAGS -lXft"
51
	else
56
	CFLAGS="$CFLAGS -DXFT"
52
		echo no
57
	xft=yes
53
		if test "x$USE_XPM" = "xyes"; then
58
else
54
			echo
59
	echo no
55
			echo Cannot find xpm header\, aborting.
56
			exit 1
57
		fi
58
	fi
59
fi
60
61
if test "x$USE_XFT" = "xno"; then
62
	xft=no
63
else
64
	echo -n "checking for X11/Xft/Xft.h... "
65
	xft=no
66
	if pkg-config xft; then
67
		echo yes
68
		LIBS="${LIBS} `pkg-config --libs xft`"
69
		CFLAGS="$CFLAGS -DXFT `pkg-config --cflags xft`"
70
		xft=yes
71
	else
72
		echo no
73
		if test "x$USE_XFT" = "xyes"; then
74
			echo
75
			echo Cannot find xft header\, aborting.
76
			exit 1
77
		fi
78
	fi
60
fi
79
fi
61
80
62
echo -n "checking for Linux... "
81
echo -n "checking for Linux... "
Lines 72-87 Link Here
72
echo CC="$CC" > Makefile
91
echo CC="$CC" > Makefile
73
echo CFLAGS="$CFLAGS" >> Makefile
92
echo CFLAGS="$CFLAGS" >> Makefile
74
echo LDFLAGS="$LDFLAGS" >> Makefile
93
echo LDFLAGS="$LDFLAGS" >> Makefile
94
echo LIBS="${LIBS}" >> Makefile
75
echo PROGNAME="$PROGNAME" >> Makefile
95
echo PROGNAME="$PROGNAME" >> Makefile
96
echo BINDIR="${BINDIR}" >> Makefile
76
echo >> Makefile
97
echo >> Makefile
77
echo $\(PROGNAME\): Makefile fspanel.c fspanel.h icon.xpm >> Makefile
98
echo $\(PROGNAME\): Makefile fspanel.c fspanel.h icon.xpm >> Makefile
78
echo \	$\(CC\) $\(CFLAGS\) $\(LDFLAGS\) fspanel.c -o $\(PROGNAME\) >> Makefile
99
echo \	$\(CC\) $\(CFLAGS\) $\(LDFLAGS\) fspanel.c -o $\(PROGNAME\) $\(LIBS\) >> Makefile
79
echo \	@ls -l $\(PROGNAME\) >> Makefile
80
echo \	strip $\(PROGNAME\) >> Makefile
81
echo \	@ls -l $\(PROGNAME\) >> Makefile
82
echo >> Makefile
100
echo >> Makefile
83
echo install: >> Makefile
101
echo install: >> Makefile
84
echo \	install $\(PROGNAME\) /usr/local/bin >> Makefile
102
echo \	install -D $\(PROGNAME\) $\(BINDIR\)/$\(PROGNAME\) >> Makefile
85
103
86
echo done
104
echo done
87
echo
105
echo

Return to bug 210624