diff options
| author | wl <wl> | 2006-01-03 23:57:03 +0000 |
|---|---|---|
| committer | wl <wl> | 2006-01-03 23:57:03 +0000 |
| commit | d934ff6d9368d954c0b532cd4c23f4d4c3591cce (patch) | |
| tree | 0d41502d8780d600bc3ff86604bf05f6d2312c86 /Makefile.in | |
| parent | 1768e1210ff633038445e4eafb3027d53712c2b4 (diff) | |
| download | groff-d934ff6d9368d954c0b532cd4c23f4d4c3591cce.tar.gz | |
* m4/groff.m4: Renamed from aclocal.m4.
* m4/codeset.m4: New file, from gnulib.
* m4/iconv.m4: New file, from gnulib.
* m4/lib-ld.m4, m4/lib-link.m4, m4/lib-prefix.m4: New files, from
gnulib.
* config.rpath: New file, from gnulib.
* config.guess, config.sub: New files, from gnulib.
* Makefile.sub (M4MACROS): New variable.
(configure): Fix typo.
(aclocal.m4): New rule.
(stamp-h.in): Depend on aclocal.m4.
* configure.ac: Invoke AM_ICONV and AM_LANGINFO_CODESET.
* Makefile.in (LIBICONV): New variable.
(MDEFINES): Pass it to recursive makes.
* src/preproc/preconv/preconv.cpp: Use HAVE_LANGINFO_CODESET and
HAVE_ICONV instead of I18N macro.
* src/preproc/preconv/Makefile.sub (EXTRA_LDFLAGS): New variable.
* aclocal.m4, configure, src/include/config.hin: (Re)generated.
* doc/Makefile.in (webpage.html): Simplify.
* doc/Makefile.sub (webpage.html): Synchronize with doc/Makefile.in.
* doc/webpage.ms, tmac/groff_www.man, tmac/www.tmac: Minor updates.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in index 463b1e47..57160d06 100644 --- a/Makefile.in +++ b/Makefile.in @@ -278,8 +278,10 @@ make_install_pdfdoc=@make_install_pdfdoc@ # -DHAVE_FMOD if you have fmod() # -DHAVE_GETCWD if you have getcwd() # -DHAVE_GETTIMEOFDAY if you have gettimeofday() +# -DHAVE_ICONV if you have iconv() # -DHAVE_ISATTY if you have isatty() # -DHAVE_KILL if you have kill() +# -DHAVE_LANGINFO_CODESET if you have nl_langinfo() # -DHAVE_MKSTEMP if you have mkstemp() # -DHAVE_MMAP if you have mmap() # -DHAVE_PUTENV if you have putenv() @@ -324,6 +326,7 @@ make_install_pdfdoc=@make_install_pdfdoc@ # -DLONG_FOR_TIME_T if localtime() takes a long * not a time_t * # -DHAVE_STRUCT_EXCEPTION if <math.h> defines struct exception # -DRETSIGTYPE=int if signal handlers return int not void +# -DICONV_CONST=const if declaration of iconv() needs const # -DIS_EBCDIC_HOST if the host's encoding is EBCDIC # -DPAGE=A4 if the the printer's page size is A4 # -DGHOSTSCRIPT=gs the name (and directory if required) of the @@ -368,6 +371,7 @@ OBJEXT=@OBJEXT@ LIBEXT=`case $(OBJEXT) in obj) echo lib;; *) echo a;; esac` LIBS=@LIBS@ LIBM=@LIBM@ +LIBICONV=@LIBICONV@ RANLIB=@RANLIB@ INSTALL=@INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ @@ -422,6 +426,7 @@ MDEFINES= \ "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \ "LDFLAGS=$(LDFLAGS)" \ "LIBEXT=$(LIBEXT)" \ + "LIBICONV=$(LIBICONV)" \ "LIBM=$(LIBM)" \ "LIBOBJS=$(LIBOBJS)" \ "LIBS=$(LIBS)" \ |