diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Makefile.in | 8 | ||||
| -rw-r--r-- | aclocal.m4 | 6 | ||||
| -rwxr-xr-x | configure | 104 | ||||
| -rw-r--r-- | configure.ac | 1 |
5 files changed, 128 insertions, 2 deletions
@@ -1,3 +1,14 @@ +2004-10-03 Gaius Mulley <gaius@glam.ac.uk> + + * aclocal.m4 (GROFF_GHOSTSCRIPT_PATH): New macro. + + * configure.ac: Call GROFF_GHOSTSCRIPT_PATH. + + * configure: Regenerated. + + * Makefile.in (GHOSTSCRIPT): New variable. + (MDEFINES): Add GHOSTSCRIPT. + 2004-10-03 Werner LEMBERG <wl@gnu.org> * INSTALL.gen: Updated (taken from texinfo CVS). diff --git a/Makefile.in b/Makefile.in index 234de0c6..f295fdcb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -43,6 +43,10 @@ revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(top_srcdir)/REVISION` # world). PAGE=@PAGE@ +# The name of the ghostscript program. Normally, gs, on GNU/Linux +# but it might be different on cygwin systems. +GHOSTSCRIPT=@GHOSTSCRIPT@ + # Normally the Postscript driver, grops, produces output that conforms # to version 3.0 of the Adobe Document Structuring Conventions. # Unfortunately some spoolers and previewers can't handle such output. @@ -303,6 +307,8 @@ make_install_html=@make_install_html@ # -DRETSIGTYPE=int if signal handlers return int not void # -DIS_EBCDIC_HOST if the host's encoding is EBCDIC # -DPAGEA4 if the the printer's page size is A4 +# -DGHOSTSCRIPT=gs the name (and directory if required) of the +# ghostscript program DEFINES=@DEFS@ # Include @@ -400,6 +406,7 @@ MDEFINES= \ "OBJEXT=$(OBJEXT)" \ "OTHERDEVDIRS=$(OTHERDEVDIRS)" \ "PAGE=$(PAGE)" \ + "GHOSTSCRIPT=$(GHOSTSCRIPT)" \ "PERLPATH=$(PERLPATH)" \ "PSPRINT=$(PSPRINT)" \ "PURIFY=$(PURIFY)" \ @@ -706,7 +713,6 @@ uninstall_dirs: $(exampledir) $(htmldocdir) $(docdir) \ $(libprogramdir) $(libdir) - .PHONY: check check: @@ -124,6 +124,12 @@ AC_DEFUN([GROFF_PNMTOPS_NOSETPAGE], fi AC_SUBST([pnmtops_nosetpage])]) +# Check location of `gs'. + +AC_DEFUN([GROFF_GHOSTSCRIPT_PATH], + [AC_PATH_TOOL(GHOSTSCRIPT, gs gsos2, missing) + AC_SUBST(GHOSTSCRIPT)]) + # GROFF_CSH_HACK(if hack present, if not present) AC_DEFUN([GROFF_CSH_HACK], @@ -531,7 +531,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 CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX TTYDEVDIRS OTHERDEVDIRS CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XDEVDIRS XPROGDIRS XLIBDIRS appresdir LPR LP LPQ PSPRINT DVIPRINT PERLPATH YACC RANLIB ac_ct_RANLIB INSTALL_INFO INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SH_SCRIPT_SED_CMD GREP EGREP LIBC LIBM LIBOBJS BROKEN_SPOOLER_FLAGS PAGE g sys_tmac_prefix tmac_wrap GROFF_PATH_SEPARATOR pnmcut pnmcrop pnmtopng psselect pnmtops gs make_html make_install_html pnmtops_nosetpage 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 CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX TTYDEVDIRS OTHERDEVDIRS CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XDEVDIRS XPROGDIRS XLIBDIRS appresdir LPR LP LPQ PSPRINT DVIPRINT PERLPATH YACC RANLIB ac_ct_RANLIB INSTALL_INFO INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SH_SCRIPT_SED_CMD GREP EGREP LIBC LIBM LIBOBJS BROKEN_SPOOLER_FLAGS PAGE g sys_tmac_prefix tmac_wrap GROFF_PATH_SEPARATOR pnmcut pnmcrop pnmtopng psselect pnmtops gs make_html make_install_html pnmtops_nosetpage GHOSTSCRIPT ac_pt_GHOSTSCRIPT LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -9989,6 +9989,106 @@ echo "${ECHO_T}no" >&6 pnmtops_nosetpage="pnmtops" fi +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gs gsos2", so it can be a program name with args. +set dummy ${ac_tool_prefix}gs gsos2; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_GHOSTSCRIPT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $GHOSTSCRIPT in + [\\/]* | ?:[\\/]*) + ac_cv_path_GHOSTSCRIPT="$GHOSTSCRIPT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GHOSTSCRIPT="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + ;; +esac +fi +GHOSTSCRIPT=$ac_cv_path_GHOSTSCRIPT + +if test -n "$GHOSTSCRIPT"; then + echo "$as_me:$LINENO: result: $GHOSTSCRIPT" >&5 +echo "${ECHO_T}$GHOSTSCRIPT" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +if test -z "$ac_cv_path_GHOSTSCRIPT"; then + ac_pt_GHOSTSCRIPT=$GHOSTSCRIPT + # Extract the first word of "gs gsos2", so it can be a program name with args. +set dummy gs gsos2; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_ac_pt_GHOSTSCRIPT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ac_pt_GHOSTSCRIPT in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_GHOSTSCRIPT="$ac_pt_GHOSTSCRIPT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_GHOSTSCRIPT="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + ;; +esac +fi +ac_pt_GHOSTSCRIPT=$ac_cv_path_ac_pt_GHOSTSCRIPT + +if test -n "$ac_pt_GHOSTSCRIPT"; then + echo "$as_me:$LINENO: result: $ac_pt_GHOSTSCRIPT" >&5 +echo "${ECHO_T}$ac_pt_GHOSTSCRIPT" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test "x$ac_pt_GHOSTSCRIPT" = x; then + GHOSTSCRIPT="missing" + else + if test "$build" != "$host"; then + { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} + fi + GHOSTSCRIPT=$ac_pt_GHOSTSCRIPT + fi +else + GHOSTSCRIPT="$ac_cv_path_GHOSTSCRIPT" +fi + + ac_config_files="$ac_config_files stamp-h" @@ -10649,6 +10749,8 @@ s,@gs@,$gs,;t t s,@make_html@,$make_html,;t t s,@make_install_html@,$make_install_html,;t t s,@pnmtops_nosetpage@,$pnmtops_nosetpage,;t t +s,@GHOSTSCRIPT@,$GHOSTSCRIPT,;t t +s,@ac_pt_GHOSTSCRIPT@,$ac_pt_GHOSTSCRIPT,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF diff --git a/configure.ac b/configure.ac index f34b16bf..3260cb5c 100644 --- a/configure.ac +++ b/configure.ac @@ -92,6 +92,7 @@ GROFF_TMAC GROFF_TARGET_PATH_SEPARATOR GROFF_HTML_PROGRAMS GROFF_PNMTOPS_NOSETPAGE +GROFF_GHOSTSCRIPT_PATH AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h]) AC_CONFIG_FILES([Makefile doc/Makefile]) |