"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "aclocal.m4" between
c_count-7.17.tgz and c_count-7.18.tgz

About: c_count counts lines, statements, other simple measures of C/C++ source programs.

aclocal.m4  (c_count-7.17.tgz):aclocal.m4  (c_count-7.18.tgz)
dnl $Id: aclocal.m4,v 7.16 2015/09/25 00:18:02 tom Exp $ dnl $Id: aclocal.m4,v 7.17 2018/05/12 01:08:15 tom Exp $
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
dnl dnl
dnl See also dnl See also
dnl http://invisible-island.net/autoconf/ dnl http://invisible-island.net/autoconf/
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl CF_ADD_CFLAGS version: 12 updated: 2015/04/12 15:39:00 dnl CF_ADD_CFLAGS version: 13 updated: 2017/02/25 18:57:40
dnl ------------- dnl -------------
dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
dnl The second parameter if given makes this macro verbose. dnl The second parameter if given makes this macro verbose.
dnl dnl
dnl Put any preprocessor definitions that use quoted strings in $EXTRA_CPPFLAGS, dnl Put any preprocessor definitions that use quoted strings in $EXTRA_CPPFLAGS,
dnl to simplify use of $CPPFLAGS in compiler checks, etc., that are easily dnl to simplify use of $CPPFLAGS in compiler checks, etc., that are easily
dnl confused by the quotes (which require backslashes to keep them usable). dnl confused by the quotes (which require backslashes to keep them usable).
AC_DEFUN([CF_ADD_CFLAGS], AC_DEFUN([CF_ADD_CFLAGS],
[ [
cf_fix_cppflags=no cf_fix_cppflags=no
skipping to change at line 38 skipping to change at line 38
(-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
case $cf_add_cflags in case $cf_add_cflags in
(-D*) (-D*)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[[^=]] *='\''\"[[^"]]*//'` cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[[^=]] *='\''\"[[^"]]*//'`
test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=yes && cf_fix_cppflags=yes
if test $cf_fix_cppflags = yes ; then if test $cf_fix_cppflags = yes ; then
cf_new_extra_cppflags="$cf_new_extra_cppflags $cf _add_cflags" CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cfla gs)
continue continue
elif test "${cf_tst_cflags}" = "\"'" ; then elif test "${cf_tst_cflags}" = "\"'" ; then
cf_new_extra_cppflags="$cf_new_extra_cppflags $cf _add_cflags" CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cfla gs)
continue continue
fi fi
;; ;;
esac esac
case "$CPPFLAGS" in case "$CPPFLAGS" in
(*$cf_add_cflags) (*$cf_add_cflags)
;; ;;
(*) (*)
case $cf_add_cflags in case $cf_add_cflags in
(-D*) (-D*)
cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppfl ags) CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppfl ags)
;; ;;
esac esac
cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" CF_APPEND_TEXT(cf_new_cppflags,$cf_add_cflags)
;; ;;
esac esac
;; ;;
(*) (*)
cf_new_cflags="$cf_new_cflags $cf_add_cflags" CF_APPEND_TEXT(cf_new_cflags,$cf_add_cflags)
;; ;;
esac esac
;; ;;
(yes) (yes)
cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'` cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'`
test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=no && cf_fix_cppflags=no
;; ;;
esac esac
done done
if test -n "$cf_new_cflags" ; then if test -n "$cf_new_cflags" ; then
ifelse([$2],,,[CF_VERBOSE(add to \$CFLAGS $cf_new_cflags)]) ifelse([$2],,,[CF_VERBOSE(add to \$CFLAGS $cf_new_cflags)])
CFLAGS="$CFLAGS $cf_new_cflags" CF_APPEND_TEXT(CFLAGS,$cf_new_cflags)
fi fi
if test -n "$cf_new_cppflags" ; then if test -n "$cf_new_cppflags" ; then
ifelse([$2],,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)]) ifelse([$2],,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)])
CPPFLAGS="$CPPFLAGS $cf_new_cppflags" CF_APPEND_TEXT(CPPFLAGS,$cf_new_cppflags)
fi fi
if test -n "$cf_new_extra_cppflags" ; then if test -n "$cf_new_extra_cppflags" ; then
ifelse([$2],,,[CF_VERBOSE(add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags) ]) ifelse([$2],,,[CF_VERBOSE(add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags) ])
EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" CF_APPEND_TEXT(EXTRA_CPPFLAGS,$cf_new_extra_cppflags)
fi fi
AC_SUBST(EXTRA_CPPFLAGS) AC_SUBST(EXTRA_CPPFLAGS)
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl CF_ANSI_CC_CHECK version: 13 updated: 2012/10/06 11:17:15 dnl CF_ANSI_CC_CHECK version: 13 updated: 2012/10/06 11:17:15
dnl ---------------- dnl ----------------
dnl This was originally adapted from the macros 'fp_PROG_CC_STDC' and dnl This was originally adapted from the macros 'fp_PROG_CC_STDC' and
dnl 'fp_C_PROTOTYPES' in the sharutils 4.2 distribution. dnl 'fp_C_PROTOTYPES' in the sharutils 4.2 distribution.
skipping to change at line 168 skipping to change at line 168
if test "$cf_cv_ansi_cc" = "no"; then if test "$cf_cv_ansi_cc" = "no"; then
AC_MSG_ERROR( AC_MSG_ERROR(
[Your compiler does not appear to recognize prototypes. [Your compiler does not appear to recognize prototypes.
You have the following choices: You have the following choices:
a. adjust your compiler options a. adjust your compiler options
b. get an up-to-date compiler b. get an up-to-date compiler
c. use a wrapper such as unproto]) c. use a wrapper such as unproto])
fi fi
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl CF_APPEND_TEXT version: 1 updated: 2017/02/25 18:58:55
dnl --------------
dnl use this macro for appending text without introducing an extra blank at
dnl the beginning
define([CF_APPEND_TEXT],
[
test -n "[$]$1" && $1="[$]$1 "
$1="[$]{$1}$2"
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31 dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31
dnl -------------- dnl --------------
dnl Allow user to disable a normally-on option. dnl Allow user to disable a normally-on option.
AC_DEFUN([CF_ARG_DISABLE], AC_DEFUN([CF_ARG_DISABLE],
[CF_ARG_OPTION($1,[$2],[$3],[$4],yes)])dnl [CF_ARG_OPTION($1,[$2],[$3],[$4],yes)])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl CF_ARG_ENABLE version: 3 updated: 1999/03/30 17:24:31 dnl CF_ARG_ENABLE version: 3 updated: 1999/03/30 17:24:31
dnl ------------- dnl -------------
dnl Allow user to enable a normally-off option. dnl Allow user to enable a normally-off option.
AC_DEFUN([CF_ARG_ENABLE], AC_DEFUN([CF_ARG_ENABLE],
skipping to change at line 203 skipping to change at line 213
if test "$enableval" != "$5" ; then if test "$enableval" != "$5" ; then
ifelse([$3],,[ :]dnl ifelse([$3],,[ :]dnl
,[ $3]) ifelse([$4],,,[ ,[ $3]) ifelse([$4],,,[
else else
$4]) $4])
fi],[enableval=$5 ifelse([$4],,,[ fi],[enableval=$5 ifelse([$4],,,[
$4 $4
])dnl ])dnl
])])dnl ])])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl CF_CC_ENV_FLAGS version: 2 updated: 2015/04/12 15:39:00 dnl CF_CC_ENV_FLAGS version: 8 updated: 2017/09/23 08:50:24
dnl --------------- dnl ---------------
dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
dnl into CC. This will not help with broken scripts that wrap the compiler with dnl into CC. This will not help with broken scripts that wrap the compiler
dnl options, but eliminates a more common category of user confusion. dnl with options, but eliminates a more common category of user confusion.
dnl
dnl In particular, it addresses the problem of being able to run the C
dnl preprocessor in a consistent manner.
dnl
dnl Caveat: this also disallows blanks in the pathname for the compiler, but
dnl the nuisance of having inconsistent settings for compiler and preprocessor
dnl outweighs that limitation.
AC_DEFUN([CF_CC_ENV_FLAGS], AC_DEFUN([CF_CC_ENV_FLAGS],
[ [
# This should have been defined by AC_PROG_CC # This should have been defined by AC_PROG_CC
: ${CC:=cc} : ${CC:=cc}
AC_MSG_CHECKING(\$CC variable) AC_MSG_CHECKING(\$CC variable)
case "$CC" in case "$CC" in
(*[[\ \ ]]-[[IUD]]*) (*[[\ \ ]]-*)
AC_MSG_RESULT(broken) AC_MSG_RESULT(broken)
AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFL AGS options) AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFL AGS options)
# humor him... # humor him...
cf_flags=`echo "$CC" | sed -e 's/^[[^ ]]*[[ ]]//'` cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[[ ]]* / /g' -e 's/[[
CC=`echo "$CC" | sed -e 's/[[ ]].*//'` ]]*[[ ]]-[[^ ]].*//'`
CF_ADD_CFLAGS($cf_flags) cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", [su
bstr]([$]0,1+length(prog))); }'`
CC="$cf_prog"
for cf_arg in $cf_flags
do
case "x$cf_arg" in
(x-[[IUDfgOW]]*)
CF_ADD_CFLAGS($cf_arg)
;;
(*)
CC="$CC $cf_arg"
;;
esac
done
CF_VERBOSE(resulting CC: '$CC')
CF_VERBOSE(resulting CFLAGS: '$CFLAGS')
CF_VERBOSE(resulting CPPFLAGS: '$CPPFLAGS')
;; ;;
(*) (*)
AC_MSG_RESULT(ok) AC_MSG_RESULT(ok)
;; ;;
esac esac
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl CF_CHECK_CACHE version: 12 updated: 2012/10/02 20:55:03 dnl CF_CHECK_CACHE version: 12 updated: 2012/10/02 20:55:03
dnl -------------- dnl --------------
dnl Check if we're accidentally using a cache from a different machine. dnl Check if we're accidentally using a cache from a different machine.
skipping to change at line 357 skipping to change at line 388
[if test "x$enableval" = xno; then with_no_leaks=yes; else with_no_leaks= no; fi], [if test "x$enableval" = xno; then with_no_leaks=yes; else with_no_leaks= no; fi],
: ${with_no_leaks:=no}) : ${with_no_leaks:=no})
AC_MSG_RESULT($with_no_leaks) AC_MSG_RESULT($with_no_leaks)
if test "$with_no_leaks" = yes ; then if test "$with_no_leaks" = yes ; then
AC_DEFINE(NO_LEAKS,1,[Define to 1 if you want to perform memory-leak test ing.]) AC_DEFINE(NO_LEAKS,1,[Define to 1 if you want to perform memory-leak test ing.])
AC_DEFINE(YY_NO_LEAKS,1,[Define to 1 if you want to perform memory-leak t esting.]) AC_DEFINE(YY_NO_LEAKS,1,[Define to 1 if you want to perform memory-leak t esting.])
fi fi
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl CF_ENABLE_WARNINGS version: 4 updated: 2009/07/26 17:53:03 dnl CF_ENABLE_WARNINGS version: 5 updated: 2017/09/29 20:01:16
dnl ------------------ dnl ------------------
dnl Configure-option to enable gcc warnings dnl Configure-option to enable gcc warnings
AC_DEFUN([CF_ENABLE_WARNINGS],[ AC_DEFUN([CF_ENABLE_WARNINGS],[
if ( test "$GCC" = yes || test "$GXX" = yes ) if ( test "$GCC" = yes || test "$GXX" = yes )
then then
AC_MSG_CHECKING(if you want to turn on gcc warnings) AC_MSG_CHECKING(if you want to turn on gcc warnings)
CF_ARG_ENABLE(warnings, CF_ARG_ENABLE(warnings,
[ --enable-warnings test: turn on gcc compiler warnings], [ --enable-warnings test: turn on gcc compiler warnings],
[with_warnings=yes], [with_warnings=yes],
[with_warnings=no]) [with_warnings=no])
AC_MSG_RESULT($with_warnings) AC_MSG_RESULT($with_warnings)
if test "$with_warnings" = "yes" if test "$with_warnings" = "yes"
then then
CF_GCC_ATTRIBUTES CF_GCC_ATTRIBUTES
CF_GCC_WARNINGS CF_GCC_WARNINGS($1)
fi fi
fi fi
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl CF_GCC_ATTRIBUTES version: 17 updated: 2015/04/12 15:39:00 dnl CF_GCC_ATTRIBUTES version: 17 updated: 2015/04/12 15:39:00
dnl ----------------- dnl -----------------
dnl Test for availability of useful gcc __attribute__ directives to quiet dnl Test for availability of useful gcc __attribute__ directives to quiet
dnl compiler warnings. Though useful, not all are supported -- and contrary dnl compiler warnings. Though useful, not all are supported -- and contrary
dnl to documentation, unrecognized directives cause older compilers to barf. dnl to documentation, unrecognized directives cause older compilers to barf.
AC_DEFUN([CF_GCC_ATTRIBUTES], AC_DEFUN([CF_GCC_ATTRIBUTES],
skipping to change at line 917 skipping to change at line 948
esac esac
AC_EXEEXT AC_EXEEXT
AC_OBJEXT AC_OBJEXT
PROG_EXT="$EXEEXT" PROG_EXT="$EXEEXT"
AC_SUBST(PROG_EXT) AC_SUBST(PROG_EXT)
test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT",[Define to the pr ogram extension (normally blank)]) test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT",[Define to the pr ogram extension (normally blank)])
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl CF_PROG_GROFF version: 2 updated: 2015/07/04 11:16:27 dnl CF_PROG_GROFF version: 3 updated: 2018/01/07 13:16:19
dnl ------------- dnl -------------
dnl Check if groff is available, for cases (such as html output) where nroff dnl Check if groff is available, for cases (such as html output) where nroff
dnl is not enough. dnl is not enough.
AC_DEFUN([CF_PROG_GROFF],[ AC_DEFUN([CF_PROG_GROFF],[
AC_PATH_PROG(GROFF_PATH,groff,no) AC_PATH_PROG(GROFF_PATH,groff,no)
AC_PATH_PROG(NROFF_PATH,nroff,no) AC_PATH_PROGS(NROFF_PATH,nroff mandoc,no)
AC_PATH_PROG(TBL_PATH,tbl,cat)
if test "x$GROFF_PATH" = xno if test "x$GROFF_PATH" = xno
then then
NROFF_NOTE= NROFF_NOTE=
GROFF_NOTE="#" GROFF_NOTE="#"
else else
NROFF_NOTE="#" NROFF_NOTE="#"
GROFF_NOTE= GROFF_NOTE=
fi fi
AC_SUBST(GROFF_NOTE) AC_SUBST(GROFF_NOTE)
AC_SUBST(NROFF_NOTE) AC_SUBST(NROFF_NOTE)
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl CF_PROG_LINT version: 2 updated: 2009/08/12 04:43:14 dnl CF_PROG_LINT version: 3 updated: 2016/05/22 15:25:54
dnl ------------ dnl ------------
AC_DEFUN([CF_PROG_LINT], AC_DEFUN([CF_PROG_LINT],
[ [
AC_CHECK_PROGS(LINT, tdlint lint alint splint lclint) AC_CHECK_PROGS(LINT, lint cppcheck splint)
AC_SUBST(LINT_OPTS) AC_SUBST(LINT_OPTS)
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl CF_REMOVE_DEFINE version: 3 updated: 2010/01/09 11:05:50 dnl CF_REMOVE_DEFINE version: 3 updated: 2010/01/09 11:05:50
dnl ---------------- dnl ----------------
dnl Remove all -U and -D options that refer to the given symbol from a list dnl Remove all -U and -D options that refer to the given symbol from a list
dnl of C compiler options. This works around the problem that not all dnl of C compiler options. This works around the problem that not all
dnl compilers process -U and -D options from left-to-right, so a -U option dnl compilers process -U and -D options from left-to-right, so a -U option
dnl cannot be used to cancel the effect of a preceding -D option. dnl cannot be used to cancel the effect of a preceding -D option.
dnl dnl
skipping to change at line 1008 skipping to change at line 1040
CF_NO_LEAKS_OPTION(dmalloc, CF_NO_LEAKS_OPTION(dmalloc,
[ --with-dmalloc test: use Gray Watson's dmalloc library], [ --with-dmalloc test: use Gray Watson's dmalloc library],
[USE_DMALLOC]) [USE_DMALLOC])
if test "$with_dmalloc" = yes ; then if test "$with_dmalloc" = yes ; then
AC_CHECK_HEADER(dmalloc.h, AC_CHECK_HEADER(dmalloc.h,
[AC_CHECK_LIB(dmalloc,[dmalloc_debug]ifelse([$1],,[],[,$1]))]) [AC_CHECK_LIB(dmalloc,[dmalloc_debug]ifelse([$1],,[],[,$1]))])
fi fi
])dnl ])dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl CF_WITH_MAN2HTML version: 5 updated: 2015/08/20 04:51:36 dnl CF_WITH_MAN2HTML version: 7 updated: 2018/01/07 13:16:19
dnl ---------------- dnl ----------------
dnl Check for man2html and groff. Optionally prefer man2html over groff. dnl Check for man2html and groff. Prefer man2html over groff, but use groff
dnl as a fallback. See
dnl
dnl http://invisible-island.net/scripts/man2html.html
dnl
dnl Generate a shell script which hides the differences between the two. dnl Generate a shell script which hides the differences between the two.
dnl dnl
dnl We name that "man2html.tmp". dnl We name that "man2html.tmp".
dnl dnl
dnl The shell script can be removed later, e.g., using "make distclean". dnl The shell script can be removed later, e.g., using "make distclean".
AC_DEFUN([CF_WITH_MAN2HTML],[ AC_DEFUN([CF_WITH_MAN2HTML],[
AC_REQUIRE([CF_PROG_GROFF]) AC_REQUIRE([CF_PROG_GROFF])
case "x${with_man2html}" in
(xno)
cf_man2html=no
;;
(x|xyes)
AC_PATH_PROG(cf_man2html,man2html,no)
case "x$cf_man2html" in
(x/*)
AC_MSG_CHECKING(for the modified Earl Hood script)
if ( $cf_man2html -help 2>&1 | grep 'Make an index of headers at
the end' >/dev/null )
then
cf_man2html_ok=yes
else
cf_man2html=no
cf_man2html_ok=no
fi
AC_MSG_RESULT($cf_man2html_ok)
;;
(*)
cf_man2html=no
;;
esac
esac
AC_MSG_CHECKING(for program to convert manpage to html) AC_MSG_CHECKING(for program to convert manpage to html)
AC_ARG_WITH(man2html, AC_ARG_WITH(man2html,
[ --with-man2html=XXX use XXX rather than groff], [ --with-man2html=XXX use XXX rather than groff],
[cf_man2html=$withval], [cf_man2html=$withval],
[cf_man2html=$GROFF_PATH]) [cf_man2html=$cf_man2html])
cf_with_groff=no cf_with_groff=no
case $cf_man2html in case $cf_man2html in
(yes) (yes)
AC_MSG_RESULT(man2html) AC_MSG_RESULT(man2html)
AC_PATH_PROG(cf_man2html,man2html,no) AC_PATH_PROG(cf_man2html,man2html,no)
;; ;;
(no|groff|*/groff*) (no|groff|*/groff*)
cf_with_groff=yes cf_with_groff=yes
skipping to change at line 1071 skipping to change at line 1131
GROFF_NO_SGR=stupid GROFF_NO_SGR=stupid
export GROFF_NO_SGR export GROFF_NO_SGR
CF_EOF CF_EOF
if test "x$cf_with_groff" = xyes if test "x$cf_with_groff" = xyes
then then
MAN2HTML_NOTE="$GROFF_NOTE" MAN2HTML_NOTE="$GROFF_NOTE"
MAN2HTML_PATH="$GROFF_PATH" MAN2HTML_PATH="$GROFF_PATH"
cat >>$MAN2HTML_TEMP <<CF_EOF cat >>$MAN2HTML_TEMP <<CF_EOF
$SHELL -c "tbl \${ROOT}.\${TYPE} | $GROFF_PATH -P -o0 -I\${ROOT}_ -Thtml -\${MAC S}" $SHELL -c "$TBL_PATH \${ROOT}.\${TYPE} | $GROFF_PATH -P -o0 -I\${ROOT}_ -Thtml - \${MACS}"
CF_EOF CF_EOF
else else
MAN2HTML_NOTE="" MAN2HTML_NOTE=""
CF_PATH_SYNTAX(cf_man2html) CF_PATH_SYNTAX(cf_man2html)
MAN2HTML_PATH="$cf_man2html" MAN2HTML_PATH="$cf_man2html"
AC_MSG_CHECKING(for $cf_man2html top/bottom margins) AC_MSG_CHECKING(for $cf_man2html top/bottom margins)
# for this example, expect 3 lines of content, the remainder is head/foot # for this example, expect 3 lines of content, the remainder is head/foot
cat >conftest.in <<CF_EOF cat >conftest.in <<CF_EOF
.TH HEAD1 HEAD2 HEAD3 HEAD4 HEAD5 .TH HEAD1 HEAD2 HEAD3 HEAD4 HEAD5
.SH SECTION .SH SECTION
MARKER MARKER
CF_EOF CF_EOF
LC_ALL=C LC_CTYPE=C LANG=C LANGUAGE=C nroff -man conftest.in >conftest.ou t LC_ALL=C LC_CTYPE=C LANG=C LANGUAGE=C $NROFF_PATH -man conftest.in >conft est.out
cf_man2html_1st=`fgrep -n MARKER conftest.out |sed -e 's/^[[^0-9]]*://' - e 's/:.*//'` cf_man2html_1st=`fgrep -n MARKER conftest.out |sed -e 's/^[[^0-9]]*://' - e 's/:.*//'`
cf_man2html_top=`expr $cf_man2html_1st - 2` cf_man2html_top=`expr $cf_man2html_1st - 2`
cf_man2html_bot=`wc -l conftest.out |sed -e 's/[[^0-9]]//g'` cf_man2html_bot=`wc -l conftest.out |sed -e 's/[[^0-9]]//g'`
cf_man2html_bot=`expr $cf_man2html_bot - 2 - $cf_man2html_top` cf_man2html_bot=`expr $cf_man2html_bot - 2 - $cf_man2html_top`
cf_man2html_top_bot="-topm=$cf_man2html_top -botm=$cf_man2html_bot" cf_man2html_top_bot="-topm=$cf_man2html_top -botm=$cf_man2html_bot"
AC_MSG_RESULT($cf_man2html_top_bot) AC_MSG_RESULT($cf_man2html_top_bot)
AC_MSG_CHECKING(for pagesize to use) AC_MSG_CHECKING(for pagesize to use)
skipping to change at line 1114 skipping to change at line 1174
3 3
4 4
5 5
6 6
7 7
8 8
9 9
CF_EOF CF_EOF
done done
LC_ALL=C LC_CTYPE=C LANG=C LANGUAGE=C nroff -man conftest.in >conftest.ou t LC_ALL=C LC_CTYPE=C LANG=C LANGUAGE=C $NROFF_PATH -man conftest.in >conft est.out
cf_man2html_page=`fgrep -n HEAD1 conftest.out |tail -n 1 |sed -e 's/^[[^0 -9]]*://' -e 's/:.*//'` cf_man2html_page=`fgrep -n HEAD1 conftest.out |tail -n 1 |sed -e 's/^[[^0 -9]]*://' -e 's/:.*//'`
test -z "$cf_man2html_page" && cf_man2html_page=99999 test -z "$cf_man2html_page" && cf_man2html_page=99999
test "$cf_man2html_page" -gt 100 && cf_man2html_page=99999 test "$cf_man2html_page" -gt 100 && cf_man2html_page=99999
rm -rf conftest* rm -rf conftest*
AC_MSG_RESULT($cf_man2html_page) AC_MSG_RESULT($cf_man2html_page)
cat >>$MAN2HTML_TEMP <<CF_EOF cat >>$MAN2HTML_TEMP <<CF_EOF
: \${MAN2HTML_PATH=$MAN2HTML_PATH} : \${MAN2HTML_PATH=$MAN2HTML_PATH}
MAN2HTML_OPTS="\$MAN2HTML_OPTS -index -title="\$ROOT\(\$TYPE\)" -compress -pgsiz e $cf_man2html_page" MAN2HTML_OPTS="\$MAN2HTML_OPTS -index -title="\$ROOT\(\$TYPE\)" -compress -pgsiz e $cf_man2html_page"
case \${TYPE} in case \${TYPE} in
(ms) (ms)
tbl \${ROOT}.\${TYPE} | nroff -\${MACS} | \$MAN2HTML_PATH -topm=0 -botm=0 \$MAN2HTML_OPTS $TBL_PATH \${ROOT}.\${TYPE} | $NROFF_PATH -\${MACS} | \$MAN2HTML_PATH -to pm=0 -botm=0 \$MAN2HTML_OPTS
;; ;;
(*) (*)
tbl \${ROOT}.\${TYPE} | nroff -\${MACS} | \$MAN2HTML_PATH $cf_man2html_to p_bot \$MAN2HTML_OPTS $TBL_PATH \${ROOT}.\${TYPE} | $NROFF_PATH -\${MACS} | \$MAN2HTML_PATH $cf _man2html_top_bot \$MAN2HTML_OPTS
;; ;;
esac esac
CF_EOF CF_EOF
fi fi
chmod 700 $MAN2HTML_TEMP chmod 700 $MAN2HTML_TEMP
AC_SUBST(MAN2HTML_NOTE) AC_SUBST(MAN2HTML_NOTE)
AC_SUBST(MAN2HTML_PATH) AC_SUBST(MAN2HTML_PATH)
AC_SUBST(MAN2HTML_TEMP) AC_SUBST(MAN2HTML_TEMP)
 End of changes. 30 change blocks. 
31 lines changed or deleted 94 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)