add NLSTARGET

4 files changed, 15 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index ff80019..7d4978a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,9 @@
 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
+	* Makefile.in: add INTLTARGET, NLSTARGET
+		cleanup
+	* configure.in: INTLTARGET=intl,NLSTARGET=po if USE_NLS
 
 2003-09-25  Fumitoshi UKAI  <ukai@debian.or.jp>
 
@@ -8078,4 +8079,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.869 2003/09/25 03:35:47 ukai Exp $
+$Id: ChangeLog,v 1.870 2003/09/25 04:36:34 ukai Exp $
diff --git a/Makefile.in b/Makefile.in
index 387967d..54c3c0e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -48,6 +48,7 @@ LIBS = -L. -lindep @LIBINTL@ @LIBS@
 W3M_LIBS = @W3M_LIBS@
 WCTARGET = @WCTARGET@
 INTLTARGET = @INTLTARGET@
+NLSTARGET = @NLSTARGET@
 
 MAKE_ARGS = PERL='$(PERL)' MKDIR='$(MKDIR)' INSTALL='$(INSTALL)' \
 	BIN_DIR='$(bindir)' AUXBIN_DIR='$(AUXBIN_DIR)' \
@@ -118,7 +119,7 @@ SCRIPTSUBDIRS= scripts
 SUBDIRS = $(SCRIPTSUBDIRS) w3mimg libwc intl po
 .PHONY: $(SUBDIRS)
 
-all: $(INTLTARGET) $(TARGETS) all-scripts po
+all: $(INTLTARGET) $(TARGETS) all-scripts $(NLSTARGET)
 
 $(TARGET): $(ALLOBJS) $(ALIB) $(WCTARGET)
 	$(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LDFLAGS) $(LIBS) $(W3M_LIBS)
@@ -217,7 +218,7 @@ install-helpfile:
 	done
 
 install-po:
-	for subdir in po; \
+	for subdir in $(NLSTARGET); \
 	do \
 	 (cd $$subdir && $(MAKE) install); \
 	done
diff --git a/configure b/configure
index a6048f2..9bfb28d 100755
--- 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 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_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 NLSTARGET 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.
@@ -7073,12 +7073,15 @@ _ACEOF
 
 
 INTLTARGET=""
+NLSTARGET=""
 if test x"$USE_NLS" = xyes; then
   INTLTARGET="intl"
+  NLSTARGET="po"
 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
 # Check whether --enable-color or --disable-color was given.
@@ -11786,6 +11789,7 @@ s,@LIBINTL@,$LIBINTL,;t t
 s,@LTLIBINTL@,$LTLIBINTL,;t t
 s,@POSUB@,$POSUB,;t t
 s,@INTLTARGET@,$INTLTARGET,;t t
+s,@NLSTARGET@,$NLSTARGET,;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
index 5d6cc4a..8df41e6 100644
--- a/configure.in
+++ b/configure.in
@@ -44,10 +44,13 @@ AC_W3M_M17N
 AM_GNU_GETTEXT
 
 INTLTARGET=""
+NLSTARGET=""
 if test x"$USE_NLS" = xyes; then
   INTLTARGET="intl"
+  NLSTARGET="po"
 fi
 AC_SUBST(INTLTARGET)
+AC_SUBST(NLSTARGET)
 
 AC_W3M_COLOR
 AC_W3M_ANSI_COLOR