* fixed --enable-imlib2 wasnt implying --enable-xrender

* fixed #2, missing includes in Xrender check

--HG--
extra : convert_revision : svn%3Aeebe1cee-a9af-4fe4-bd26-ad572b19c5ab/trunk%4050
This commit is contained in:
mathias 2006-09-18 19:54:15 +00:00
parent a29e69cc08
commit 8bfd77fa13
2 changed files with 26 additions and 1 deletions

View file

@ -1,5 +1,9 @@
Version 1.0
----------------------------------------------------------------------
2006-09-18:
* fixed #2, missing includes in Xrender check
* fixed --enable-imlib2 wasnt implying --enable-xrender
2006-09-15:
+ minor tunes to src/Makefile
* fixed some bashisms in configure to make it work on fbsd

23
configure vendored
View file

@ -34,6 +34,22 @@ check_docs() {
fi
}
check_tools() {
msg_chkfor "gcc"
if which $CC 1> /dev/null 2>&3
then
echo "ok."
echo "---------------------------------" 1>&3
$CC -v 1>&3 2>&3
echo "---------------------------------" 1>&3
else
echo "no."
echo "error, no compiler found"
exit 1
fi
}
check_imlib2() {
msg_chkfor "imlib2-config"
@ -41,6 +57,7 @@ check_imlib2() {
then
echo "ok."
cat << EOF > tmp.c
#include <X11/Xlib.h>
#include <Imlib2.h>
int main() {
Imlib_Context ctx = NULL;
@ -294,7 +311,10 @@ EOF
--with-xpm|--enable-xpm) CHECK_XPM=1;;
--without-xpm|--disable-xpm) CHECK_XPM=0;;
--with-imlib2|--enable-imlib2) CHECK_IMLIB2=1;;
--with-imlib2|--enable-imlib2)
CHECK_IMLIB2=1
CHECK_XRENDER=1
;;
--without-imlib2|--disable-imlib2) CHECK_IMLIB2=0;;
--with-pam|--enable-pam) CHECK_PAM=1;;
@ -349,6 +369,7 @@ echo "#_______________________" >&4
echo "" >&4
check_docs
check_tools
check_xlib
check_xlogo16
[ "$CHECK_XPM" -eq 1 ] && check_xpm