From 85aa1ccceb7169c51b917b0333a631775d028784 Mon Sep 17 00:00:00 2001 From: Diego 'Flameeyes' Pettenò Date: Thu, 7 Aug 2008 14:40:12 +0200 Subject: Bump autoconf requirement to 2.62 (latest released version). --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ab9eb45..4ce40e4 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with pavucontrol. If not, see . -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_HEADERS([config.h]) -- cgit From 6f7e9419e480d068861a9dc4ff0c8d92c8621774 Mon Sep 17 00:00:00 2001 From: Diego 'Flameeyes' Pettenò Date: Fri, 8 Aug 2008 15:39:37 +0200 Subject: Create m4 directory, and set it up. Make sure the m4 directory is known to autoconf. Also ignore the macro files copied over by libtool, gettext and the other tools. --- .gitignore | 1 - configure.ac | 1 + m4/.gitignore | 31 +++++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 m4/.gitignore diff --git a/.gitignore b/.gitignore index 531190f..a0f9298 100644 --- a/.gitignore +++ b/.gitignore @@ -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 4ce40e4..9cb5b11 100644 --- a/configure.ac +++ b/configure.ac @@ -21,6 +21,7 @@ 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]) 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 -- cgit From c6cc345552c504dbfe23837e80464fb094370aab Mon Sep 17 00:00:00 2001 From: Diego 'Flameeyes' Pettenò Date: Fri, 8 Aug 2008 15:57:50 +0200 Subject: Make use of common ZP_LYNX_DOC macro. Instead of reproducing the same code on each configure.ac use the common macro. --- configure.ac | 19 +------------------ m4/zp_lynx_doc.m4 | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 m4/zp_lynx_doc.m4 diff --git a/configure.ac b/configure.ac index 9cb5b11..a5d0804 100644 --- a/configure.ac +++ b/configure.ac @@ -60,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/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]) +]) -- cgit From 9456662992415a462e0da8e8419474f2e0c18169 Mon Sep 17 00:00:00 2001 From: Diego 'Flameeyes' Pettenò Date: Fri, 8 Aug 2008 15:59:48 +0200 Subject: Install README files in doc/html directories. Install and distribute README.html and style.css in the html directory. Install and distribute README in the doc directory. The htmldir and docdir entries are added by recent versionf of autoconf and are configurable, so that distributions don't need to handle installation of these manually. --- doc/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 # . -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 = -- cgit