[w3m-dev 03818] fix autoconf
* Makefile.in (CGIBIN_DIR): added (AUXBIN_DIR): added (HELP_DIR): added (RC_DIR): added (MAKE_ARGS): added (TARGET): use $(package) (MAN1_TARGET): ditto (install): use $(*_DIR) * acinclude.m4 (AC_W3M_TERMLIB): added (AC_W3M_GC): default search prefix /usr /usr/local $HOME fix searches (AC_W3M_SSL): fix bugs * config.h (RC_DIR): remove tailing / (SYS_MAILCAP): use ETC_DIR (SYS_MIMETYPES): ditto (USER_MIMETYPES): homedir * configure.in: quote (AC_W3M_TERMLIB): use * Bonus/oldconfigure.sh: rewrite From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
This commit is contained in:
Fumitoshi UKAI
@@ -4,6 +4,12 @@
|
||||
#
|
||||
|
||||
# functions
|
||||
opt_push () {
|
||||
# OPT="${OPT} $1"
|
||||
OPT="${OPT} \\
|
||||
$1"
|
||||
}
|
||||
|
||||
opt_enable_set () {
|
||||
val=""
|
||||
if test x"$1" = xy; then
|
||||
@@ -12,7 +18,7 @@ opt_enable_set () {
|
||||
val="--disable-$2"
|
||||
fi
|
||||
if test x"$val" != x; then
|
||||
OPT="${OPT} $val"
|
||||
opt_push "$val"
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -24,7 +30,7 @@ opt_with_set () {
|
||||
val="--without-$2"
|
||||
fi
|
||||
if test x"$val" != x; then
|
||||
OPT="${OPT} $val"
|
||||
opt_push "$val"
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -56,7 +62,17 @@ else
|
||||
fi
|
||||
. "$conffile" # read config.param
|
||||
|
||||
OPT="--bindir='$bindir' --libexecdir='$auxbindir' --datadir='$helpdir' --sysconfdir='$sysconfdir' --libdir='$libdir' --mandir='$mandir'"
|
||||
OPT=""
|
||||
libdir=`echo $libdir | sed 's@/w3m[^/]*/cgi-bin@@'`
|
||||
libexecdir=`echo $auxbindir | sed 's@/w3m[^/]*@@'`
|
||||
datadir=`echo $helpdir | sed 's@/w3m[^/]*@@'`
|
||||
sysconfdir=`echo $sysconfdir | sed 's@/w3m[^/]*@@'`
|
||||
opt_push "--bindir='$bindir'"
|
||||
opt_push "--libexecdir='$libexecdir'"
|
||||
opt_push "--datadir='$datadir'"
|
||||
opt_push "--sysconfdir='$sysconfdir'"
|
||||
opt_push "--libdir='$libdir'"
|
||||
opt_push "--mandir='$mandir'"
|
||||
|
||||
#case "$dmodel" in
|
||||
# 1) val=baby;;
|
||||
@@ -67,14 +83,14 @@ OPT="--bindir='$bindir' --libexecdir='$auxbindir' --datadir='$helpdir' --sysconf
|
||||
# *) echo "ERROR: Illegal model type (model=$dmodel)."
|
||||
# exit 1;;
|
||||
#esac
|
||||
#OPT="${OPT} --enable-model=$val"
|
||||
#opt_push "--enable-model=$val"
|
||||
|
||||
case "$lang" in
|
||||
JA)
|
||||
if test x$display_code != x; then
|
||||
OPT="${OPT} --enable-japanese='$display_code'"
|
||||
opt_push "--enable-japanese='$display_code'"
|
||||
else
|
||||
OPT="${OPT} --enable-japanese"
|
||||
opt_push "--enable-japanese"
|
||||
fi
|
||||
opt_enable_set "$kanji_symbols" kanjisymbols
|
||||
;;
|
||||
@@ -87,10 +103,10 @@ opt_enable_set "$use_ansi_color" ansi-color
|
||||
opt_enable_set "$use_bg_color" bgcolor
|
||||
if test x"$use_migemo" = xy; then
|
||||
if test x"$def_migemo_command" != x; then
|
||||
OPT="${OPT} --with-migemo='$def_migemo_command'"
|
||||
opt_push "--with-migemo='$def_migemo_command'"
|
||||
fi
|
||||
elif test x"$use_migemo" = xn; then
|
||||
OPT="${OPT} --without-migemo"
|
||||
opt_push "--without-migemo"
|
||||
fi
|
||||
opt_enable_set "$use_mouse" mouse
|
||||
opt_enable_set "$use_menu" menu
|
||||
@@ -100,7 +116,11 @@ opt_enable_set "$use_history" history
|
||||
opt_enable_set "$use_digest_auth" digest-auth
|
||||
opt_enable_set "$use_nntp" nntp
|
||||
opt_enable_set "$use_gopher" gopher
|
||||
opt_enable_set "$use_lynx_key" keymap=lynx
|
||||
if test x"$use_lynx_key" = xy; then
|
||||
opt_push "--enable-keymap=lynx"
|
||||
else
|
||||
opt_push "--enable-keymap=w3m"
|
||||
fi
|
||||
opt_with_set "$ded" editor
|
||||
opt_with_set "$dmail" mailer
|
||||
opt_with_set "$dbrowser" browser
|
||||
@@ -132,21 +152,24 @@ if test x"$use_image" = xy; then
|
||||
fi
|
||||
|
||||
if test x"$val" = x; then
|
||||
OPT="${OPT} --enable-image"
|
||||
opt_push "--enable-image"
|
||||
else
|
||||
OPT="${OPT} --enable-image='$val'"
|
||||
opt_push "--enable-image='$val'"
|
||||
fi
|
||||
|
||||
opt_enable_set "$use_xface" xface
|
||||
elif test x"$use_image" = xn; then
|
||||
OPT="${OPT} --disable-image"
|
||||
opt_push "--disable-image"
|
||||
fi
|
||||
if test x"$dtermlib" != x; then
|
||||
dtermlib=`echo "$dtermlib"|sed 's/^-l//'`
|
||||
opt_with_set "$dtermlib" termlib
|
||||
fi
|
||||
if test x"$use_ssl" = xy; then
|
||||
OPT="${OPT} --with-ssl"
|
||||
|
||||
opt_push "--with-ssl"
|
||||
opt_enable_set "$use_ssl_verify" sslverify
|
||||
elif test x"$use_ssl" = xn; then
|
||||
OPT="${OPT} --without-ssl"
|
||||
opt_push "--without-ssl"
|
||||
fi
|
||||
opt_enable_set "$use_ipv6" ipv6
|
||||
|
||||
@@ -154,7 +177,7 @@ env_set CC "$dcc"
|
||||
env_set CFLAGS "$dcflags"
|
||||
env_set LDFLAGS "$dldflags"
|
||||
|
||||
echo "( cd '$topdir'; sh configure ${OPT} )"
|
||||
echo "( cd '$topdir' && sh configure ${OPT} )"
|
||||
if test "${echo_only+set}" != set; then
|
||||
echo "( cd '$topdir'; sh configure ${OPT} )" | sh
|
||||
echo "( cd '$topdir' && sh configure ${OPT} )" | sh
|
||||
fi
|
||||
|
||||
25
ChangeLog
25
ChangeLog
@@ -1,3 +1,26 @@
|
||||
2003-03-13 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
|
||||
|
||||
* [w3m-dev 03818] fix autoconf
|
||||
* Makefile.in (CGIBIN_DIR): added
|
||||
(AUXBIN_DIR): added
|
||||
(HELP_DIR): added
|
||||
(RC_DIR): added
|
||||
(MAKE_ARGS): added
|
||||
(TARGET): use $(package)
|
||||
(MAN1_TARGET): ditto
|
||||
(install): use $(*_DIR)
|
||||
* acinclude.m4 (AC_W3M_TERMLIB): added
|
||||
(AC_W3M_GC): default search prefix /usr /usr/local $HOME
|
||||
fix searches
|
||||
(AC_W3M_SSL): fix bugs
|
||||
* config.h (RC_DIR): remove tailing /
|
||||
(SYS_MAILCAP): use ETC_DIR
|
||||
(SYS_MIMETYPES): ditto
|
||||
(USER_MIMETYPES): homedir
|
||||
* configure.in: quote
|
||||
(AC_W3M_TERMLIB): use
|
||||
* Bonus/oldconfigure.sh: rewrite
|
||||
|
||||
2003-03-12 Fumitoshi UKAI <ukai@debian.or.jp>
|
||||
|
||||
* [w3m-dev 03816] --enable-lynx => --enable-keymap=lynx
|
||||
@@ -7484,4 +7507,4 @@ a * [w3m-dev 03276] compile error on EWS4800
|
||||
* release-0-2-1
|
||||
* import w3m-0.2.1
|
||||
|
||||
$Id: ChangeLog,v 1.788 2003/03/11 17:11:12 ukai Exp $
|
||||
$Id: ChangeLog,v 1.789 2003/03/12 17:20:39 ukai Exp $
|
||||
|
||||
60
Makefile
60
Makefile
@@ -22,11 +22,24 @@ sysconfdir = ${prefix}/etc
|
||||
top_srcdir = .
|
||||
DESTDIR =
|
||||
|
||||
CFLAGS = $(OPTS) -g -O2 -I/usr/include/gc $(DEFS)
|
||||
CPPFLAGS = -I/usr/include/gc -I/usr/include/gc
|
||||
DEFS = -DHAVE_CONFIG_H -I. -I$(top_srcdir) -DAUXBIN_DIR=\"$(libexecdir)\" -DLIB_DIR=\"$(libdir)\" -DHELP_DIR=\"$(datadir)\" -DETC_DIR=\"$(sysconfdir)\"
|
||||
CGIBIN_DIR = $(libexecdir)/$(package)/cgi-bin
|
||||
AUXBIN_DIR = $(libexecdir)/$(package)
|
||||
HELP_DIR = $(datadir)/$(package)
|
||||
RC_DIR = ~/.$(package)
|
||||
|
||||
CFLAGS = $(OPTS) -g -O2 -I/usr/include/gc -I/usr/include/openssl $(DEFS)
|
||||
CPPFLAGS = -I/usr/include/gc
|
||||
DEFS = -DHAVE_CONFIG_H -I. -I$(top_srcdir) -DAUXBIN_DIR=\"$(AUXBIN_DIR)\" \
|
||||
-DLIB_DIR=\"$(CGIBIN_DIR)\" -DHELP_DIR=\"$(HELP_DIR)\" \
|
||||
-DETC_DIR=\"$(sysconfdir)\" -DRC_DIR=\"$(RC_DIR)\"
|
||||
LDFLAGS =
|
||||
LIBS = -L. -lindep -lncurses -lcurses -ltermcap -lm -lnsl -lgpm -lgc -lssl -lcrypto
|
||||
LIBS = -L. -lindep -lm -lnsl -lgpm -ltermcap -lgc -lssl -lcrypto
|
||||
|
||||
MAKE_ARGS = PERL='$(PERL)' MKDIR='$(MKDIR)' INSTALL='$(INSTALL)' \
|
||||
BIN_DIR='$(bindir)' AUXBIN_DIR='$(AUXBIN_DIR)' \
|
||||
LIB_DIR='$(CGIBIN_DIR)' \
|
||||
HELP_DIR='$(HELP_DIR)' MAN_DIR='$(mandir)' ETC_DIR='$(sysconfdir)' \
|
||||
RC_DIR='$(RC_DIR)' DESTDIR='$(DESTDIR)' KEYBIND_SRC='$(KEYBIND_SRC)'
|
||||
|
||||
IMGCFLAGS = -I/usr/include/gdk-pixbuf-1.0 -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include -I/usr/include/gdk-pixbuf-1.0 -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include
|
||||
IMGLDFLAGS = -L/usr/lib -lgdk_pixbuf -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm -lgdk_pixbuf_xlib -L/usr/lib -lgdk_pixbuf -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm
|
||||
@@ -48,7 +61,7 @@ HELP_FILE = w3mhelp-w3m_en.html
|
||||
KEYBIND_SRC = keybind.c
|
||||
KEYBIND_OBJ = keybind.o
|
||||
|
||||
VERSION=0.4.1+cvs-1.787
|
||||
VERSION=0.4.1+cvs-1.788
|
||||
MODEL=i686-pc-linux-gnu-EN
|
||||
|
||||
SRCS=main.c file.c buffer.c display.c etc.c search.c linein.c table.c local.c \
|
||||
@@ -69,12 +82,12 @@ IMGOBJS=w3mimg/w3mimg.o w3mimg/x11/x11_w3mimg.o w3mimg/fb/fb_w3mimg.o w3mimg/fb/
|
||||
|
||||
EXT=
|
||||
|
||||
TARGET=w3m$(EXT)
|
||||
TARGET=$(package)$(EXT)
|
||||
BOOKMARKER=w3mbookmark$(EXT)
|
||||
HELPER=w3mhelperpanel$(EXT)
|
||||
INFLATE=inflate$(EXT)
|
||||
IMGDISPLAY=w3mimgdisplay$(EXT)
|
||||
MAN1_TARGET=w3m.1
|
||||
MAN1_TARGET=$(package).1
|
||||
MAN1=doc/w3m.1
|
||||
MAN1_JA=doc-jp/w3m.1
|
||||
|
||||
@@ -161,67 +174,68 @@ install: install-core install-scripts
|
||||
|
||||
install-core: $(TARGETS)
|
||||
-$(MKDIR) $(DESTDIR)$(bindir)
|
||||
-$(MKDIR) $(DESTDIR)$(libdir)
|
||||
-$(MKDIR) $(DESTDIR)$(libexecdir)
|
||||
-$(MKDIR) $(DESTDIR)$(datadir)
|
||||
-$(MKDIR) $(DESTDIR)$(AUXBIN_DIR)
|
||||
-$(MKDIR) $(DESTDIR)$(CGIBIN_DIR)
|
||||
-$(MKDIR) $(DESTDIR)$(HELP_DIR)
|
||||
-$(MKDIR) $(DESTDIR)$(mandir)/man1
|
||||
-$(MKDIR) $(DESTDIR)$(mandir)/ja/man1
|
||||
$(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(bindir)/$(TARGET)
|
||||
$(INSTALL_DATA) $(HELP_FILE) $(DESTDIR)$(datadir)/$(HELP_TARGET)
|
||||
$(INSTALL_DATA) $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/$(HELP_TARGET)
|
||||
$(INSTALL_DATA) $(MAN1) $(DESTDIR)$(mandir)/man1/$(MAN1_TARGET)
|
||||
$(INSTALL_DATA) $(MAN1_JA) $(DESTDIR)$(mandir)/ja/man1/$(MAN1_TARGET)
|
||||
targets="$(AUXBIN_TARGETS)"; for file in $$targets; \
|
||||
do \
|
||||
case $$file in \
|
||||
$(IMGDISPLAY)) $(INSTALL_W3MIMGDISPLAY) $$file $(DESTDIR)$(libexecdir)/$$file;; \
|
||||
*) $(INSTALL_PROGRAM) $$file $(DESTDIR)$(libexecdir)/$$file;; \
|
||||
$(IMGDISPLAY)) $(INSTALL_W3MIMGDISPLAY) $$file \
|
||||
$(DESTDIR)$(AUXBIN_DIR)/$$file;; \
|
||||
*) $(INSTALL_PROGRAM) $$file $(DESTDIR)$(AUXBIN_DIR)/$$file;; \
|
||||
esac; \
|
||||
done
|
||||
for file in $(LIB_TARGETS); \
|
||||
do \
|
||||
$(INSTALL_PROGRAM) $$file $(DESTDIR)$(libdir)/$$file; \
|
||||
$(INSTALL_PROGRAM) $$file $(DESTDIR)$(CGIBIN_DIR)/$$file; \
|
||||
done
|
||||
|
||||
install-helpfile:
|
||||
-$(MKDIR) $(DESTDIR)$(datadir)
|
||||
-$(MKDIR) $(DESTDIR)$(HELP_DIR)
|
||||
for file in $(HELP_ALLFILES); \
|
||||
do \
|
||||
$(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/$$file; \
|
||||
$(INSTALL_DATA) $$file $(DESTDIR)$(HELP_DIR)/$$file; \
|
||||
done
|
||||
|
||||
all-scripts:
|
||||
for dir in $(SCRIPTSUBDIRS); \
|
||||
do \
|
||||
(cd $$dir; $(MAKE) PERL='$(PERL)' BIN_DIR='$(bindir)' AUXBIN_DIR='$(libexecdir)' LIB_DIR='$(libdir)' HELP_DIR='$(datadir)' RC_DIR='$(sysconfdir)' KEYBIND_SRC='$(KEYBIND_SRC)'); \
|
||||
(cd $$dir; $(MAKE) $(MAKE_ARGS)); \
|
||||
done
|
||||
|
||||
install-scripts: all-scripts
|
||||
topdir=`pwd`; \
|
||||
for dir in $(SCRIPTSUBDIRS); \
|
||||
do \
|
||||
(cd $$dir; $(MAKE) PERL='$(PERL)' MKDIR='$(MKDIR)' BIN_DIR='$(bindir)' AUXBIN_DIR='$(libexecdir)' LIB_DIR='$(libdir)' HELP_DIR='$(datadir)' MAN_DIR='$(mandir)' DESTDIR='$(DESTDIR)' INSTALL="$(INSTALL)" install); \
|
||||
(cd $$dir; $(MAKE) $(MAKE_ARGS) install); \
|
||||
done
|
||||
|
||||
uninstall:
|
||||
-$(RM) $(bindir)/$(TARGET)
|
||||
-for file in $(AUXBIN_TARGETS); \
|
||||
do \
|
||||
$(RM) -f $(libexecdir)/$$file; \
|
||||
$(RM) -f $(AUXBIN_DIR)/$$file; \
|
||||
done
|
||||
-for file in $(LIB_TARGETS); \
|
||||
do \
|
||||
$(RM) -f $(libdir)/$$file; \
|
||||
$(RM) -f $(CGIBIN_DIR)/$$file; \
|
||||
done
|
||||
-for file in $(HELP_ALLFILES); \
|
||||
do \
|
||||
$(RM) -f $(datadir)/$$file; \
|
||||
$(RM) -f $(HELP_DIR)/$$file; \
|
||||
done
|
||||
-$(RM) -f $(datadir)/$(HELP_TARGET)
|
||||
-$(RM) -f $(HELP_DIR)/$(HELP_TARGET)
|
||||
-$(RM) -f $(mandir)/man1/$(MAN1_TARGET)
|
||||
-$(RM) -f $(mandir)/ja/man1/$(MAN1_TARGET)
|
||||
-for dir in $(SCRIPTSUBDIRS); \
|
||||
do \
|
||||
(cd $$dir; $(MAKE) BIN_DIR='$(bindir)' LIB_DIR='$(libdir)' HELP_DIR='$(datadir)' MAN_DIR='$(mandir)' uninstall); \
|
||||
(cd $$dir; $(MAKE) $(MAKE_ARGS) uninstall); \
|
||||
done
|
||||
|
||||
clean: sweep
|
||||
|
||||
52
Makefile.in
52
Makefile.in
@@ -21,12 +21,25 @@ sysconfdir = @sysconfdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
DESTDIR =
|
||||
|
||||
CGIBIN_DIR = $(libexecdir)/$(package)/cgi-bin
|
||||
AUXBIN_DIR = $(libexecdir)/$(package)
|
||||
HELP_DIR = $(datadir)/$(package)
|
||||
RC_DIR = ~/.$(package)
|
||||
|
||||
CFLAGS = $(OPTS) @CFLAGS@ $(DEFS)
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
DEFS = @DEFS@ -I. -I$(top_srcdir) -DAUXBIN_DIR=\"$(libexecdir)\" -DLIB_DIR=\"$(libdir)\" -DHELP_DIR=\"$(datadir)\" -DETC_DIR=\"$(sysconfdir)\"
|
||||
DEFS = @DEFS@ -I. -I$(top_srcdir) -DAUXBIN_DIR=\"$(AUXBIN_DIR)\" \
|
||||
-DLIB_DIR=\"$(CGIBIN_DIR)\" -DHELP_DIR=\"$(HELP_DIR)\" \
|
||||
-DETC_DIR=\"$(sysconfdir)\" -DRC_DIR=\"$(RC_DIR)\"
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBS = -L. -lindep @LIBS@
|
||||
|
||||
MAKE_ARGS = PERL='$(PERL)' MKDIR='$(MKDIR)' INSTALL='$(INSTALL)' \
|
||||
BIN_DIR='$(bindir)' AUXBIN_DIR='$(AUXBIN_DIR)' \
|
||||
LIB_DIR='$(CGIBIN_DIR)' \
|
||||
HELP_DIR='$(HELP_DIR)' MAN_DIR='$(mandir)' ETC_DIR='$(sysconfdir)' \
|
||||
RC_DIR='$(RC_DIR)' DESTDIR='$(DESTDIR)' KEYBIND_SRC='$(KEYBIND_SRC)'
|
||||
|
||||
IMGCFLAGS = @IMGX11CFLAGS@ @IMGFBCFLAGS@
|
||||
IMGLDFLAGS = @IMGX11LDFLAGS@ @IMGFBLDFLAGS@
|
||||
|
||||
@@ -68,12 +81,12 @@ IMGOBJS=@IMGOBJS@
|
||||
|
||||
EXT=@EXEEXT@
|
||||
|
||||
TARGET=w3m$(EXT)
|
||||
TARGET=$(package)$(EXT)
|
||||
BOOKMARKER=w3mbookmark$(EXT)
|
||||
HELPER=w3mhelperpanel$(EXT)
|
||||
INFLATE=inflate$(EXT)
|
||||
IMGDISPLAY=w3mimgdisplay$(EXT)
|
||||
MAN1_TARGET=w3m.1
|
||||
MAN1_TARGET=$(package).1
|
||||
MAN1=doc/w3m.1
|
||||
MAN1_JA=doc-jp/w3m.1
|
||||
|
||||
@@ -160,67 +173,68 @@ install: install-core install-scripts
|
||||
|
||||
install-core: $(TARGETS)
|
||||
-$(MKDIR) $(DESTDIR)$(bindir)
|
||||
-$(MKDIR) $(DESTDIR)$(libdir)
|
||||
-$(MKDIR) $(DESTDIR)$(libexecdir)
|
||||
-$(MKDIR) $(DESTDIR)$(datadir)
|
||||
-$(MKDIR) $(DESTDIR)$(AUXBIN_DIR)
|
||||
-$(MKDIR) $(DESTDIR)$(CGIBIN_DIR)
|
||||
-$(MKDIR) $(DESTDIR)$(HELP_DIR)
|
||||
-$(MKDIR) $(DESTDIR)$(mandir)/man1
|
||||
-$(MKDIR) $(DESTDIR)$(mandir)/ja/man1
|
||||
$(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(bindir)/$(TARGET)
|
||||
$(INSTALL_DATA) $(HELP_FILE) $(DESTDIR)$(datadir)/$(HELP_TARGET)
|
||||
$(INSTALL_DATA) $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/$(HELP_TARGET)
|
||||
$(INSTALL_DATA) $(MAN1) $(DESTDIR)$(mandir)/man1/$(MAN1_TARGET)
|
||||
$(INSTALL_DATA) $(MAN1_JA) $(DESTDIR)$(mandir)/ja/man1/$(MAN1_TARGET)
|
||||
targets="$(AUXBIN_TARGETS)"; for file in $$targets; \
|
||||
do \
|
||||
case $$file in \
|
||||
$(IMGDISPLAY)) $(INSTALL_W3MIMGDISPLAY) $$file $(DESTDIR)$(libexecdir)/$$file;; \
|
||||
*) $(INSTALL_PROGRAM) $$file $(DESTDIR)$(libexecdir)/$$file;; \
|
||||
$(IMGDISPLAY)) $(INSTALL_W3MIMGDISPLAY) $$file \
|
||||
$(DESTDIR)$(AUXBIN_DIR)/$$file;; \
|
||||
*) $(INSTALL_PROGRAM) $$file $(DESTDIR)$(AUXBIN_DIR)/$$file;; \
|
||||
esac; \
|
||||
done
|
||||
for file in $(LIB_TARGETS); \
|
||||
do \
|
||||
$(INSTALL_PROGRAM) $$file $(DESTDIR)$(libdir)/$$file; \
|
||||
$(INSTALL_PROGRAM) $$file $(DESTDIR)$(CGIBIN_DIR)/$$file; \
|
||||
done
|
||||
|
||||
install-helpfile:
|
||||
-$(MKDIR) $(DESTDIR)$(datadir)
|
||||
-$(MKDIR) $(DESTDIR)$(HELP_DIR)
|
||||
for file in $(HELP_ALLFILES); \
|
||||
do \
|
||||
$(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/$$file; \
|
||||
$(INSTALL_DATA) $$file $(DESTDIR)$(HELP_DIR)/$$file; \
|
||||
done
|
||||
|
||||
all-scripts:
|
||||
for dir in $(SCRIPTSUBDIRS); \
|
||||
do \
|
||||
(cd $$dir; $(MAKE) PERL='$(PERL)' BIN_DIR='$(bindir)' AUXBIN_DIR='$(libexecdir)' LIB_DIR='$(libdir)' HELP_DIR='$(datadir)' RC_DIR='$(sysconfdir)' KEYBIND_SRC='$(KEYBIND_SRC)'); \
|
||||
(cd $$dir; $(MAKE) $(MAKE_ARGS)); \
|
||||
done
|
||||
|
||||
install-scripts: all-scripts
|
||||
topdir=`pwd`; \
|
||||
for dir in $(SCRIPTSUBDIRS); \
|
||||
do \
|
||||
(cd $$dir; $(MAKE) PERL='$(PERL)' MKDIR='$(MKDIR)' BIN_DIR='$(bindir)' AUXBIN_DIR='$(libexecdir)' LIB_DIR='$(libdir)' HELP_DIR='$(datadir)' MAN_DIR='$(mandir)' DESTDIR='$(DESTDIR)' INSTALL="$(INSTALL)" install); \
|
||||
(cd $$dir; $(MAKE) $(MAKE_ARGS) install); \
|
||||
done
|
||||
|
||||
uninstall:
|
||||
-$(RM) $(bindir)/$(TARGET)
|
||||
-for file in $(AUXBIN_TARGETS); \
|
||||
do \
|
||||
$(RM) -f $(libexecdir)/$$file; \
|
||||
$(RM) -f $(AUXBIN_DIR)/$$file; \
|
||||
done
|
||||
-for file in $(LIB_TARGETS); \
|
||||
do \
|
||||
$(RM) -f $(libdir)/$$file; \
|
||||
$(RM) -f $(CGIBIN_DIR)/$$file; \
|
||||
done
|
||||
-for file in $(HELP_ALLFILES); \
|
||||
do \
|
||||
$(RM) -f $(datadir)/$$file; \
|
||||
$(RM) -f $(HELP_DIR)/$$file; \
|
||||
done
|
||||
-$(RM) -f $(datadir)/$(HELP_TARGET)
|
||||
-$(RM) -f $(HELP_DIR)/$(HELP_TARGET)
|
||||
-$(RM) -f $(mandir)/man1/$(MAN1_TARGET)
|
||||
-$(RM) -f $(mandir)/ja/man1/$(MAN1_TARGET)
|
||||
-for dir in $(SCRIPTSUBDIRS); \
|
||||
do \
|
||||
(cd $$dir; $(MAKE) BIN_DIR='$(bindir)' LIB_DIR='$(libdir)' HELP_DIR='$(datadir)' MAN_DIR='$(mandir)' uninstall); \
|
||||
(cd $$dir; $(MAKE) $(MAKE_ARGS) uninstall); \
|
||||
done
|
||||
|
||||
clean: sweep
|
||||
|
||||
60
acinclude.m4
60
acinclude.m4
@@ -323,6 +323,23 @@ AC_DEFUN([AC_W3M_EXTLIBS],
|
||||
AC_MSG_RESULT($extlib)])
|
||||
#
|
||||
# ----------------------------------------------------------------
|
||||
# AC_W3M_TERMLIB
|
||||
# ----------------------------------------------------------------
|
||||
AC_DEFUN([AC_W3M_TERMLIB],
|
||||
[AC_MSG_CHECKING(terminal library)
|
||||
AC_ARG_WITH(termlib,
|
||||
[ --with-termlib[=LIBS] terminal library
|
||||
LIBS is space separated list of:
|
||||
terminfo mytinfo termcap ncurses curses],,
|
||||
[with_termlib="yes"])
|
||||
AC_MSG_RESULT($with_termlib)
|
||||
test x"$with_termlib" = xyes && with_termlib="terminfo mytinfo termlib termcap ncurses curses"
|
||||
for lib in $with_termlib; do
|
||||
AC_CHECK_LIB($lib, tgetent, [LIBS="$LIBS -l$lib"; break])
|
||||
done
|
||||
])
|
||||
#
|
||||
# ----------------------------------------------------------------
|
||||
# AC_W3M_GC
|
||||
# ----------------------------------------------------------------
|
||||
AC_DEFUN([AC_W3M_GC],
|
||||
@@ -332,21 +349,25 @@ AC_ARG_WITH(gc,
|
||||
[test x"$with_gc" = xno && AC_MSG_ERROR([You can not build w3m without gc])],
|
||||
[with_gc="yes"])
|
||||
AC_MSG_RESULT($with_gc)
|
||||
test x"$with_gc" = xyes && with_gc="/usr /usr/local ${HOME}"
|
||||
unset ac_cv_header_gc_h
|
||||
AC_CHECK_HEADER(gc.h)
|
||||
if test x"$ac_cv_header_gc_h" = xno; then
|
||||
AC_MSG_CHECKING(GC header location)
|
||||
AC_MSG_RESULT()
|
||||
gc_includedir="$with_gc/include"
|
||||
test x"$with_gc" = xyes && gc_includedir="/usr/include /usr/include/gc /usr/local/include /usr/local/include/gc ${HOME}/include"
|
||||
AC_MSG_RESULT($with_gc)
|
||||
gcincludedir=no
|
||||
for dir in $gc_includedir; do
|
||||
cppflags="$CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS -I$dir"
|
||||
AC_MSG_CHECKING($dir)
|
||||
unset ac_cv_header_gc_h
|
||||
AC_CHECK_HEADER(gc.h, [gcincludedir=$dir; CPPFLAGS="$CPPFLAGS -I$dir"; CFLAGS="$CFLAGS -I$dir"; break])
|
||||
CPPFLAGS="$cppflags"
|
||||
for dir in $with_gc; do
|
||||
for inc in include include/gc; do
|
||||
cppflags="$CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS -I$dir/$inc"
|
||||
AC_MSG_CHECKING($dir/$inc)
|
||||
unset ac_cv_header_gc_h
|
||||
AC_CHECK_HEADER(gc.h, [gcincludedir="$dir/$inc"; CFLAGS="$CFLAGS -I$dir/$inc"; break])
|
||||
CPPFLAGS="$cppflags"
|
||||
done
|
||||
if test x"$gcincludedir" != xno; then
|
||||
break;
|
||||
fi
|
||||
done
|
||||
if test x"$gcincludedir" = xno; then
|
||||
AC_MSG_ERROR([gc.h not found])
|
||||
@@ -356,16 +377,14 @@ AC_ARG_WITH(gc,
|
||||
AC_CHECK_LIB(gc, GC_version, [LIBS="$LIBS -lgc"])
|
||||
if test x"$ac_cv_lib_gc_GC_version" = xno; then
|
||||
AC_MSG_CHECKING(GC library location)
|
||||
AC_MSG_RESULT()
|
||||
gc_libdir="$with_gc/lib"
|
||||
test x"$gc_libdir" = xyes && gc_libdir="/lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib ${HOME}/lib"
|
||||
AC_MSG_RESULT($with_gc)
|
||||
gclibdir=no
|
||||
for dir in $gc_libdir; do
|
||||
for dir in $with_gc; do
|
||||
ldflags="$LDFLAGS"
|
||||
LDFLAGS="$LDFLAGS -L$dir"
|
||||
LDFLAGS="$LDFLAGS -L$dir/lib"
|
||||
AC_MSG_CHECKING($dir)
|
||||
unset ac_cv_gc_GC_version
|
||||
AC_CHECK_LIB(gc, GC_version, [gclibdir=$dir; LIBS="$LIBS -L$dir -lgc"; break])
|
||||
unset ac_cv_lib_gc_GC_version
|
||||
AC_CHECK_LIB(gc, GC_version, [gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib -lgc"; break])
|
||||
LDFLAGS="$ldflags"
|
||||
done
|
||||
if test x"$gclibdir" = xno; then
|
||||
@@ -387,15 +406,16 @@ AC_MSG_RESULT($with_ssl)
|
||||
if test x"$with_ssl" != xno; then
|
||||
AC_DEFINE(USE_SSL)
|
||||
AC_MSG_CHECKING(for SSL library/header)
|
||||
test x"$with_ssl" = xyes || with_ssl="/usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local"
|
||||
test x"$with_ssl" = xyes && with_ssl="/usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local"
|
||||
AC_MSG_RESULT($with_ssl)
|
||||
for dir in $with_ssl
|
||||
do
|
||||
if test -f "$dir/include/openssl/ssl.h"; then
|
||||
CFLAGS="$CFLAGS -I$dir/include/openssl"
|
||||
elif test -f "$dir/include/ssl.h"; then
|
||||
elif test "$dir" != "/usr" -a -f "$dir/include/ssl.h"; then
|
||||
CFLAGS="$CFLAGS -I$dir/include"
|
||||
fi
|
||||
if test -f "$dir/lib/libssl.a"; then
|
||||
if test "$dir" != "/usr" -a -f "$dir/lib/libssl.a"; then
|
||||
LIBS="$LIBS -L$dir/lib"
|
||||
fi
|
||||
done
|
||||
|
||||
60
aclocal.m4
vendored
60
aclocal.m4
vendored
@@ -335,6 +335,23 @@ AC_DEFUN([AC_W3M_EXTLIBS],
|
||||
AC_MSG_RESULT($extlib)])
|
||||
#
|
||||
# ----------------------------------------------------------------
|
||||
# AC_W3M_TERMLIB
|
||||
# ----------------------------------------------------------------
|
||||
AC_DEFUN([AC_W3M_TERMLIB],
|
||||
[AC_MSG_CHECKING(terminal library)
|
||||
AC_ARG_WITH(termlib,
|
||||
[ --with-termlib[=LIBS] terminal library
|
||||
LIBS is space separated list of:
|
||||
terminfo mytinfo termcap ncurses curses],,
|
||||
[with_termlib="yes"])
|
||||
AC_MSG_RESULT($with_termlib)
|
||||
test x"$with_termlib" = xyes && with_termlib="terminfo mytinfo termlib termcap ncurses curses"
|
||||
for lib in $with_termlib; do
|
||||
AC_CHECK_LIB($lib, tgetent, [LIBS="$LIBS -l$lib"; break])
|
||||
done
|
||||
])
|
||||
#
|
||||
# ----------------------------------------------------------------
|
||||
# AC_W3M_GC
|
||||
# ----------------------------------------------------------------
|
||||
AC_DEFUN([AC_W3M_GC],
|
||||
@@ -344,21 +361,25 @@ AC_ARG_WITH(gc,
|
||||
[test x"$with_gc" = xno && AC_MSG_ERROR([You can not build w3m without gc])],
|
||||
[with_gc="yes"])
|
||||
AC_MSG_RESULT($with_gc)
|
||||
test x"$with_gc" = xyes && with_gc="/usr /usr/local ${HOME}"
|
||||
unset ac_cv_header_gc_h
|
||||
AC_CHECK_HEADER(gc.h)
|
||||
if test x"$ac_cv_header_gc_h" = xno; then
|
||||
AC_MSG_CHECKING(GC header location)
|
||||
AC_MSG_RESULT()
|
||||
gc_includedir="$with_gc/include"
|
||||
test x"$with_gc" = xyes && gc_includedir="/usr/include /usr/include/gc /usr/local/include /usr/local/include/gc ${HOME}/include"
|
||||
AC_MSG_RESULT($with_gc)
|
||||
gcincludedir=no
|
||||
for dir in $gc_includedir; do
|
||||
cppflags="$CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS -I$dir"
|
||||
AC_MSG_CHECKING($dir)
|
||||
unset ac_cv_header_gc_h
|
||||
AC_CHECK_HEADER(gc.h, [gcincludedir=$dir; CPPFLAGS="$CPPFLAGS -I$dir"; CFLAGS="$CFLAGS -I$dir"; break])
|
||||
CPPFLAGS="$cppflags"
|
||||
for dir in $with_gc; do
|
||||
for inc in include include/gc; do
|
||||
cppflags="$CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS -I$dir/$inc"
|
||||
AC_MSG_CHECKING($dir/$inc)
|
||||
unset ac_cv_header_gc_h
|
||||
AC_CHECK_HEADER(gc.h, [gcincludedir="$dir/$inc"; CFLAGS="$CFLAGS -I$dir/$inc"; break])
|
||||
CPPFLAGS="$cppflags"
|
||||
done
|
||||
if test x"$gcincludedir" != xno; then
|
||||
break;
|
||||
fi
|
||||
done
|
||||
if test x"$gcincludedir" = xno; then
|
||||
AC_MSG_ERROR([gc.h not found])
|
||||
@@ -368,16 +389,14 @@ AC_ARG_WITH(gc,
|
||||
AC_CHECK_LIB(gc, GC_version, [LIBS="$LIBS -lgc"])
|
||||
if test x"$ac_cv_lib_gc_GC_version" = xno; then
|
||||
AC_MSG_CHECKING(GC library location)
|
||||
AC_MSG_RESULT()
|
||||
gc_libdir="$with_gc/lib"
|
||||
test x"$gc_libdir" = xyes && gc_libdir="/lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib ${HOME}/lib"
|
||||
AC_MSG_RESULT($with_gc)
|
||||
gclibdir=no
|
||||
for dir in $gc_libdir; do
|
||||
for dir in $with_gc; do
|
||||
ldflags="$LDFLAGS"
|
||||
LDFLAGS="$LDFLAGS -L$dir"
|
||||
LDFLAGS="$LDFLAGS -L$dir/lib"
|
||||
AC_MSG_CHECKING($dir)
|
||||
unset ac_cv_gc_GC_version
|
||||
AC_CHECK_LIB(gc, GC_version, [gclibdir=$dir; LIBS="$LIBS -L$dir -lgc"; break])
|
||||
unset ac_cv_lib_gc_GC_version
|
||||
AC_CHECK_LIB(gc, GC_version, [gclibdir="$dir/lib"; LIBS="$LIBS -L$dir/lib -lgc"; break])
|
||||
LDFLAGS="$ldflags"
|
||||
done
|
||||
if test x"$gclibdir" = xno; then
|
||||
@@ -399,15 +418,16 @@ AC_MSG_RESULT($with_ssl)
|
||||
if test x"$with_ssl" != xno; then
|
||||
AC_DEFINE(USE_SSL)
|
||||
AC_MSG_CHECKING(for SSL library/header)
|
||||
test x"$with_ssl" = xyes || with_ssl="/usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local"
|
||||
test x"$with_ssl" = xyes && with_ssl="/usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local"
|
||||
AC_MSG_RESULT($with_ssl)
|
||||
for dir in $with_ssl
|
||||
do
|
||||
if test -f "$dir/include/openssl/ssl.h"; then
|
||||
CFLAGS="$CFLAGS -I$dir/include/openssl"
|
||||
elif test -f "$dir/include/ssl.h"; then
|
||||
elif test "$dir" != "/usr" -a -f "$dir/include/ssl.h"; then
|
||||
CFLAGS="$CFLAGS -I$dir/include"
|
||||
fi
|
||||
if test -f "$dir/lib/libssl.a"; then
|
||||
if test "$dir" != "/usr" -a -f "$dir/lib/libssl.a"; then
|
||||
LIBS="$LIBS -L$dir/lib"
|
||||
fi
|
||||
done
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#define IMGDISPLAY "w3mimgdisplay"
|
||||
#define XFACE2XPM "xface2xpm"
|
||||
|
||||
#define RC_DIR "~/.w3m/"
|
||||
#define RC_DIR "~/.w3m"
|
||||
#define BOOKMARK "bookmark.html"
|
||||
#define CONFIG_FILE "config"
|
||||
#define KEYMAP_FILE "keymap"
|
||||
@@ -24,9 +24,9 @@
|
||||
#define PASSWD_FILE RC_DIR "/passwd"
|
||||
#define PRE_FORM_FILE RC_DIR "/pre_form"
|
||||
#define USER_MAILCAP RC_DIR "/mailcap"
|
||||
#define SYS_MAILCAP "/etc/mailcap"
|
||||
#define USER_MIMETYPES RC_DIR "~/.mime.types"
|
||||
#define SYS_MIMETYPES "/etc/mime.types"
|
||||
#define SYS_MAILCAP ETC_DIR "mailcap"
|
||||
#define USER_MIMETYPES "~/.mime.types"
|
||||
#define SYS_MIMETYPES ETC_DIR "mime.types"
|
||||
#define USER_URIMETHODMAP RC_DIR "/urimethodmap"
|
||||
#define SYS_URIMETHODMAP ETC_DIR "/urimethodmap"
|
||||
|
||||
|
||||
13
configure.in
13
configure.in
@@ -61,13 +61,7 @@ done
|
||||
|
||||
dnl Checks for libraries.
|
||||
AC_CHECK_FUNC(sqrt,,[AC_CHECK_LIB(m, sqrt)])
|
||||
AC_CHECK_LIB(termcap, tgetent)
|
||||
AC_CHECK_LIB(termlib, tgetent)
|
||||
AC_CHECK_LIB(terminfo, tgetent)
|
||||
AC_CHECK_LIB(mytinfo, tgetent)
|
||||
AC_CHECK_LIB(curses, tgetent)
|
||||
AC_CHECK_LIB(ncurses, tgetent)
|
||||
if test x$enable_mouse = xyes; then
|
||||
if test x"$enable_mouse" = xyes; then
|
||||
AC_SUBST(USE_W3M)
|
||||
AC_CHECK_LIB(gpm, Gpm_Open, [AC_DEFINE(USE_GPM)
|
||||
LIBS="$LIBS -lgpm"])
|
||||
@@ -75,15 +69,16 @@ if test x$enable_mouse = xyes; then
|
||||
AC_TRY_CPP([#include <machine/console.h>
|
||||
MOUSE_GETINFO], [AC_DEFINE(USE_SYSMOUSE)])
|
||||
fi
|
||||
AC_W3M_GC
|
||||
AC_W3M_ALARM
|
||||
AC_SUBST(AUXBIN_TARGETS)
|
||||
AUXBIN_TARGETS=
|
||||
AC_W3M_IMAGE
|
||||
if test x$enable_image != xno; then
|
||||
if test x"$enable_image" != xno; then
|
||||
AUXBIN_TARGETS="$AUXBIN_TARGETS w3mimgdisplay\$(EXT)"
|
||||
AC_W3M_XFACE
|
||||
fi
|
||||
AC_W3M_TERMLIB
|
||||
AC_W3M_GC
|
||||
AC_W3M_SSL
|
||||
AC_W3M_IPv6
|
||||
AC_CHECK_LIB(z, zError, [AUXBIN_TARGETS="$AUXBIN_TARGETS inflate\$(EXT)"])
|
||||
|
||||
Reference in New Issue
Block a user