Changeset 739 for trunk


Ignore:
Timestamp:
Dec 17, 2008, 5:39:47 PM (13 years ago)
Author:
Peter Johansson
Message:

fixes #363. Correct AM_CONDITIONAL. Added a warning when configure is run with --enable-debug and help2man is not found. Also added a warning if a bogus man page is created. As before there is a dist-hook preventing that bogus man page is not distributed, however, now the dist-hook is triggered on the AM_CONDITIONAL rather than checking that if the man page is ok. This implies that help2man is required to create a dist also if the man page does exist.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r738 r739  
    7171AC_PROG_SED
    7272AC_PATH_PROG([HELP2MAN], [help2man], [no])
    73 AM_CONDITIONAL([HAVE_HELP2MAN], [test "$help2man" != "no"])
     73AM_CONDITIONAL([HAVE_HELP2MAN], [test x$help2man != xno])
    7474AC_CHECK_PROG([GNUPLOT],[gnuplot],[ok])
    7575
     
    8888AC_ARG_ENABLE(debug,
    8989  [AS_HELP_STRING([--enable-debug],[turn on debug options and code])],
    90   [SD_CXXFLAGS="$SD_CXXFLAGS -g -O"],
     90  [SD_CXXFLAGS="$SD_CXXFLAGS -g -O";
     91  if test x$help2man = xno; then
     92    AC_MSG_WARN(m4_text_wrap(m4_normalize([
     93      `help2man' is missing on your system.  You will not be
     94      able to create the man page. A sound man page should be
     95      included in a distribution, and since you will not able
     96      to create a complete distribution `make dist' will fail.
     97      ]),[                   ],
     98         [                             ], 79))
     99  fi],
    91100  [SD_CPPFLAGS="-DNDEBUG" SD_CXXFLAGS="$SD_CXXFLAGS -O3"])
    92101
  • trunk/man/Makefile.am

    r732 r739  
    3434else
    3535$(srcdir)/svndigest.1:
     36        echo "WARNING: bogus svndigest.1 is created" >&2; \
    3637  echo 'ab help2man is required to generate this page' > $@
    37 endif
    38 
    3938
    4039# Checking that we don't ship a bogus man page, which might be created
     
    4241# where we require Automake 1.11)
    4342dist-hook:
    44   @if grep 'ab help2man is required to generate this page' \
    45   $(srcdir)/svndigest.1 >/dev/null; then \
    46           echo "error: svndigest.1 is bogus" >&2; \
    47           echo "       you need help2man to generate a valid man page" >&2;\
    48           echo "       install help2man, remove svndigest.1 and run 'make'" >&2;\
    49           exit 1; \
    50   fi
     43        echo "ERROR: svndigest.1 is bogus" >&2; \
     44        echo "       you need help2man to generate a valid man page" >&2;\
     45        echo "       install help2man, re-run `configure'," >&2;\
     46        echo "       remove svndigest.1 and run 'make'" >&2;\
     47        exit 1;
     48endif
Note: See TracChangeset for help on using the changeset viewer.