104 lines
2.3 KiB
Text
104 lines
2.3 KiB
Text
$NetBSD: patch-aa,v 1.3 2004/07/10 14:07:20 grant Exp $
|
|
|
|
--- configure.orig 2002-06-23 15:13:01.000000000 +1000
|
|
+++ configure
|
|
@@ -2,62 +2,7 @@
|
|
|
|
PROGNAME=fspanel
|
|
|
|
-echo -n "checking for X11 path... "
|
|
-if test "`uname`" = "SunOS"; then
|
|
- X11_PATH="/usr/X11"
|
|
- LDFLAGS="$LDFLAGS -L/usr/X/lib"
|
|
- CFLAGS="$CFLAGS I/usr/include/X11"
|
|
-else
|
|
- X11_PATH="/usr/X11R6"
|
|
-fi
|
|
-if test -e "$X11_PATH"; then
|
|
- echo $X11_PATH
|
|
-else
|
|
- echo failed.
|
|
- echo
|
|
- echo I can\'t find $X11_PATH :\(
|
|
- exit 1
|
|
-fi
|
|
-
|
|
-CFLAGS="$CFLAGS -I$X11_PATH/include"
|
|
-LDFLAGS="$LDFLAGS -L$X11_PATH/lib -lX11"
|
|
-
|
|
-if test "_$CC" = "_"; then
|
|
- CC="cc"
|
|
-fi
|
|
-
|
|
-echo -n "checking for X11/Xlib.h... "
|
|
-if test -e "$X11_PATH/include/X11/Xlib.h"; then
|
|
- echo yes
|
|
-else
|
|
- echo no
|
|
- echo
|
|
- echo Cannot find Xlib header\, aborting.
|
|
- echo You might need to install XFree86-devel.
|
|
- 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
|
|
-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
|
|
-fi
|
|
+LDFLAGS="$LDFLAGS -lX11"
|
|
|
|
echo -n "checking for Linux... "
|
|
if test "`uname`" = "Linux"; then
|
|
@@ -67,26 +12,22 @@ else
|
|
echo no
|
|
fi
|
|
|
|
+echo -n "checking freetype2 flags... "
|
|
+FSCFLAGS=`freetype-config --cflags`
|
|
+echo "${FSCFLAGS}"
|
|
+
|
|
echo -n "creating Makefile... "
|
|
|
|
echo CC="$CC" > Makefile
|
|
-echo CFLAGS="$CFLAGS" >> Makefile
|
|
+echo CFLAGS="${FSCFLAGS} $CFLAGS" >> Makefile
|
|
echo LDFLAGS="$LDFLAGS" >> Makefile
|
|
echo PROGNAME="$PROGNAME" >> Makefile
|
|
+echo LIBS="-lXpm -lXft" >> Makefile
|
|
+echo >> Makefile
|
|
+echo all: $\(PROGNAME\) >> 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 done
|
|
-echo
|
|
-echo AntiAliased XFT text .... : $xft
|
|
-echo LibXpm default icon ..... : $xpm
|
|
-echo
|
|
-echo All done. Now type: make
|
|
-echo
|