+1999-11-10 Akim Demaille <akim@epita.fr>
+
+ New version of AC_INCLUDE, which does not glob, nor rely upon the
+ shell. Add AC_INCLUDES too. Help tracking multiple inclusions.
+
+ * acgeneral.m4 (m4_errprint, m4_warn, m4_fatal): New macros,
+ variations around errprint.
+ (m4_include_unique): New macro which registers what are the files
+ already included, and warns if some are included several times.
+ (m4_include, m4_sinclude): New macro, using m4_include_unique.
+ (AC_INCLUDE): Is now just a wrapper of m4_include.
+ (AC_INIT): Use m4_sinclude, not sinclude.
+ (_AC_ERRPRINT): Removed, m4_errprint is here!
+ (AC_WARNING, AC_FATAL): Wrappers of m4_warn and m4_fatal.
+
1999-11-01 Akim Demaille <akim@epita.fr>
* autoheader.sh: No longer rely on a system acconfig.h.
M4 environment variable to its path name.
)m4exit(2)])
+
+dnl m4_errprint(MSG)
+dnl ----------------
+dnl Same as `errprint', but reports the file and line.
+define(m4_errprint, [errprint(__file__:__line__: [$1
+])])
+
+
+dnl m4_warn(MSG)
+dnl ------------
+dnl Warn the user.
+define(m4_warn, [m4_errprint([warning: $1])])
+
+
+dnl m4_fatal(MSG, [EXIT-STATUS])
+dnl ----------------------------
+dnl Fatal the user. :)
+define(m4_fatal,
+[m4_errprint([error: $1])dnl
+m4exit(ifelse([$2],, 1, [$2]))])
+
+
dnl Some m4 internals have names colliding with tokens we might use.
dnl Rename them a` la `m4 --prefix-builtins'.
define([m4_prefix],
undefine([$1])])
m4_prefix([eval])
-m4_prefix([include])
m4_prefix([shift])
m4_prefix([format])
+dnl We also want to neutralize include (and sinclude for symmetry),
+dnl but we want to extend them slightly: warn when a file is included
+dnl several times. This is in general a dangerous operation because
+dnl quite nobody quotes the first argument of define.
+dnl
+dnl For instance in the following case:
+dnl define(foo, [bar])
+dnl then a second reading will turn into
+dnl define(bar, [bar])
+dnl which is certainly not what was meant.
+
+
+dnl m4_include_unique(FILE)
+dnl -----------------------
+dnl Declare that the FILE was loading; and warn if it has already
+dnl been included.
+define(m4_include_unique,
+[ifdef([m4_include($1)],
+ [m4_warn([file `$1' included several times])])dnl
+define([m4_include($1)])])
+
+
+dnl m4_include(FILE)
+dnl ----------------
+dnl As the builtin include, but warns against multiple inclusions.
+define(m4_include,
+[m4_include_unique([$1])dnl
+builtin([include], [$1])])
+
+
+dnl m4_sinclude(FILE)
+dnl -----------------
+dnl As the builtin sinclude, but warns against multiple inclusions.
+define(m4_sinclude,
+[m4_include_unique([$1])dnl
+builtin([sinclude], [$1])])
+
+dnl Neutralize include and sinclude.
+undefine([include])
+undefine([sinclude])
+
dnl ------------------------------------------------------------
dnl Text processing in m4.
dnl ------------------------------------------------------------
-dnl ### Implementing m4 loops
+dnl ### Implementing Autoconf loops
dnl AC_FOREACH(VARIABLE, LIST, EXPRESSION)
dnl --------------------------------------
])
+dnl AC_INCLUDE(FILE)
+dnl ----------------
+dnl Wrapper around m4_include.
+define(AC_INCLUDE,
+[m4_include([$1])])
+
+dnl AC_INCLUDES((FILE, ...))
+dnl ------------------------
+define(AC_INCLUDES,
+[m4_foreach([File], [$1], [AC_INCLUDE(File)])])
+
+
dnl AC_INIT(UNIQUE-FILE-IN-SOURCE-DIR)
dnl ----------------------------------
dnl Output the preamble of the `configure' script.
AC_DEFUN(AC_INIT,
-[sinclude(acsite.m4)dnl
-sinclude(./aclocal.m4)dnl
+[m4_sinclude(acsite.m4)dnl
+m4_sinclude(./aclocal.m4)dnl
AC_REQUIRE([AC_INIT_BINSH])dnl
AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
AC_INIT_NOTICE
AC_DIVERT_POP()dnl to NORMAL
])
-dnl AC_INCLUDE(FILES...)
-dnl --------------------
-dnl Note that there is shell expansion, hence AC_INCLUDE(m4/*.m4) is
-dnl legal.
-AC_DEFUN(AC_INCLUDE,
-[ifelse($1, [], [], [dnl
- esyscmd([for file in $1; do echo "m4_include($file)dnl"; done])dnl
-])])
dnl AC_INIT_PREPARE(UNIQUE-FILE-IN-SOURCE-DIR)
dnl ### Printing messages at autoconf runtime
-dnl _AC_ERRPRINT(MESSAGE)
-dnl Report the MESSAGE at m4 time, with line and filename.
-define(_AC_ERRPRINT, [errprint(__file__:__line__: [$1
-])])
-
dnl AC_WARNING(MESSAGE)
-define(AC_WARNING, [_AC_ERRPRINT([warning: $1])])
+define(AC_WARNING, [m4_warn([$1])])
-dnl AC_FATAL(MESSAGE [, EXIT-STATUS])
-define(AC_FATAL,
-[_AC_ERRPRINT([error: $1])
-m4exit(ifdef([$2], [$2], 1))])
+dnl AC_FATAL(MESSAGE, [EXIT-STATUS])
+define(AC_FATAL, [m4_fatal([$1], [$2])])
dnl ### Printing messages at configure runtime
dnl [INCLUDES])
dnl --------------------------------------------------------
dnl The first argument is an m4 list. First because we want to
-dnl promote m4 list, and second because anyway there can be spaces
+dnl promote m4 lists, and second because anyway there can be spaces
dnl in some types (struct etc.).
AC_DEFUN(AC_CHECK_MEMBERS,
[m4_foreach([AC_Member], [$1],
dnl ### Checking for run-time features
-dnl AC_TRY_RUN(PROGRAM, [ACTION-IF-TRUE [, ACTION-IF-FALSE
-dnl [, ACTION-IF-CROSS-COMPILING]]])
-dnl ------------------------------------------------------
+dnl AC_TRY_RUN(PROGRAM, [ACTION-IF-TRUE], [ACTION-IF-FALSE],
+dnl [ACTION-IF-CROSS-COMPILING])
+dnl --------------------------------------------------------
AC_DEFUN(AC_TRY_RUN,
[if test "$cross_compiling" = yes; then
ifelse([$4], ,
])
-dnl AC_TRY_RUN_NATIVE(PROGRAM, [ACTION-IF-TRUE [, ACTION-IF-FALSE]])
-dnl ----------------------------------------------------------------
+dnl AC_TRY_RUN_NATIVE(PROGRAM, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
+dnl ---------------------------------------------------------------
dnl Like AC_TRY_RUN but assumes a native-environment (non-cross) compiler.
AC_DEFUN(AC_TRY_RUN_NATIVE,
[cat >conftest.$ac_ext <<EOF
M4 environment variable to its path name.
)m4exit(2)])
+
+dnl m4_errprint(MSG)
+dnl ----------------
+dnl Same as `errprint', but reports the file and line.
+define(m4_errprint, [errprint(__file__:__line__: [$1
+])])
+
+
+dnl m4_warn(MSG)
+dnl ------------
+dnl Warn the user.
+define(m4_warn, [m4_errprint([warning: $1])])
+
+
+dnl m4_fatal(MSG, [EXIT-STATUS])
+dnl ----------------------------
+dnl Fatal the user. :)
+define(m4_fatal,
+[m4_errprint([error: $1])dnl
+m4exit(ifelse([$2],, 1, [$2]))])
+
+
dnl Some m4 internals have names colliding with tokens we might use.
dnl Rename them a` la `m4 --prefix-builtins'.
define([m4_prefix],
undefine([$1])])
m4_prefix([eval])
-m4_prefix([include])
m4_prefix([shift])
m4_prefix([format])
+dnl We also want to neutralize include (and sinclude for symmetry),
+dnl but we want to extend them slightly: warn when a file is included
+dnl several times. This is in general a dangerous operation because
+dnl quite nobody quotes the first argument of define.
+dnl
+dnl For instance in the following case:
+dnl define(foo, [bar])
+dnl then a second reading will turn into
+dnl define(bar, [bar])
+dnl which is certainly not what was meant.
+
+
+dnl m4_include_unique(FILE)
+dnl -----------------------
+dnl Declare that the FILE was loading; and warn if it has already
+dnl been included.
+define(m4_include_unique,
+[ifdef([m4_include($1)],
+ [m4_warn([file `$1' included several times])])dnl
+define([m4_include($1)])])
+
+
+dnl m4_include(FILE)
+dnl ----------------
+dnl As the builtin include, but warns against multiple inclusions.
+define(m4_include,
+[m4_include_unique([$1])dnl
+builtin([include], [$1])])
+
+
+dnl m4_sinclude(FILE)
+dnl -----------------
+dnl As the builtin sinclude, but warns against multiple inclusions.
+define(m4_sinclude,
+[m4_include_unique([$1])dnl
+builtin([sinclude], [$1])])
+
+dnl Neutralize include and sinclude.
+undefine([include])
+undefine([sinclude])
+
dnl ------------------------------------------------------------
dnl Text processing in m4.
dnl ------------------------------------------------------------
-dnl ### Implementing m4 loops
+dnl ### Implementing Autoconf loops
dnl AC_FOREACH(VARIABLE, LIST, EXPRESSION)
dnl --------------------------------------
])
+dnl AC_INCLUDE(FILE)
+dnl ----------------
+dnl Wrapper around m4_include.
+define(AC_INCLUDE,
+[m4_include([$1])])
+
+dnl AC_INCLUDES((FILE, ...))
+dnl ------------------------
+define(AC_INCLUDES,
+[m4_foreach([File], [$1], [AC_INCLUDE(File)])])
+
+
dnl AC_INIT(UNIQUE-FILE-IN-SOURCE-DIR)
dnl ----------------------------------
dnl Output the preamble of the `configure' script.
AC_DEFUN(AC_INIT,
-[sinclude(acsite.m4)dnl
-sinclude(./aclocal.m4)dnl
+[m4_sinclude(acsite.m4)dnl
+m4_sinclude(./aclocal.m4)dnl
AC_REQUIRE([AC_INIT_BINSH])dnl
AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
AC_INIT_NOTICE
AC_DIVERT_POP()dnl to NORMAL
])
-dnl AC_INCLUDE(FILES...)
-dnl --------------------
-dnl Note that there is shell expansion, hence AC_INCLUDE(m4/*.m4) is
-dnl legal.
-AC_DEFUN(AC_INCLUDE,
-[ifelse($1, [], [], [dnl
- esyscmd([for file in $1; do echo "m4_include($file)dnl"; done])dnl
-])])
dnl AC_INIT_PREPARE(UNIQUE-FILE-IN-SOURCE-DIR)
dnl ### Printing messages at autoconf runtime
-dnl _AC_ERRPRINT(MESSAGE)
-dnl Report the MESSAGE at m4 time, with line and filename.
-define(_AC_ERRPRINT, [errprint(__file__:__line__: [$1
-])])
-
dnl AC_WARNING(MESSAGE)
-define(AC_WARNING, [_AC_ERRPRINT([warning: $1])])
+define(AC_WARNING, [m4_warn([$1])])
-dnl AC_FATAL(MESSAGE [, EXIT-STATUS])
-define(AC_FATAL,
-[_AC_ERRPRINT([error: $1])
-m4exit(ifdef([$2], [$2], 1))])
+dnl AC_FATAL(MESSAGE, [EXIT-STATUS])
+define(AC_FATAL, [m4_fatal([$1], [$2])])
dnl ### Printing messages at configure runtime
dnl [INCLUDES])
dnl --------------------------------------------------------
dnl The first argument is an m4 list. First because we want to
-dnl promote m4 list, and second because anyway there can be spaces
+dnl promote m4 lists, and second because anyway there can be spaces
dnl in some types (struct etc.).
AC_DEFUN(AC_CHECK_MEMBERS,
[m4_foreach([AC_Member], [$1],
dnl ### Checking for run-time features
-dnl AC_TRY_RUN(PROGRAM, [ACTION-IF-TRUE [, ACTION-IF-FALSE
-dnl [, ACTION-IF-CROSS-COMPILING]]])
-dnl ------------------------------------------------------
+dnl AC_TRY_RUN(PROGRAM, [ACTION-IF-TRUE], [ACTION-IF-FALSE],
+dnl [ACTION-IF-CROSS-COMPILING])
+dnl --------------------------------------------------------
AC_DEFUN(AC_TRY_RUN,
[if test "$cross_compiling" = yes; then
ifelse([$4], ,
])
-dnl AC_TRY_RUN_NATIVE(PROGRAM, [ACTION-IF-TRUE [, ACTION-IF-FALSE]])
-dnl ----------------------------------------------------------------
+dnl AC_TRY_RUN_NATIVE(PROGRAM, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
+dnl ---------------------------------------------------------------
dnl Like AC_TRY_RUN but assumes a native-environment (non-cross) compiler.
AC_DEFUN(AC_TRY_RUN_NATIVE,
[cat >conftest.$ac_ext <<EOF
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+
+@SET_MAKE@
AMDEP = @AMDEP@
AMTAR = @AMTAR@
AWK = @AWK@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+
+@SET_MAKE@
AMDEP = @AMDEP@
AMTAR = @AMTAR@
AWK = @AWK@
projects / thirdparty / autoconf.git / commitdiff
