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

* scripts/Makefile.in (w3mhelp-funcname.pl): depends ../funcname.tab

Browse Source 
* Makefile.in (IMGOBJS): deleted
	(indep.o): depends on fm.h funcname1.h
	(IMGDISPLAY): depends on w3mimg/w3mimg.a
	(w3mimg/w3mimg.a): renamed from w3mimg
* acinclude.m4 (AC_W3M_IMAGE): modify IMBOBJS
* w3mimg/Makefile.in (AR): added
		(RANLIB): added
		(IMGOBJS): added
		(w3mimg.a): added
From: Fumitoshi UKAI  <ukai@debian.or.jp>

* [w3m-dev 03990] Re: post-m17n merge problem?
* Makefile.in (MAN1): need $(top_srcdir)
		(MAN1_JA): ditto
		(LOBJS): depends on fm.h funcname1.h
		(INFLATE): depends on $(ALIB)
		(libwc/libwc.a): renamed from libwc
		(IMGDISPLAY): depends on $(IMGOBJS) instead of w3mimg
			  depends on $(ALIB)
		(w3mimgdisplay.o): depends on w3mimg/w3mimg.h
* acinclude.m4 (AC_W3M_M17N): WCTARGET is libwc/libwc.a
* configure.in (HELP_DIR): expand ${prefix}
From: qhwt@myrealbox.com
This commit is contained in:
Fumitoshi UKAI
2003-10-10 16:33:13 +00:00
parent caa996c6a1
commit e99561b348
8 changed files with 75 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
acinclude.m4
View File

@@ -160,7 +160,7 @@ if test x"$enable_m17n" = xno; then
document_charset='WC_CES_US_ASCII'
else
AC_DEFINE(USE_M17N)
WCTARGET="libwc"
WCTARGET="libwc/libwc.a"
WCCFLAGS='-I$(srcdir) -I$(srcdir)/..'
wcinclude='-I$(srcdir)/libwc'
wclib="-L./libwc -lwc"
@@ -590,7 +590,7 @@ AC_DEFUN([AC_W3M_IMAGE],
[enable_image="yes"])
AC_MSG_RESULT($enable_image)
if test x"$enable_image" != xno; then
IMGOBJS=w3mimg/w3mimg.o
IMGOBJS=w3mimg.o
if test x"$enable_image" = xyes; then
enable_image=x11
case "`uname -s`" in
@@ -674,21 +674,21 @@ AC_DEFUN([AC_W3M_IMAGE],
if test x"$have_gdkpixbuf" = xyes; then
AC_DEFINE(USE_W3MIMG_X11)
AC_DEFINE(USE_GDKPIXBUF)
IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
IMGOBJS="$IMGOBJS x11/x11_w3mimg.o"
IMGX11CFLAGS="`${GDKPIXBUF_CONFIG} --cflags`"
IMGX11LDFLAGS="`${GDKPIXBUF_CONFIG} --libs` -lgdk_pixbuf_xlib"
IMGTARGETS="x11"
elif test x"$have_imlib" = xyes; then
AC_DEFINE(USE_W3MIMG_X11)
AC_DEFINE(USE_IMLIB)
IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
IMGOBJS="$IMGOBJS x11/x11_w3mimg.o"
IMGX11CFLAGS="`${IMLIB_CONFIG} --cflags`"
IMGX11LDFLAGS="`${IMLIB_CONFIG} --libs`"
IMGTARGETS="x11"
elif test x"$have_imlib2" = xyes; then
AC_DEFINE(USE_W3MIMG_X11)
AC_DEFINE(USE_IMLIB2)
IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
IMGOBJS="$IMGOBJS x11/x11_w3mimg.o"
IMGX11CFLAGS="`${IMLIB2_CONFIG} --cflags`"
IMGX11LDFLAGS="`${IMLIB2_CONFIG} --libs`"
IMGTARGETS="x11"
@@ -700,14 +700,14 @@ AC_DEFUN([AC_W3M_IMAGE],
if test x"$have_gdkpixbuf" = xyes; then
AC_DEFINE(USE_W3MIMG_FB)
AC_DEFINE(USE_GDKPIXBUF)
IMGOBJS="$IMGOBJS w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"
IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o"
IMGFBCFLAGS="`${GDKPIXBUF_CONFIG} --cflags`"
IMGFBLDFLAGS="`${GDKPIXBUF_CONFIG} --libs`"
IMGTARGETS="${IMGTARGETS} fb"
elif test x"$have_imlib2" = xyes; then
AC_DEFINE(USE_W3MIMG_FB)
AC_DEFINE(USE_IMLIB2)
IMGOBJS="$IMGOBJS w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"
IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o"
IMGFBCFLAGS="`${IMLIB2_CONFIG} --cflags`"
IMGFBLDFLAGS="`${IMLIB2_CONFIG} --libs`"
IMGTARGETS="${IMGTARGETS} fb"