godzil/wmfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BuildSystem: Add xft support for old build system fixes #139

Browse Source
This commit is contained in:
Philippe Pepiot
2011-08-01 13:52:40 +02:00
parent 84d30e25e2
commit 8958dbfe70
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@@ -4,6 +4,7 @@ LIBS="x11 xft freetype2"
USE_XINERAMA="xinerama" USE_XINERAMA="xinerama"
USE_XRANDR="xrandr" USE_XRANDR="xrandr"
USE_IMLIB2="imlib2" USE_IMLIB2="imlib2"
USE_XFT="xft"
OS=`uname -s` OS=`uname -s`
PREFIX=/usr/local PREFIX=/usr/local
MANPREFIX="$PREFIX/man" MANPREFIX="$PREFIX/man"
@@ -17,6 +18,8 @@ while true; do
USE_XRANDR=""; shift;; USE_XRANDR=""; shift;;
--without-imlib2) --without-imlib2)
USE_IMLIB2=""; shift;; USE_IMLIB2=""; shift;;
--without-xft)
USE_XFT=""; shift;;
--prefix) --prefix)
[ -z "$2" ] && echo "Missing argument" && exit 1 [ -z "$2" ] && echo "Missing argument" && exit 1
PREFIX=$2; shift 2;; PREFIX=$2; shift 2;;
@@ -31,6 +34,7 @@ while true; do
--without-imlib2 : compile without imlib2 support --without-imlib2 : compile without imlib2 support
--without-xrandr : compile without xrandr support --without-xrandr : compile without xrandr support
--without-xinerama : compile without xinerama support --without-xinerama : compile without xinerama support
--without-xft : compile without xft support
--prefix DIRECTORY : install binary with specified prefix (default $PREFIX) --prefix DIRECTORY : install binary with specified prefix (default $PREFIX)
--xdg-config-dir DIRECTORY : install configuration to specified directory (default $XDG_CONFIG_DIR) --xdg-config-dir DIRECTORY : install configuration to specified directory (default $XDG_CONFIG_DIR)
--man-prefix DIRECTORY : install man page to specified prefix (default $MANPREFIX)" --man-prefix DIRECTORY : install man page to specified prefix (default $MANPREFIX)"
@@ -39,7 +43,7 @@ while true; do
esac esac
done done
LIBS="$LIBS $USE_XINERAMA $USE_XRANDR $USE_IMLIB2" LIBS="$LIBS $USE_XINERAMA $USE_XRANDR $USE_IMLIB2 $USE_XFT"
which pkg-config >/dev/null 2>&1 which pkg-config >/dev/null 2>&1
@@ -68,16 +72,18 @@ else
exit 1;; exit 1;;
esac esac
LDFLAGS="$LDFLAGS -lX11 -lXft -lfreetype" LDFLAGS="$LDFLAGS -lX11 -lfreetype"
[ -n "$USE_XINERAMA" ] && LDFLAGS="$LDFLAGS -lXinerama" [ -n "$USE_XINERAMA" ] && LDFLAGS="$LDFLAGS -lXinerama"
[ -n "$USE_XRANDR" ] && LDFLAGS="$LDFLAGS -lXrandr" [ -n "$USE_XRANDR" ] && LDFLAGS="$LDFLAGS -lXrandr"
[ -n "$USE_IMLIB2" ] && LDFLAGS="$LDFLAGS -lImlib2" [ -n "$USE_IMLIB2" ] && LDFLAGS="$LDFLAGS -lImlib2"
[ -n "$USE_XFT" ] && LDFLAGS="$LDFLAGS -lXft"
fi fi
[ -n "$USE_XINERAMA" ] && CFLAGS="$CFLAGS -DHAVE_XINERAMA" [ -n "$USE_XINERAMA" ] && CFLAGS="$CFLAGS -DHAVE_XINERAMA"
[ -n "$USE_XRANDR" ] && CFLAGS="$CFLAGS -DHAVE_XRANDR" [ -n "$USE_XRANDR" ] && CFLAGS="$CFLAGS -DHAVE_XRANDR"
[ -n "$USE_IMLIB2" ] && CFLAGS="$CFLAGS -DHAVE_IMLIB" [ -n "$USE_IMLIB2" ] && CFLAGS="$CFLAGS -DHAVE_IMLIB"
[ -n "$USE_XFT" ] && CFLAGS="$CFLAGS -DHAVE_XFT"
LDFLAGS="$LDFLAGS -lpthread" LDFLAGS="$LDFLAGS -lpthread"