[PATCH:font/util] configure.ac updates to match other X.Org modules

Alan Coopersmith alan.coopersmith at oracle.com
Wed Feb 22 20:47:16 PST 2012


layout and comment the top portion of configure.ac
add missing AC_CONFIG_SRCDIR
Replace obsolete AM_CONFIG_HEADER with AC_CONFIG_HEADERS
replace deprecated AC_HELP_STRING with AS_HELP_STRING
Remove unnecessary AC_PROG_CC & AC_PROG_INSTALL (already
 provided by XORG_DEFAULT_OPTIONS)

Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
 configure.ac |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 217dd91..13667f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,9 +21,14 @@ dnl  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 dnl
 dnl Process this file with autoconf to create configure.
 
+# Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([font-util], [1.2.90],
 	[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [font-util])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
@@ -31,23 +36,18 @@ AM_MAINTAINER_MODE
 m4_ifndef([XORG_MACROS_VERSION],
 	  [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
 XORG_MACROS_VERSION(1.8)
-AM_CONFIG_HEADER(config.h)
-
 XORG_DEFAULT_OPTIONS
 
-AC_PROG_CC
-AC_PROG_INSTALL
-
 AC_MSG_CHECKING([for root directory for font files])
 fontrootdir='${datadir}/fonts/X11'
-AC_ARG_WITH(fontrootdir, [AC_HELP_STRING([--with-fontrootdir=DIR],
+AC_ARG_WITH(fontrootdir, [AS_HELP_STRING([--with-fontrootdir=DIR],
 	[Path to parent of font subdirectories [DATADIR/fonts/X11]])],
 	[fontrootdir="${withval}"])
 AC_SUBST(fontrootdir)
 AC_MSG_RESULT([${fontrootdir}])
 
 mapdir='${fontrootdir}/util'
-AC_ARG_WITH(mapdir, [AC_HELP_STRING([--with-mapdir=DIR],
+AC_ARG_WITH(mapdir, [AS_HELP_STRING([--with-mapdir=DIR],
 	[Path to install font maps [FONTROOTDIR/util]])],
 	[mapdir="${withval}"])
 MAPDIR="$mapdir"
-- 
1.7.3.2



More information about the xorg-devel mailing list