diff options
author | Lennart Poettering <lennart@poettering.net> | 2009-03-02 23:28:21 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2009-03-02 23:28:21 +0100 |
commit | aceeb447074aed5a0a9245454c51ef3a387d48e1 (patch) | |
tree | cc69aecedadf5a56e2afd096f292902b32065899 | |
parent | 7711c0a2658b837b642d715146ed66e9afdf8dc5 (diff) | |
parent | 9456662992415a462e0da8e8419474f2e0c18169 (diff) |
Merge commit 'flameeyes/autoconf-2.62'
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | configure.ac | 22 | ||||
-rw-r--r-- | doc/Makefile.am | 5 | ||||
-rw-r--r-- | m4/.gitignore | 31 | ||||
-rw-r--r-- | m4/zp_lynx_doc.m4 | 24 |
5 files changed, 61 insertions, 22 deletions
@@ -7,7 +7,6 @@ config.sub intltool-extract.in intltool-merge.in intltool-update.in -m4/ aclocal.m4 *.cache config.h diff --git a/configure.ac b/configure.ac index b73fe41..f0faa9e 100644 --- a/configure.ac +++ b/configure.ac @@ -18,9 +18,10 @@ # You should have received a copy of the GNU General Public License # along with pavucontrol. If not, see <http://www.gnu.org/licenses/>. -AC_PREREQ(2.57) +AC_PREREQ(2.62) AC_INIT([pavucontrol],[0.9.7],[mzcnihpbageby (at) 0pointer (dot) de]) AC_CONFIG_SRCDIR([src/pavucontrol.cc]) +AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([foreign 1.9 -Wall]) @@ -59,24 +60,7 @@ if test "x$GCC" = "xyes" ; then CXXFLAGS="$CXXFLAGS -pipe -Wall -W" fi -# LYNX documentation generation -AC_ARG_ENABLE(lynx, - AS_HELP_STRING(--disable-lynx,Turn off lynx usage for documentation generation), -[case "${enableval}" in - yes) lynx=yes ;; - no) lynx=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for --disable-lynx) ;; -esac],[lynx=yes]) - -if test x$lynx = xyes ; then - AC_CHECK_PROG(have_lynx, lynx, yes, no) - - if test x$have_lynx = xno ; then - AC_MSG_ERROR([*** Sorry, you have to install lynx or use --disable-lynx ***]) - fi -fi - -AM_CONDITIONAL([USE_LYNX], [test "x$lynx" = xyes]) +ZP_LYNX_DOC IT_PROG_INTLTOOL([0.35.0]) GETTEXT_PACKAGE=pavucontrol diff --git a/doc/Makefile.am b/doc/Makefile.am index a08c59e..d4b50be 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -16,8 +16,9 @@ # License along with pavucontrol. If not, see # <http://www.gnu.org/licenses/>. -noinst_DATA = README.html README -EXTRA_DIST = $(noinst_DATA) style.css README.html.in +dist_html_DATA = README.html style.css +dist_doc_DATA = README +EXTRA_DIST = README.html.in MAINTAINERCLEANFILES = README README.html CLEANFILES = diff --git a/m4/.gitignore b/m4/.gitignore new file mode 100644 index 0000000..4a99ba4 --- /dev/null +++ b/m4/.gitignore @@ -0,0 +1,31 @@ +codeset.m4 +gettext.m4 +glibc2.m4 +glibc21.m4 +iconv.m4 +intdiv0.m4 +intl.m4 +intldir.m4 +intltool.m4 +intmax.m4 +inttypes-pri.m4 +inttypes_h.m4 +lcmessage.m4 +lib-ld.m4 +lib-link.m4 +lib-prefix.m4 +lock.m4 +longdouble.m4 +longlong.m4 +nls.m4 +po.m4 +printf-posix.m4 +progtest.m4 +size_max.m4 +stdint_h.m4 +uintmax_t.m4 +ulonglong.m4 +visibility.m4 +wchar_t.m4 +wint_t.m4 +xsize.m4 diff --git a/m4/zp_lynx_doc.m4 b/m4/zp_lynx_doc.m4 new file mode 100644 index 0000000..955a6ca --- /dev/null +++ b/m4/zp_lynx_doc.m4 @@ -0,0 +1,24 @@ +dnl Macro for enabling LYNX-based documentation generation + +AC_DEFUN([ZP_LYNX_DOC], [ + AC_ARG_ENABLE(lynx, + AS_HELP_STRING([--disable-lynx], + [Turn off lynx usage for documentation generation]),, + [enable_lynx=yes]) + + case "${enable_lynx}" in + yes) + AC_CHECK_PROG(have_lynx, lynx, yes, no) + + if test x$have_lynx = xno ; then + AC_MSG_WARN([*** lynx not found, plain text README will not be built ***]) + fi + ;; + no) + have_lynx=no ;; + *) + AC_MSG_ERROR(bad value ${enableval} for --disable-lynx) ;; + esac + + AM_CONDITIONAL([USE_LYNX], [test "x$have_lynx" = xyes]) +]) |