Changeset 1592 for branches/0.10-stable


Ignore:
Timestamp:
Aug 22, 2015, 11:15:45 AM (4 years ago)
Author:
Jari Häkkinen
Message:

Addresses #530. Test for help2man should be independent of svn working copy existence. Improved help2man/man pages creation logic.

Location:
branches/0.10-stable
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/0.10-stable/configure.ac

    r1591 r1592  
    362362all_reqs_ok="true"
    363363
    364 AM_CONDITIONAL([HAVE_HELP2MAN],[false])
     364# checking for help2man, missing help2man is non-fatal but subsequent
     365# use of `make dist` and `make distcheck` is constructed to fail.
     366AC_MSG_CHECKING([help2man])
     367# redirecting potential error msg to log file
     368AS_IF([help2man --version >/dev/null 2>&AS_MESSAGE_LOG_FD],
     369      [have_help2man=yes], [have_help2man=no])
     370AM_CONDITIONAL([HAVE_HELP2MAN], [test "x$have_help2man" = "xyes"])
     371AC_SUBST([have_help2man])
     372AC_MSG_RESULT([$have_help2man])
     373
     374# if we work in an svn wc we should have a test repository and warn if
     375# help2man missing
    365376AS_VAR_IF([have_svn_wc], [yes], [
    366    AC_MSG_CHECKING([help2man])
    367    # redirecting potential error msg to log file
    368    AS_IF([help2man --version >/dev/null 2>&AS_MESSAGE_LOG_FD],
    369          [AC_MSG_RESULT([yes])
    370           AM_CONDITIONAL([HAVE_HELP2MAN],[true])
    371    ],
    372          [AC_MSG_RESULT([no])
    373     AC_MSG_WARN(m4_text_wrap(m4_normalize([
    374        `help2man' is missing on your system.  You will not be
    375        able to create the man page. A sound man page should be
    376        included in a distribution, and since you will not able
    377        to create a complete distribution `make dist' will fail.
    378        ]),[                   ],
    379           [                             ], 79))
    380    ])
    381377   if (test "$test_repo_found" = "no"); then
    382378      all_reqs_ok="false";
    383       AC_MSG_WARN([dnl
    384 Cannot find test repository (test_repo_filename), which should be
    385 available when building from a subversion working copy. Try svn
    386 update in top directory.]);
     379      AC_MSG_WARN(m4_text_wrap(m4_normalize([
     380         Cannot find test repository (test/repo), which should be
     381   available when building from a subversion working copy.
     382   Try svn update in top directory.
     383   ]),
     384   [                   ],[                             ],79))
     385   fi
     386   if (test "$have_help2man" = "no"); then
     387       # non-fatal, only issue warning
     388       AC_MSG_WARN(m4_text_wrap(m4_normalize([
     389          `help2man' is missing on your system. You will not be
     390    able to create the man page. A sound man page should be
     391    included in a distribution, and since you will not able
     392    to create a complete distribution `make dist' will fail.
     393    ]),
     394    [                   ],[                             ],79))
    387395   fi
    388396])
  • branches/0.10-stable/man/Makefile.am

    r1591 r1592  
    3939  $(srcdir)/svndigest.x $(top_srcdir)/.revision
    4040
     41if !HAVE_HELP2MAN
     42man_deps += FORCE_delete_manpages
     43FORCE_delete_manpages:
     44  @echo "    help2man not found, removing stray man pages"
     45  @rm -f $(dist_man1_MANS)
     46endif
     47
    4148$(srcdir)/svndigest.1: $(man_deps)
    4249if HAVE_HELP2MAN
     
    4653  $(top_builddir)/bin/svndigest$(EXEEXT)
    4754else
    48   @rm -f $@     # Remove stray man page to force 'make dist' to fail
    49   @echo help2man not found, no $@ man page created
    50   @echo make dist and make distcheck will fail
     55  @echo "    help2man not found, no $@ man page created"
     56  @echo "        'make dist' and 'make distcheck' will fail"
    5157endif
    5258
     
    5864  $(top_builddir)/bin/svncopyright$(EXEEXT)
    5965else
    60   @rm -f $@     # Remove stray man page to force 'make dist' to fail
    61   @echo help2man not found, no $@ man page created
    62   @echo make dist and make distcheck will fail
     66  @echo "    help2man not found, no $@ man page created"
     67  @echo "        'make dist' and 'make distcheck' will fail"
    6368endif
    6469
     
    7075  $(top_builddir)/bin/svndigest-copy-cache$(EXEEXT)
    7176else
    72   @rm -f $@     # Remove stray man page to force 'make dist' to fail
    73   @echo help2man not found, no $@ man page created
    74   @echo make dist and make distcheck will fail
     77  @echo "    help2man not found, no $@ man page created"
     78  @echo "        'make dist' and 'make distcheck' will fail"
    7579endif
Note: See TracChangeset for help on using the changeset viewer.