From 5d6cb0ce944641d963cbeaed65e7de1020333eaf Mon Sep 17 00:00:00 2001 From: David Reiss Date: Wed, 11 Jun 2008 05:31:09 +0000 Subject: Rename ax_thrift_gen.m4, which now contains two macros. git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@666533 13f79535-47bb-0310-9956-ffa450edef68 --- aclocal/ax_thrift_gen.m4 | 35 ----------------------------------- aclocal/ax_thrift_internal.m4 | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 aclocal/ax_thrift_gen.m4 create mode 100644 aclocal/ax_thrift_internal.m4 (limited to 'aclocal') diff --git a/aclocal/ax_thrift_gen.m4 b/aclocal/ax_thrift_gen.m4 deleted file mode 100644 index e0e6dad6c..000000000 --- a/aclocal/ax_thrift_gen.m4 +++ /dev/null @@ -1,35 +0,0 @@ -dnl @synopsis AX_THRIFT_GEN(SHORT_LANGUAGE, LONG_LANGUAGE, DEFAULT) -dnl @synopsis AX_THRIFT_LIB(SHORT_LANGUAGE, LONG_LANGUAGE, DEFAULT) -dnl -dnl Allow a particular language generator to be disabled. -dnl Allow a particular language library to be disabled. -dnl -dnl These macros have poor error handling and are poorly documented. -dnl They are intended only for internal use by the Thrift compiler. -dnl -dnl @author David Reiss -dnl @version 2008-02-20 -dnl @license AllPermissive - -AC_DEFUN([AX_THRIFT_GEN], - [ - AC_ARG_ENABLE([gen-$1], - AC_HELP_STRING([--enable-gen-$1], [enable the $2 compiler @<:@default=$3@:>@]), - [ax_thrift_gen_$1="$enableval"], - [ax_thrift_gen_$1=$3] - ) - dnl I'd like to run the AM_CONDITIONAL here, but automake likes - dnl all AM_CONDITIONALs to be nice and explicit in configure.ac. - dnl AM_CONDITIONAL([THRIFT_GEN_$1], [test "$ax_thrift_gen_$1" = "yes"]) - ]) - -AC_DEFUN([AX_THRIFT_LIB], - [ - AC_ARG_WITH($1, - AC_HELP_STRING([--with-$1], [build the $2 library @<:@default=$3@:>@]), - [with_$1="$withval"], - [with_$1=$3] - ) - dnl What we do here is going to vary from library to library, - dnl so we can't really generalize (yet!). - ]) diff --git a/aclocal/ax_thrift_internal.m4 b/aclocal/ax_thrift_internal.m4 new file mode 100644 index 000000000..e0e6dad6c --- /dev/null +++ b/aclocal/ax_thrift_internal.m4 @@ -0,0 +1,35 @@ +dnl @synopsis AX_THRIFT_GEN(SHORT_LANGUAGE, LONG_LANGUAGE, DEFAULT) +dnl @synopsis AX_THRIFT_LIB(SHORT_LANGUAGE, LONG_LANGUAGE, DEFAULT) +dnl +dnl Allow a particular language generator to be disabled. +dnl Allow a particular language library to be disabled. +dnl +dnl These macros have poor error handling and are poorly documented. +dnl They are intended only for internal use by the Thrift compiler. +dnl +dnl @author David Reiss +dnl @version 2008-02-20 +dnl @license AllPermissive + +AC_DEFUN([AX_THRIFT_GEN], + [ + AC_ARG_ENABLE([gen-$1], + AC_HELP_STRING([--enable-gen-$1], [enable the $2 compiler @<:@default=$3@:>@]), + [ax_thrift_gen_$1="$enableval"], + [ax_thrift_gen_$1=$3] + ) + dnl I'd like to run the AM_CONDITIONAL here, but automake likes + dnl all AM_CONDITIONALs to be nice and explicit in configure.ac. + dnl AM_CONDITIONAL([THRIFT_GEN_$1], [test "$ax_thrift_gen_$1" = "yes"]) + ]) + +AC_DEFUN([AX_THRIFT_LIB], + [ + AC_ARG_WITH($1, + AC_HELP_STRING([--with-$1], [build the $2 library @<:@default=$3@:>@]), + [with_$1="$withval"], + [with_$1=$3] + ) + dnl What we do here is going to vary from library to library, + dnl so we can't really generalize (yet!). + ]) -- cgit v1.2.1