Changeset 739 for trunk

Timestamp:

Dec 17, 2008, 5:39:47 PM (14 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:

• configure.ac (modified) (2 diffs)
• man/Makefile.am (modified) (2 diffs)

trunk/configure.ac

@@ -71 +71 @@
 AC_PROG_SED
 AC_PATH_PROG([HELP2MAN], [help2man], [no])
-AM_CONDITIONAL([HAVE_HELP2MAN], [test "$help2man" != "no"])
+AM_CONDITIONAL([HAVE_HELP2MAN], [test x$help2man != xno])
 AC_CHECK_PROG([GNUPLOT],[gnuplot],[ok])
 
@@ -88 +88 @@
 AC_ARG_ENABLE(debug,
   [AS_HELP_STRING([--enable-debug],[turn on debug options and code])],
-  [SD_CXXFLAGS="$SD_CXXFLAGS -g -O"], 
+  [SD_CXXFLAGS="$SD_CXXFLAGS -g -O";
+  if test x$help2man = xno; then
+    AC_MSG_WARN(m4_text_wrap(m4_normalize([
+      `help2man' is missing on your system.  You will not be
+      able to create the man page. A sound man page should be
+      included in a distribution, and since you will not able
+      to create a complete distribution `make dist' will fail.
+      ]),[                   ],
+         [                             ], 79))
+  fi], 
   [SD_CPPFLAGS="-DNDEBUG" SD_CXXFLAGS="$SD_CXXFLAGS -O3"])
 

trunk/man/Makefile.am

@@ -34 +34 @@
 else
 $(srcdir)/svndigest.1:
+        echo "WARNING: bogus svndigest.1 is created" >&2; \
   echo 'ab help2man is required to generate this page' > $@
-endif
-
 
 # Checking that we don't ship a bogus man page, which might be created
@@ -42 +41 @@
 # where we require Automake 1.11)
 dist-hook:
-  @if grep 'ab help2man is required to generate this page' \
-  $(srcdir)/svndigest.1 >/dev/null; then \
-          echo "error: svndigest.1 is bogus" >&2; \
-          echo "       you need help2man to generate a valid man page" >&2;\
-          echo "       install help2man, remove svndigest.1 and run 'make'" >&2;\
-          exit 1; \
-  fi
+        echo "ERROR: svndigest.1 is bogus" >&2; \
+        echo "       you need help2man to generate a valid man page" >&2;\
+        echo "       install help2man, re-run `configure'," >&2;\
+        echo "       remove svndigest.1 and run 'make'" >&2;\
+        exit 1;
+endif