Index: sim/bfin/aclocal.m4 |
diff --git a/sim/bfin/aclocal.m4 b/sim/bfin/aclocal.m4 |
index 9a24208b9834880ba64994eb8ea30f410a877920..e93cce7718311cefd5d328e4faa5301b96334848 100644 |
--- a/sim/bfin/aclocal.m4 |
+++ b/sim/bfin/aclocal.m4 |
@@ -172,6 +172,61 @@ else |
fi[]dnl |
])# PKG_CHECK_MODULES |
+ |
+# PKG_INSTALLDIR(DIRECTORY) |
+# ------------------------- |
+# Substitutes the variable pkgconfigdir as the location where a module |
+# should install pkg-config .pc files. By default the directory is |
+# $libdir/pkgconfig, but the default can be changed by passing |
+# DIRECTORY. The user can override through the --with-pkgconfigdir |
+# parameter. |
+AC_DEFUN([PKG_INSTALLDIR], |
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) |
+m4_pushdef([pkg_description], |
+ [pkg-config installation directory @<:@]pkg_default[@:>@]) |
+AC_ARG_WITH([pkgconfigdir], |
+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, |
+ [with_pkgconfigdir=]pkg_default) |
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) |
+m4_popdef([pkg_default]) |
+m4_popdef([pkg_description]) |
+]) dnl PKG_INSTALLDIR |
+ |
+ |
+# PKG_NOARCH_INSTALLDIR(DIRECTORY) |
+# ------------------------- |
+# Substitutes the variable noarch_pkgconfigdir as the location where a |
+# module should install arch-independent pkg-config .pc files. By |
+# default the directory is $datadir/pkgconfig, but the default can be |
+# changed by passing DIRECTORY. The user can override through the |
+# --with-noarch-pkgconfigdir parameter. |
+AC_DEFUN([PKG_NOARCH_INSTALLDIR], |
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) |
+m4_pushdef([pkg_description], |
+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) |
+AC_ARG_WITH([noarch-pkgconfigdir], |
+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, |
+ [with_noarch_pkgconfigdir=]pkg_default) |
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) |
+m4_popdef([pkg_default]) |
+m4_popdef([pkg_description]) |
+]) dnl PKG_NOARCH_INSTALLDIR |
+ |
+ |
+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, |
+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) |
+# ------------------------------------------- |
+# Retrieves the value of the pkg-config variable for the given module. |
+AC_DEFUN([PKG_CHECK_VAR], |
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl |
+ |
+_PKG_CONFIG([$1], [variable="][$3]["], [$2]) |
+AS_VAR_COPY([$1], [pkg_cv_][$1]) |
+ |
+AS_VAR_IF([$1], [""], [$5], [$4])dnl |
+])# PKG_CHECK_VAR |
+ |
# AM_CONDITIONAL -*- Autoconf -*- |
# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 |
@@ -229,6 +284,46 @@ fi |
rmdir .tst 2>/dev/null |
AC_SUBST([am__leading_dot])]) |
+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- |
+# From Jim Meyering |
+ |
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, |
+# 2011 Free Software Foundation, Inc. |
+# |
+# This file is free software; the Free Software Foundation |
+# gives unlimited permission to copy and/or distribute it, |
+# with or without modifications, as long as this notice is preserved. |
+ |
+# serial 5 |
+ |
+# AM_MAINTAINER_MODE([DEFAULT-MODE]) |
+# ---------------------------------- |
+# Control maintainer-specific portions of Makefiles. |
+# Default is to disable them, unless `enable' is passed literally. |
+# For symmetry, `disable' may be passed as well. Anyway, the user |
+# can override the default with the --enable/--disable switch. |
+AC_DEFUN([AM_MAINTAINER_MODE], |
+[m4_case(m4_default([$1], [disable]), |
+ [enable], [m4_define([am_maintainer_other], [disable])], |
+ [disable], [m4_define([am_maintainer_other], [enable])], |
+ [m4_define([am_maintainer_other], [enable]) |
+ m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) |
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) |
+ dnl maintainer-mode's default is 'disable' unless 'enable' is passed |
+ AC_ARG_ENABLE([maintainer-mode], |
+[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful |
+ (and sometimes confusing) to the casual installer], |
+ [USE_MAINTAINER_MODE=$enableval], |
+ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) |
+ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) |
+ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) |
+ MAINT=$MAINTAINER_MODE_TRUE |
+ AC_SUBST([MAINT])dnl |
+] |
+) |
+ |
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) |
+ |
# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. |
# |
# This file is free software; the Free Software Foundation |