From 1b03947ce55f15f1a2a91dd7caf29948b873cd35 Mon Sep 17 00:00:00 2001 From: Mikel Olasagasti Uranga Date: Fri, 9 Nov 2012 21:56:37 +0100 Subject: [PATCH 1/2] Silent build --- configure.ac | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 7f9266cc..3c3f7e9e 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,9 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([1.9 dist-bzip2 subdir-objects no-define foreign]) +AM_INIT_AUTOMAKE([1.11 dist-bzip2 subdir-objects no-define foreign]) + +AM_SILENT_RULES([yes]) AC_USE_SYSTEM_EXTENSIONS AM_MAINTAINER_MODE From 3fe4bf83924e89e5392386eeb05ba0c10e716147 Mon Sep 17 00:00:00 2001 From: Mikel Olasagasti Uranga Date: Fri, 9 Nov 2012 20:09:10 +0100 Subject: [PATCH 2/2] Use AS_HELP_STRING to format text --- configure.ac | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/configure.ac b/configure.ac index 3c3f7e9e..a7d1584f 100644 --- a/configure.ac +++ b/configure.ac @@ -83,103 +83,103 @@ dnl ** configure switches *********************************************** dnl ********************************************************************* AC_ARG_ENABLE(socks, -[ --enable-socks link with SOCKS5 library (default: no)], + [AS_HELP_STRING([--enable-socks],[link with SOCKS5 library (default: no)])], socks=$enableval, socks=no) AC_ARG_ENABLE(ipv6, -[ --enable-ipv6 enable IPv6 (default: no)], + [AS_HELP_STRING([--enable-ipv6],[enable IPv6 (default: no)])], ipv6=$enableval, ipv6=no) AC_ARG_ENABLE(xft, -[ --enable-xft enable use of Xft directly (default: no)], + [AS_HELP_STRING([--enable-xft],[enable use of Xft directly (default: no)])], xft=$enableval, xft=no) AC_ARG_ENABLE(openssl, -[ --enable-openssl[=PATH] enable use of openSSL], + [AS_HELP_STRING([--enable-openssl[=PATH]],[enable use of openSSL])], openssl=$enableval, openssl=yes) AC_ARG_ENABLE(gtkfe, -[ --disable-gtkfe disable building gtk frontend], + [AS_HELP_STRING([--disable-gtkfe],[disable building gtk frontend])], gtkfe=$enableval, gtkfe=yes) AC_ARG_ENABLE(textfe, -[ --enable-textfe build the text frontend (default: no)], + [AS_HELP_STRING([--enable-textfe],[build the text frontend (default: no)])], textfe=$enableval, textfe=no) dnl AC_ARG_ENABLE(gnome, -dnl [ --disable-gnome disable use of gnome], +dnl [AS_HELP_STRING([--disable-gnome],[disable use of gnome])], dnl gnome=$enableval, gnome=yes) AC_ARG_ENABLE(xlib, -[ --disable-xlib disable use of xlib (for non X11 systems)], + [AS_HELP_STRING([--disable-xlib],[disable use of xlib (for non X11 systems)])], xlib=$enableval, xlib=yes) AC_ARG_ENABLE(python, -[ --disable-python don't build the python plugin], + [AS_HELP_STRING([--disable-python],[don't build the python plugin])], python=$enableval, python=yes) AC_ARG_ENABLE(perl, -[ --disable-perl don't build the perl plugin], + [AS_HELP_STRING([--disable-perl],[don't build the perl plugin])], perl=$enableval, perl=yes) AC_ARG_ENABLE(perl_old, -[ --disable-perl_old no backwards compatibility for perl plugin], + [AS_HELP_STRING([--disable-perl_old],[no backwards compatibility for perl plugin])], perl_old=$enableval, perl_old=yes) AC_ARG_ENABLE(tcl, -[ --enable-tcl[=PATH] directory with Tcl config file: tclConfig.sh], + [AS_HELP_STRING([--enable-tcl[=PATH]],[directory with Tcl config file: tclConfig.sh])], tcl=$enableval, tcl=yes) AC_ARG_ENABLE(plugin, -[ --disable-plugin disable plugin support], + [AS_HELP_STRING([--disable-plugin],[disable plugin support])], plugin=$enableval, plugin=yes) AC_ARG_ENABLE(checksum, -[ --disable-checksum disable the Checksum plugin], + [AS_HELP_STRING([--disable-checksum],[disable the Checksum plugin])], checksum=$enableval, checksum=yes) AC_ARG_ENABLE(doat, -[ --disable-doat disable the Do At plugin], + [AS_HELP_STRING([--disable-doat],[disable the Do At plugin])], doat=$enableval, doat=yes) AC_ARG_ENABLE(fishlim, -[ --disable-fishlim disable the FiSHLiM plugin], + [AS_HELP_STRING([--disable-fishlim],[disable the FiSHLiM plugin])], fishlim=$enableval, fishlim=yes) dnl AC_ARG_ENABLE(sasl, -dnl [ --disable-sasl disable the SASL plugin], +dnl [AS_HELP_STRING([--disable-sasl],[disable the SASL plugin])], dnl sasl=$enableval, sasl=yes) AC_ARG_ENABLE(sysinfo, -[ --disable-sysinfo disable the SysInfo plugin], + [AS_HELP_STRING([--disable-sysinfo],[disable the SysInfo plugin])], sysinfo=$enableval, sysinfo=yes) AC_ARG_ENABLE(dbus, -[ --disable-dbus disable DBUS support], + [AS_HELP_STRING([--disable-dbus],[disable DBUS support])], dbus=$enableval, dbus=yes) AC_ARG_ENABLE(libnotify, -[ --disable-libnotify disable libnotify support], + [AS_HELP_STRING([--disable-libnotify],[disable libnotify support])], libnotify=$enableval, libnotify=yes) AC_ARG_ENABLE(mmx, -[ --disable-mmx disable MMX assembly routines], + [AS_HELP_STRING([--disable-mmx],[disable MMX assembly routines])], mmx=$enableval, mmx=yes) AC_ARG_ENABLE(shm, -[ --enable-shm enable use of XShm for fast tinting (default: no)], + [AS_HELP_STRING([--enable-shm],[enable use of XShm for fast tinting (default: no)])], shm=$enableval, shm=no) AC_ARG_ENABLE(spell, -[ --enable-spell=type enable spelling type: none static libsexy gtkspell], + [AS_HELP_STRING([--enable-spell=type],[enable spelling type: none static libsexy gtkspell])], spell=$enableval, spell=static) AC_ARG_ENABLE(ntlm, -[ --enable-ntlm enable Microsoft's NTLM auth (libntlm) library support (default: no)], + [AS_HELP_STRING([--enable-ntlm],[enable Microsoft's NTLM auth (libntlm) library support (default: no)])], ntlm=$enableval, ntlm=no) AC_ARG_ENABLE(libproxy, -[ --disable-libproxy disable libproxy support (default: auto)], + [AS_HELP_STRING([--disable-libproxy],[disable libproxy support (default: auto)])], libproxy=$enableval, libproxy=auto)