Source: Christian Ruppert <spooky85@gmail.com>
	and Santiago M. Mola <coldwind@gentoo.org>
Upstream: yes
Reason: Fix --as-needed (Gentoo bug #210624), X11 path,
	don't strip binary, use pkg-config for Xft, and
	avoid automagic deps on Xpm and Xft.

--- a/configure	2008-12-07 13:15:16.000000000 +0100
+++ b/configure	2008-12-07 13:46:28.000000000 +0100
@@ -8,7 +8,7 @@
 	LDFLAGS="$LDFLAGS -L/usr/X/lib"
 	CFLAGS="$CFLAGS I/usr/include/X11"
 else
-	X11_PATH="/usr/X11R6"
+	X11_PATH="/usr"
 fi
 if test -e "$X11_PATH"; then
 	echo $X11_PATH
@@ -20,7 +20,8 @@
 fi
 
 CFLAGS="$CFLAGS -I$X11_PATH/include"
-LDFLAGS="$LDFLAGS -L$X11_PATH/lib -lX11"
+LDFLAGS="$LDFLAGS -L$X11_PATH/lib"
+LIBS="-lX11"
 
 if test "_$CC" = "_"; then
 	CC="cc"
@@ -37,26 +38,44 @@
 	exit 1
 fi
 
-echo -n "checking for X11/xpm.h... "
-xpm=no
-if test -e "$X11_PATH/include/X11/xpm.h"; then
-	echo yes
-	LDFLAGS="$LDFLAGS -lXpm"
-	CFLAGS="$CFLAGS -DHAVE_XPM"
-	xpm=yes
+if test "x$USE_XPM" = "xno"; then
+	xpm=no
 else
-	echo no
-fi
-
-echo -n "checking for X11/Xft/Xft.h... "
-xft=no
-if test -e "$X11_PATH/include/X11/Xft/Xft.h"; then
-	echo yes
-	LDFLAGS="$LDFLAGS -lXft"
-	CFLAGS="$CFLAGS -DXFT"
-	xft=yes
-else
-	echo no
+	echo -n "checking for X11/xpm.h... "
+	xpm=no
+	if test -e "$X11_PATH/include/X11/xpm.h"; then
+		echo yes
+		LIBS="${LIBS} -lXpm"
+		CFLAGS="$CFLAGS -DHAVE_XPM"
+		xpm=yes
+	else
+		echo no
+		if test "x$USE_XPM" = "xyes"; then
+			echo
+			echo Cannot find xpm header\, aborting.
+			exit 1
+		fi
+	fi
+fi
+
+if test "x$USE_XFT" = "xno"; then
+	xft=no
+else
+	echo -n "checking for X11/Xft/Xft.h... "
+	xft=no
+	if pkg-config xft; then
+		echo yes
+		LIBS="${LIBS} `pkg-config --libs xft`"
+		CFLAGS="$CFLAGS -DXFT `pkg-config --cflags xft`"
+		xft=yes
+	else
+		echo no
+		if test "x$USE_XFT" = "xyes"; then
+			echo
+			echo Cannot find xft header\, aborting.
+			exit 1
+		fi
+	fi
 fi
 
 echo -n "checking for Linux... "
@@ -72,16 +91,15 @@
 echo CC="$CC" > Makefile
 echo CFLAGS="$CFLAGS" >> Makefile
 echo LDFLAGS="$LDFLAGS" >> Makefile
+echo LIBS="${LIBS}" >> Makefile
 echo PROGNAME="$PROGNAME" >> Makefile
+echo BINDIR="${BINDIR}" >> Makefile
 echo >> Makefile
 echo $\(PROGNAME\): Makefile fspanel.c fspanel.h icon.xpm >> Makefile
-echo \	$\(CC\) $\(CFLAGS\) $\(LDFLAGS\) fspanel.c -o $\(PROGNAME\) >> Makefile
-echo \	@ls -l $\(PROGNAME\) >> Makefile
-echo \	strip $\(PROGNAME\) >> Makefile
-echo \	@ls -l $\(PROGNAME\) >> Makefile
+echo \	$\(CC\) $\(CFLAGS\) $\(LDFLAGS\) fspanel.c -o $\(PROGNAME\) $\(LIBS\) >> Makefile
 echo >> Makefile
 echo install: >> Makefile
-echo \	install $\(PROGNAME\) /usr/local/bin >> Makefile
+echo \	install -D $\(PROGNAME\) $\(BINDIR\)/$\(PROGNAME\) >> Makefile
 
 echo done
 echo