commit bc81edcfe263e5624d82b7138fd4741928151fe1
parent ab634a112a3c2434e0819f9233bee0b0a9210083
Author: ukai <ukai>
Date: Thu, 25 Sep 2003 03:35:47 +0000
fix [w3m-dev 03975] Re: gettextize
* Makefile.in: add INTLTARGET, cleanup
* configure.in: INTLTARGET=intl if USE_NLS
From: Fumitoshi UKAI <ukai@debian.or.jp>
Diffstat:
4 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,11 @@
2003-09-25 Fumitoshi UKAI <ukai@debian.or.jp>
+ * fix [w3m-dev 03975] Re: gettextize
+ * Makefile.in: add INTLTARGET, cleanup
+ * configure.in: INTLTARGET=intl if USE_NLS
+
+2003-09-25 Fumitoshi UKAI <ukai@debian.or.jp>
+
* gettextize
* Makefile.in: updated
* menu.c: gettextize
diff --git a/Makefile.in b/Makefile.in
@@ -47,6 +47,7 @@ LDFLAGS = @LDFLAGS@
LIBS = -L. -lindep @LIBINTL@ @LIBS@
W3M_LIBS = @W3M_LIBS@
WCTARGET = @WCTARGET@
+INTLTARGET = @INTLTARGET@
MAKE_ARGS = PERL='$(PERL)' MKDIR='$(MKDIR)' INSTALL='$(INSTALL)' \
BIN_DIR='$(bindir)' AUXBIN_DIR='$(AUXBIN_DIR)' \
@@ -115,10 +116,9 @@ HELP_ALLFILES=w3mhelp-w3m_en.html w3mhelp-w3m_ja.html \
SCRIPTSUBDIRS= scripts
SUBDIRS = $(SCRIPTSUBDIRS) w3mimg libwc intl po
-
.PHONY: $(SUBDIRS)
-all: $(TARGETS) all-scripts intl po
+all: $(INTLTARGET) $(TARGETS) all-scripts po
$(TARGET): $(ALLOBJS) $(ALIB) $(WCTARGET)
$(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LDFLAGS) $(LIBS) $(W3M_LIBS)
@@ -151,15 +151,14 @@ functable.c: funcname.tab mktable$(EXT)
./mktable$(EXT) 100 functable.tab > $@
-rm -f functable.tab
-mktable$(EXT): mktable.o dummy.o $(ALIB) $(GCTARGET)
+mktable$(EXT): mktable.o dummy.o $(ALIB)
$(CC) $(CFLAGS) -o mktable mktable.o dummy.o $(LDFLAGS) $(LIBS)
-$(BOOKMARKER): w3mbookmark.o dummy.o $(ALIB) $(GCTARGET)
+$(BOOKMARKER): w3mbookmark.o dummy.o $(ALIB)
$(CC) $(CFLAGS) -o $(BOOKMARKER) w3mbookmark.o dummy.o $(LDFLAGS) $(LIBS)
-$(HELPER): w3mhelperpanel.o dummy.o $(ALIB) $(GCTARGET)
+$(HELPER): w3mhelperpanel.o dummy.o $(ALIB)
$(CC) $(CFLAGS) -o $(HELPER) w3mhelperpanel.o dummy.o $(LDFLAGS) $(LIBS)
-
$(INFLATE): inflate.o
$(CC) $(CFLAGS) -o $(INFLATE) inflate.o $(LDFLAGS) $(LIBS) -lz
@@ -218,7 +217,7 @@ install-helpfile:
done
install-po:
- for subdir in intl po; \
+ for subdir in po; \
do \
(cd $$subdir && $(MAKE) install); \
done
diff --git a/configure b/configure
@@ -309,7 +309,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION W3M AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB PERL NKF MAN build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os W3M_TARGET W3M_LIBS USE_M17N USE_UNICODE WCTARGET WCCFLAGS DISPLAY_CHARSET SYSTEM_CHARSET DOCUMENT_CHARSET MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE EGREP ALLOCA GLIBC21 LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB USE_COLOR USE_ANSI_COLOR USE_BG_COLOR USE_IMAGE USE_W3MIMG_X11 USE_W3MIMG_FB W3MIMGDISPLAY_SETUID INSTALL_W3MIMGDISPLAY USE_GDKPIXBUF USE_IMLIB USE_IMLIB2 IMGTARGETS IMGOBJS IMGX11CFLAGS IMGX11LDFLAGS IMGFBCFLAGS IMGFBLDFLAGS USE_XFACE uncompface KEYMAP_FILE HELP_FILE KEYBIND USE_MENU USE_MOUSE USE_HISTORY USE_ALARM USE_COOKIE USE_DIGEST_AUTH USE_NNTP USE_GOPHER INET6 USE_DICT USE_HELP_CGI USE_EXTERNAL_URI_LOADER USE_W3MMAILER USE_MIGEMO DEF_MIGEMO_COMMAND DEF_EDITOR DEF_MAILER DEF_EXT_BROWSER USE_SSL USE_SSL_VERIFY USE_W3M USE_SYSMOUSE AUXBIN_TARGETS USE_BINMODE_STREAM HAVE_SYS_ERRLIST HAVE_SIGSETJMP RETSIGTYPE SIGNAL_RETURN RC_DIR DOCDIRS CURRENT_VERSION LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION W3M AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB PERL NKF MAN build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os W3M_TARGET W3M_LIBS USE_M17N USE_UNICODE WCTARGET WCCFLAGS DISPLAY_CHARSET SYSTEM_CHARSET DOCUMENT_CHARSET MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE EGREP ALLOCA GLIBC21 LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB INTLTARGET USE_COLOR USE_ANSI_COLOR USE_BG_COLOR USE_IMAGE USE_W3MIMG_X11 USE_W3MIMG_FB W3MIMGDISPLAY_SETUID INSTALL_W3MIMGDISPLAY USE_GDKPIXBUF USE_IMLIB USE_IMLIB2 IMGTARGETS IMGOBJS IMGX11CFLAGS IMGX11LDFLAGS IMGFBCFLAGS IMGFBLDFLAGS USE_XFACE uncompface KEYMAP_FILE HELP_FILE KEYBIND USE_MENU USE_MOUSE USE_HISTORY USE_ALARM USE_COOKIE USE_DIGEST_AUTH USE_NNTP USE_GOPHER INET6 USE_DICT USE_HELP_CGI USE_EXTERNAL_URI_LOADER USE_W3MMAILER USE_MIGEMO DEF_MIGEMO_COMMAND DEF_EDITOR DEF_MAILER DEF_EXT_BROWSER USE_SSL USE_SSL_VERIFY USE_W3M USE_SYSMOUSE AUXBIN_TARGETS USE_BINMODE_STREAM HAVE_SYS_ERRLIST HAVE_SIGSETJMP RETSIGTYPE SIGNAL_RETURN RC_DIR DOCDIRS CURRENT_VERSION LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -7072,6 +7072,12 @@ _ACEOF
+INTLTARGET=""
+if test x"$USE_NLS" = xyes; then
+ INTLTARGET="intl"
+fi
+
+
echo "$as_me:$LINENO: checking if color escape sequence for kterm/pxvt is enabled" >&5
echo $ECHO_N "checking if color escape sequence for kterm/pxvt is enabled... $ECHO_C" >&6
@@ -11779,6 +11785,7 @@ s,@INTLLIBS@,$INTLLIBS,;t t
s,@LIBINTL@,$LIBINTL,;t t
s,@LTLIBINTL@,$LTLIBINTL,;t t
s,@POSUB@,$POSUB,;t t
+s,@INTLTARGET@,$INTLTARGET,;t t
s,@USE_COLOR@,$USE_COLOR,;t t
s,@USE_ANSI_COLOR@,$USE_ANSI_COLOR,;t t
s,@USE_BG_COLOR@,$USE_BG_COLOR,;t t
diff --git a/configure.in b/configure.in
@@ -43,6 +43,12 @@ AC_DEFINE_UNQUOTED(W3M_TARGET, $W3M_TARGET)
AC_W3M_M17N
AM_GNU_GETTEXT
+INTLTARGET=""
+if test x"$USE_NLS" = xyes; then
+ INTLTARGET="intl"
+fi
+AC_SUBST(INTLTARGET)
+
AC_W3M_COLOR
AC_W3M_ANSI_COLOR
AC_W3M_BG_COLOR
