From c00d3deaa811f0ae06100aface5ae1ab148f58e0 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 6 Sep 2009 15:47:46 -0400 Subject: [PATCH] Replace AC_DEFINE_DIR private copy with official AX_DEFINE_DIR #23750 The official copy is now installed in share/aclocal. http://www.nongnu.org/autoconf-archive/ax_define_dir.html The private copy of this modules has beeen removed and configure.ac has been updated. --- configure.ac | 2 +- m4/ac_define_dir.m4 | 49 ------------------------------------------------- 2 files changed, 1 insertions(+), 50 deletions(-) delete mode 100644 m4/ac_define_dir.m4 diff --git a/configure.ac b/configure.ac index 05d5b67..79a3a33 100644 --- a/configure.ac +++ b/configure.ac @@ -41,7 +41,7 @@ XORG_CWARNFLAGS pciids_path=/usr/share/hwdata AC_ARG_WITH(pciids-path, AC_HELP_STRING([--with-pciids-path=PCIIDS_PATH], [Path to pci.ids file]), [pciids_path="$withval"]) -AC_DEFINE_DIR(PCIIDS_PATH, pciids_path, [Path to pci.ids]) +AX_DEFINE_DIR(PCIIDS_PATH, pciids_path, [Path to pci.ids]) AC_ARG_ENABLE(linux-rom-fallback, AS_HELP_STRING([--enable-linux-rom-fallback], [Enable support for falling back to /dev/mem for roms (default: disabled)]), diff --git a/m4/ac_define_dir.m4 b/m4/ac_define_dir.m4 deleted file mode 100644 index db42d3e..0000000 --- a/m4/ac_define_dir.m4 +++ /dev/null @@ -1,49 +0,0 @@ -# =========================================================================== -# http://autoconf-archive.cryp.to/ac_define_dir.html -# =========================================================================== -# -# SYNOPSIS -# -# AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION]) -# -# DESCRIPTION -# -# This macro sets VARNAME to the expansion of the DIR variable, taking -# care of fixing up ${prefix} and such. -# -# VARNAME is then offered as both an output variable and a C preprocessor -# symbol. -# -# Example: -# -# AC_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.]) -# -# LAST MODIFICATION -# -# 2008-04-12 -# -# COPYLEFT -# -# Copyright (c) 2008 Stepan Kasal -# Copyright (c) 2008 Andreas Schwab -# Copyright (c) 2008 Guido U. Draheim -# Copyright (c) 2008 Alexandre Oliva -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. - -AC_DEFUN([AC_DEFINE_DIR], [ - prefix_NONE= - exec_prefix_NONE= - test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix - test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix -dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn -dnl refers to ${prefix}. Thus we have to use `eval' twice. - eval ac_define_dir="\"[$]$2\"" - eval ac_define_dir="\"$ac_define_dir\"" - AC_SUBST($1, "$ac_define_dir") - AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3]) - test "$prefix_NONE" && prefix=NONE - test "$exec_prefix_NONE" && exec_prefix=NONE -]) -- 1.6.0.4