diff options
author | Jeff Davidson <jpd@google.com> | 2015-01-16 00:06:01 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-16 00:06:01 +0000 |
commit | c346ca161fce1976ee044960d7b0316767a91d31 (patch) | |
tree | 3cecb8acc160fc13944e75d1d97af0afcbd4edc4 /aclocal.m4 | |
parent | b2a9d4321578139677c146ce37eba5e27e8f5c79 (diff) | |
parent | c4616e7140586f06dce57a7fe970a22832f50ccc (diff) | |
download | external_protobuf-c346ca161fce1976ee044960d7b0316767a91d31.zip external_protobuf-c346ca161fce1976ee044960d7b0316767a91d31.tar.gz external_protobuf-c346ca161fce1976ee044960d7b0316767a91d31.tar.bz2 |
am c4616e71: am 77a6b2f4: Merge "Update protobuf library from 2.3 to 2.6."
* commit 'c4616e7140586f06dce57a7fe970a22832f50ccc':
Update protobuf library from 2.3 to 2.6.
Diffstat (limited to 'aclocal.m4')
-rw-r--r-- | aclocal.m4 | 40 |
1 files changed, 40 insertions, 0 deletions
@@ -600,6 +600,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]) + # Check to see how 'make' treats includes. -*- Autoconf -*- # Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. |