storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* --with-imagelib request on [w3m-dev 03981]

Browse Source 
from Mamoru KOMACHI <usata@sodan.ecc.u-tokyo.ac.jp>
* acinclude.m4 (AC_W3M_IMAGE): add --with-imagelib
From: Fumitoshi UKAI  <ukai@debian.or.jp>
This commit is contained in:
Fumitoshi UKAI
2003-10-05 16:59:37 +00:00
parent 30d3c1b37a
commit 6fa7555a9f
4 changed files with 145 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,9 @@
2003-10-06 Fumitoshi UKAI <ukai@debian.or.jp>
* --with-imagelib request on [w3m-dev 03981]
from Mamoru KOMACHI <usata@sodan.ecc.u-tokyo.ac.jp>
* acinclude.m4 (AC_W3M_IMAGE): add --with-imagelib
2003-10-06 Fumitoshi UKAI <ukai@debian.or.jp> 2003-10-06 Fumitoshi UKAI <ukai@debian.or.jp>
* fix problem reported on [w3m-dev 03981] * fix problem reported on [w3m-dev 03981]
@@ -8138,4 +8144,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1 * release-0-2-1
* import w3m-0.2.1 * import w3m-0.2.1
$Id: ChangeLog,v 1.879 2003/10/05 16:24:45 ukai Exp $ $Id: ChangeLog,v 1.880 2003/10/05 16:59:37 ukai Exp $

57
acinclude.m4
View File

@@ -614,31 +614,62 @@ AC_DEFUN([AC_W3M_IMAGE],
IFS="$save_ifs" IFS="$save_ifs"
enable_image=yes enable_image=yes
AC_DEFINE(USE_IMAGE) AC_DEFINE(USE_IMAGE)
if test x"$IMLIB_CONFIG" = x; then AC_MSG_CHECKING(image library)
IMLIB_CONFIG=imlib-config AC_ARG_WITH(imagelib,
fi [ --with-imagelib=IMAGELIBS image library
if test x"$IMLIB2_CONFIG" = x; then IMAGELIBS may be space separeted list of:
IMLIB2_CONFIG=imlib2-config gdk-pixbuf imlib imlib2],,
fi
if test x"$GDKPIXBUF_CONFIG" = x; then [with_imagelib="yes"])
GDKPIXBUF_CONFIG=gdk-pixbuf-config if test x"$with_imagelib" = xyes; then
with_imagelib="gdk-pixbuf imlib imlib2"
fi fi
AC_MSG_RESULT($with_imagelib)
with_imlib=no
with_imlib2=no
with_gdkpixbuf=no
for imagelib in $with_imagelib
do
case "$imagelib" in
imlib)
with_imlib="yes"
if test x"$IMLIB_CONFIG" = x; then
IMLIB_CONFIG=imlib-config
fi;;
imlib2)
with_imlib2="yes"
if test x"$IMLIB2_CONFIG" = x; then
IMLIB2_CONFIG=imlib2-config
fi;;
gdk-pixbuf)
with_gdkpixbuf="yes"
if test x"$GDKPIXBUF_CONFIG" = x; then
GDKPIXBUF_CONFIG=gdk-pixbuf-config
fi;;
esac
done
IMGTARGETS="" IMGTARGETS=""
AC_W3M_CHECK_VER([GdkPixbuf], if test x"$with_gdkpixbuf" = xyes; then
AC_W3M_CHECK_VER([GdkPixbuf],
[`$GDKPIXBUF_CONFIG --version 2>/dev/null`], [`$GDKPIXBUF_CONFIG --version 2>/dev/null`],
0, 16, 0, 0, 16, 0,
[have_gdkpixbuf="yes"], [have_gdkpixbuf="yes"],
[have_gdkpixbuf="no" [have_gdkpixbuf="no"])
AC_W3M_CHECK_VER([Imlib], fi
if test x"$with_imlib" = xyes; then
AC_W3M_CHECK_VER([Imlib],
[`$IMLIB_CONFIG --version 2>/dev/null`], [`$IMLIB_CONFIG --version 2>/dev/null`],
1, 9, 8, 1, 9, 8,
[have_imlib="yes"], [have_imlib="yes"],
[have_imlib="no"]) [have_imlib="no"])
AC_W3M_CHECK_VER([Imlib2], fi
if test x"$with_imlib2" = xyes; then
AC_W3M_CHECK_VER([Imlib2],
[`$IMLIB2_CONFIG --version 2>/dev/null`], [`$IMLIB2_CONFIG --version 2>/dev/null`],
1, 0, 5, 1, 0, 5,
[have_imlib2="yes"], [have_imlib2="yes"],
[have_imlib2="no"])]) [have_imlib2="no"])
fi
if test x"$x11" = xyes; then if test x"$x11" = xyes; then
if test x"$have_gdkpixbuf" = xyes; then if test x"$have_gdkpixbuf" = xyes; then
AC_DEFINE(USE_W3MIMG_X11) AC_DEFINE(USE_W3MIMG_X11)

57
aclocal.m4 vendored
View File

@@ -626,31 +626,62 @@ AC_DEFUN([AC_W3M_IMAGE],
IFS="$save_ifs" IFS="$save_ifs"
enable_image=yes enable_image=yes
AC_DEFINE(USE_IMAGE) AC_DEFINE(USE_IMAGE)
if test x"$IMLIB_CONFIG" = x; then AC_MSG_CHECKING(image library)
IMLIB_CONFIG=imlib-config AC_ARG_WITH(imagelib,
fi [ --with-imagelib=IMAGELIBS image library
if test x"$IMLIB2_CONFIG" = x; then IMAGELIBS may be space separeted list of:
IMLIB2_CONFIG=imlib2-config gdk-pixbuf imlib imlib2],,
fi
if test x"$GDKPIXBUF_CONFIG" = x; then [with_imagelib="yes"])
GDKPIXBUF_CONFIG=gdk-pixbuf-config if test x"$with_imagelib" = xyes; then
with_imagelib="gdk-pixbuf imlib imlib2"
fi fi
AC_MSG_RESULT($with_imagelib)
with_imlib=no
with_imlib2=no
with_gdkpixbuf=no
for imagelib in $with_imagelib
do
case "$imagelib" in
imlib)
with_imlib="yes"
if test x"$IMLIB_CONFIG" = x; then
IMLIB_CONFIG=imlib-config
fi;;
imlib2)
with_imlib2="yes"
if test x"$IMLIB2_CONFIG" = x; then
IMLIB2_CONFIG=imlib2-config
fi;;
gdk-pixbuf)
with_gdkpixbuf="yes"
if test x"$GDKPIXBUF_CONFIG" = x; then
GDKPIXBUF_CONFIG=gdk-pixbuf-config
fi;;
esac
done
IMGTARGETS="" IMGTARGETS=""
AC_W3M_CHECK_VER([GdkPixbuf], if test x"$with_gdkpixbuf" = xyes; then
AC_W3M_CHECK_VER([GdkPixbuf],
[`$GDKPIXBUF_CONFIG --version 2>/dev/null`], [`$GDKPIXBUF_CONFIG --version 2>/dev/null`],
0, 16, 0, 0, 16, 0,
[have_gdkpixbuf="yes"], [have_gdkpixbuf="yes"],
[have_gdkpixbuf="no" [have_gdkpixbuf="no"])
AC_W3M_CHECK_VER([Imlib], fi
if test x"$with_imlib" = xyes; then
AC_W3M_CHECK_VER([Imlib],
[`$IMLIB_CONFIG --version 2>/dev/null`], [`$IMLIB_CONFIG --version 2>/dev/null`],
1, 9, 8, 1, 9, 8,
[have_imlib="yes"], [have_imlib="yes"],
[have_imlib="no"]) [have_imlib="no"])
AC_W3M_CHECK_VER([Imlib2], fi
if test x"$with_imlib2" = xyes; then
AC_W3M_CHECK_VER([Imlib2],
[`$IMLIB2_CONFIG --version 2>/dev/null`], [`$IMLIB2_CONFIG --version 2>/dev/null`],
1, 0, 5, 1, 0, 5,
[have_imlib2="yes"], [have_imlib2="yes"],
[have_imlib2="no"])]) [have_imlib2="no"])
fi
if test x"$x11" = xyes; then if test x"$x11" = xyes; then
if test x"$have_gdkpixbuf" = xyes; then if test x"$have_gdkpixbuf" = xyes; then
AC_DEFINE(USE_W3MIMG_X11) AC_DEFINE(USE_W3MIMG_X11)

100
configure vendored
View File

@@ -886,6 +886,9 @@ Optional Packages:
--without-libiconv-prefix don't search for libiconv in includedir and libdir --without-libiconv-prefix don't search for libiconv in includedir and libdir
--with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
--without-libintl-prefix don't search for libintl in includedir and libdir --without-libintl-prefix don't search for libintl in includedir and libdir
--with-imagelib=IMAGELIBS image library
IMAGELIBS may be space separeted list of:
gdk-pixbuf imlib imlib2
--with-migemo=MIGEMO_COMMAND migemo command --with-migemo=MIGEMO_COMMAND migemo command
--with-editor=EDITOR default editor (/usr/bin/vi) --with-editor=EDITOR default editor (/usr/bin/vi)
--with-mailer=MAILER default mailer (/usr/bin/mail) --with-mailer=MAILER default mailer (/usr/bin/mail)
@@ -4920,17 +4923,47 @@ _ACEOF
#define USE_IMAGE 1 #define USE_IMAGE 1
_ACEOF _ACEOF
if test x"$IMLIB_CONFIG" = x; then echo "$as_me:$LINENO: checking image library" >&5
IMLIB_CONFIG=imlib-config echo $ECHO_N "checking image library... $ECHO_C" >&6
fi
if test x"$IMLIB2_CONFIG" = x; then # Check whether --with-imagelib or --without-imagelib was given.
IMLIB2_CONFIG=imlib2-config if test "${with_imagelib+set}" = set; then
fi withval="$with_imagelib"
if test x"$GDKPIXBUF_CONFIG" = x; then
GDKPIXBUF_CONFIG=gdk-pixbuf-config else
with_imagelib="yes"
fi;
if test x"$with_imagelib" = xyes; then
with_imagelib="gdk-pixbuf imlib imlib2"
fi fi
echo "$as_me:$LINENO: result: $with_imagelib" >&5
echo "${ECHO_T}$with_imagelib" >&6
with_imlib=no
with_imlib2=no
with_gdkpixbuf=no
for imagelib in $with_imagelib
do
case "$imagelib" in
imlib)
with_imlib="yes"
if test x"$IMLIB_CONFIG" = x; then
IMLIB_CONFIG=imlib-config
fi;;
imlib2)
with_imlib2="yes"
if test x"$IMLIB2_CONFIG" = x; then
IMLIB2_CONFIG=imlib2-config
fi;;
gdk-pixbuf)
with_gdkpixbuf="yes"
if test x"$GDKPIXBUF_CONFIG" = x; then
GDKPIXBUF_CONFIG=gdk-pixbuf-config
fi;;
esac
done
IMGTARGETS="" IMGTARGETS=""
version="`$GDKPIXBUF_CONFIG --version 2>/dev/null`" if test x"$with_gdkpixbuf" = xyes; then
version="`$GDKPIXBUF_CONFIG --version 2>/dev/null`"
if test x"$version" != x; then if test x"$version" != x; then
echo "$as_me:$LINENO: checking GdkPixbuf version" >&5 echo "$as_me:$LINENO: checking GdkPixbuf version" >&5
echo $ECHO_N "checking GdkPixbuf version... $ECHO_C" >&6 echo $ECHO_N "checking GdkPixbuf version... $ECHO_C" >&6
@@ -4941,44 +4974,6 @@ echo "${ECHO_T}$version" >&6
{ echo "$as_me:$LINENO: WARNING: GdkPixbuf is too old. Install GdkPixbuf (version >= 0.16.0)" >&5 { echo "$as_me:$LINENO: WARNING: GdkPixbuf is too old. Install GdkPixbuf (version >= 0.16.0)" >&5
echo "$as_me: WARNING: GdkPixbuf is too old. Install GdkPixbuf (version >= 0.16.0)" >&2;} echo "$as_me: WARNING: GdkPixbuf is too old. Install GdkPixbuf (version >= 0.16.0)" >&2;}
have_gdkpixbuf="no" have_gdkpixbuf="no"
version="`$IMLIB_CONFIG --version 2>/dev/null`"
if test x"$version" != x; then
echo "$as_me:$LINENO: checking Imlib version" >&5
echo $ECHO_N "checking Imlib version... $ECHO_C" >&6
echo "$as_me:$LINENO: result: $version" >&5
echo "${ECHO_T}$version" >&6
set -- `echo "$version" | sed 's/[^0-9]/ /g'`
if test "$1" -ne "1" -o "$2" -lt "9" || test "$2" -eq "9" -a "$3" -lt "8"; then
{ echo "$as_me:$LINENO: WARNING: Imlib is too old. Install Imlib (version >= 1.9.8)" >&5
echo "$as_me: WARNING: Imlib is too old. Install Imlib (version >= 1.9.8)" >&2;}
have_imlib="no"
else
have_imlib="yes"
fi
else
{ echo "$as_me:$LINENO: WARNING: Imlib is not installed. Install Imlib (version >= 1.9.8)" >&5
echo "$as_me: WARNING: Imlib is not installed. Install Imlib (version >= 1.9.8)" >&2;}
have_imlib="no"
fi
version="`$IMLIB2_CONFIG --version 2>/dev/null`"
if test x"$version" != x; then
echo "$as_me:$LINENO: checking Imlib2 version" >&5
echo $ECHO_N "checking Imlib2 version... $ECHO_C" >&6
echo "$as_me:$LINENO: result: $version" >&5
echo "${ECHO_T}$version" >&6
set -- `echo "$version" | sed 's/[^0-9]/ /g'`
if test "$1" -ne "1" -o "$2" -lt "0" || test "$2" -eq "0" -a "$3" -lt "5"; then
{ echo "$as_me:$LINENO: WARNING: Imlib2 is too old. Install Imlib2 (version >= 1.0.5)" >&5
echo "$as_me: WARNING: Imlib2 is too old. Install Imlib2 (version >= 1.0.5)" >&2;}
have_imlib2="no"
else
have_imlib2="yes"
fi
else
{ echo "$as_me:$LINENO: WARNING: Imlib2 is not installed. Install Imlib2 (version >= 1.0.5)" >&5
echo "$as_me: WARNING: Imlib2 is not installed. Install Imlib2 (version >= 1.0.5)" >&2;}
have_imlib2="no"
fi
else else
have_gdkpixbuf="yes" have_gdkpixbuf="yes"
fi fi
@@ -4986,7 +4981,10 @@ echo "$as_me: WARNING: Imlib2 is not installed. Install Imlib2 (version >= 1.0.
{ echo "$as_me:$LINENO: WARNING: GdkPixbuf is not installed. Install GdkPixbuf (version >= 0.16.0)" >&5 { echo "$as_me:$LINENO: WARNING: GdkPixbuf is not installed. Install GdkPixbuf (version >= 0.16.0)" >&5
echo "$as_me: WARNING: GdkPixbuf is not installed. Install GdkPixbuf (version >= 0.16.0)" >&2;} echo "$as_me: WARNING: GdkPixbuf is not installed. Install GdkPixbuf (version >= 0.16.0)" >&2;}
have_gdkpixbuf="no" have_gdkpixbuf="no"
version="`$IMLIB_CONFIG --version 2>/dev/null`" fi
fi
if test x"$with_imlib" = xyes; then
version="`$IMLIB_CONFIG --version 2>/dev/null`"
if test x"$version" != x; then if test x"$version" != x; then
echo "$as_me:$LINENO: checking Imlib version" >&5 echo "$as_me:$LINENO: checking Imlib version" >&5
echo $ECHO_N "checking Imlib version... $ECHO_C" >&6 echo $ECHO_N "checking Imlib version... $ECHO_C" >&6
@@ -5005,7 +5003,9 @@ echo "$as_me: WARNING: Imlib is too old. Install Imlib (version >= 1.9.8)" >&2;}
echo "$as_me: WARNING: Imlib is not installed. Install Imlib (version >= 1.9.8)" >&2;} echo "$as_me: WARNING: Imlib is not installed. Install Imlib (version >= 1.9.8)" >&2;}
have_imlib="no" have_imlib="no"
fi fi
version="`$IMLIB2_CONFIG --version 2>/dev/null`" fi
if test x"$with_imlib2" = xyes; then
version="`$IMLIB2_CONFIG --version 2>/dev/null`"
if test x"$version" != x; then if test x"$version" != x; then
echo "$as_me:$LINENO: checking Imlib2 version" >&5 echo "$as_me:$LINENO: checking Imlib2 version" >&5
echo $ECHO_N "checking Imlib2 version... $ECHO_C" >&6 echo $ECHO_N "checking Imlib2 version... $ECHO_C" >&6
@@ -5024,7 +5024,7 @@ echo "$as_me: WARNING: Imlib2 is too old. Install Imlib2 (version >= 1.0.5)" >&2
echo "$as_me: WARNING: Imlib2 is not installed. Install Imlib2 (version >= 1.0.5)" >&2;} echo "$as_me: WARNING: Imlib2 is not installed. Install Imlib2 (version >= 1.0.5)" >&2;}
have_imlib2="no" have_imlib2="no"
fi fi
fi fi
if test x"$x11" = xyes; then if test x"$x11" = xyes; then
if test x"$have_gdkpixbuf" = xyes; then if test x"$have_gdkpixbuf" = xyes; then
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF