mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-29 19:30:36 +02:00
Code Activity

Properly quote the first argument to `AC_DEFINE{,_UNQUOTED}'.

Browse source 
* acinclude.m4, configure.ac, examples/compat/acinclude.m4: Properly
  quote the first argument for `AC_DEFINE' and `AC_DEFINE_UNQUOTED'.

* .x-sc_m4_quote_check: New file.
This commit is contained in:
Ludovic Courtès 2009-11-24 23:34:37 +01:00
parent 48300bace8
commit feef98f203
4 changed files with 31 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.x-sc_m4_quote_check Normal file
View file

@ -0,0 +1 @@
m4/version-etc.m4

6
acinclude.m4
View file

@ -57,7 +57,7 @@ AC_DEFUN([GUILE_HEADER_LIBC_WITH_UNISTD],
] ]
) )
if test "$guile_cv_header_libc_with_unistd" = yes; then if test "$guile_cv_header_libc_with_unistd" = yes; then
AC_DEFINE(LIBC_H_WITH_UNISTD_H, 1, AC_DEFINE([LIBC_H_WITH_UNISTD_H], 1,
[Define this if we should include <libc.h> when we've already [Define this if we should include <libc.h> when we've already
included <unistd.h>. On some systems, they conflict, and libc.h included <unistd.h>. On some systems, they conflict, and libc.h
should be omitted. See GUILE_HEADER_LIBC_WITH_UNISTD in should be omitted. See GUILE_HEADER_LIBC_WITH_UNISTD in
@ -267,7 +267,7 @@ if test "x$acx_pthread_ok" = xyes; then
done done
AC_MSG_RESULT($attr_name) AC_MSG_RESULT($attr_name)
if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name, AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], $attr_name,
[Define to necessary symbol if this constant [Define to necessary symbol if this constant
uses a non-standard name on your system.]) uses a non-standard name on your system.])
fi fi
@ -302,7 +302,7 @@ AC_SUBST(PTHREAD_CC)
# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
if test x"$acx_pthread_ok" = xyes; then if test x"$acx_pthread_ok" = xyes; then
ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1]) ifelse([$1],,AC_DEFINE([HAVE_PTHREAD],1,[Define if you have POSIX threads libraries and header files.]),[$1])
: :
else else
acx_pthread_ok=no acx_pthread_ok=no

52
configure.ac
View file

@ -116,7 +116,7 @@ AC_ARG_ENABLE(debug-freelist,
AC_ARG_ENABLE(debug-malloc, AC_ARG_ENABLE(debug-malloc,
[ --enable-debug-malloc include malloc debugging code], [ --enable-debug-malloc include malloc debugging code],
if test "$enable_debug_malloc" = y || test "$enable_debug_malloc" = yes; then if test "$enable_debug_malloc" = y || test "$enable_debug_malloc" = yes; then
AC_DEFINE(GUILE_DEBUG_MALLOC, 1, AC_DEFINE([GUILE_DEBUG_MALLOC], 1,
[Define this if you want to debug scm_must_malloc/realloc/free calls.]) [Define this if you want to debug scm_must_malloc/realloc/free calls.])
fi) fi)
@ -165,7 +165,7 @@ else
fi fi
SCM_I_GSC_ENABLE_DEPRECATED=1 SCM_I_GSC_ENABLE_DEPRECATED=1
fi fi
AC_DEFINE_UNQUOTED(SCM_WARN_DEPRECATED_DEFAULT, "$warn_default", AC_DEFINE_UNQUOTED([SCM_WARN_DEPRECATED_DEFAULT], "$warn_default",
[Define this to control the default warning level for deprecated features.]) [Define this to control the default warning level for deprecated features.])
AC_ARG_ENABLE(elisp, AC_ARG_ENABLE(elisp,
@ -212,7 +212,7 @@ AC_ARG_WITH([64-calls],
AC_MSG_RESULT($use_64_calls) AC_MSG_RESULT($use_64_calls)
case "$use_64_calls" in case "$use_64_calls" in
y* ) y* )
AC_DEFINE(GUILE_USE_64_CALLS, 1, AC_DEFINE([GUILE_USE_64_CALLS], 1,
[Define to 1 in order to try to use "64" versions of system and library calls.]) [Define to 1 in order to try to use "64" versions of system and library calls.])
;; ;;
esac esac
@ -247,14 +247,14 @@ fi
if test "$enable_posix" = yes; then if test "$enable_posix" = yes; then
AC_LIBOBJ([filesys]) AC_LIBOBJ([filesys])
AC_LIBOBJ([posix]) AC_LIBOBJ([posix])
AC_DEFINE(HAVE_POSIX, 1, AC_DEFINE([HAVE_POSIX], 1,
[Define this if you want support for POSIX system calls in Guile.]) [Define this if you want support for POSIX system calls in Guile.])
fi fi
if test "$enable_networking" = yes; then if test "$enable_networking" = yes; then
AC_LIBOBJ([net_db]) AC_LIBOBJ([net_db])
AC_LIBOBJ([socket]) AC_LIBOBJ([socket])
AC_DEFINE(HAVE_NETWORKING, 1, AC_DEFINE([HAVE_NETWORKING], 1,
[Define this if you want support for networking in Guile.]) [Define this if you want support for networking in Guile.])
fi fi
@ -681,7 +681,7 @@ AC_CHECK_TYPES(complex double,,,
# On MacOS X <sys/socklen.h> contains socklen_t, so must include that # On MacOS X <sys/socklen.h> contains socklen_t, so must include that
# when testing. # when testing.
AC_CHECK_TYPE(socklen_t, , AC_CHECK_TYPE(socklen_t, ,
[AC_DEFINE_UNQUOTED(socklen_t, int, [AC_DEFINE_UNQUOTED([socklen_t], int,
[Define to `int' if <sys/socket.h> does not define.])], [Define to `int' if <sys/socket.h> does not define.])],
[#if HAVE_SYS_TYPES_H [#if HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
@ -727,7 +727,7 @@ case $host in
fi fi
if test "$enable_shared" = yes ; then if test "$enable_shared" = yes ; then
EXTRA_DEFS="-DSCM_IMPORT" EXTRA_DEFS="-DSCM_IMPORT"
AC_DEFINE(USE_DLL_IMPORT, 1, AC_DEFINE([USE_DLL_IMPORT], 1,
[Define if you need additional CPP macros on Win32 platforms.]) [Define if you need additional CPP macros on Win32 platforms.])
fi fi
;; ;;
@ -797,7 +797,7 @@ AC_CHECK_DECLS([sethostname, hstrerror, cuserid])
# libraries already in that list. # libraries already in that list.
# #
AC_SEARCH_LIBS(crypt, crypt, AC_SEARCH_LIBS(crypt, crypt,
[AC_DEFINE(HAVE_CRYPT,1, [AC_DEFINE([HAVE_CRYPT],1,
[Define to 1 if you have the `crypt' function.])]) [Define to 1 if you have the `crypt' function.])])
# When compiling with GCC on some OSs (Solaris, AIX), _Complex_I doesn't # When compiling with GCC on some OSs (Solaris, AIX), _Complex_I doesn't
@ -815,7 +815,7 @@ complex double z;
]], [[ ]], [[
z = _Complex_I; z = _Complex_I;
]])], ]])],
[AC_DEFINE(GUILE_I,_Complex_I,[The imaginary unit (positive square root of -1).]) [AC_DEFINE([GUILE_I],_Complex_I,[The imaginary unit (positive square root of -1).])
AC_MSG_RESULT([_Complex_I])], AC_MSG_RESULT([_Complex_I])],
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#if HAVE_COMPLEX_H #if HAVE_COMPLEX_H
@ -825,7 +825,7 @@ complex double z;
]],[[ ]],[[
z = 1.0fi; z = 1.0fi;
]])], ]])],
[AC_DEFINE(GUILE_I,1.0fi) [AC_DEFINE([GUILE_I],1.0fi)
AC_MSG_RESULT([1.0fi])], AC_MSG_RESULT([1.0fi])],
[ac_cv_type_complex_double=no [ac_cv_type_complex_double=no
AC_MSG_RESULT([not available])])]) AC_MSG_RESULT([not available])])])
@ -858,7 +858,7 @@ main (void)
[guile_cv_use_csqrt="yes, hopefully (cross-compiling)"])]) [guile_cv_use_csqrt="yes, hopefully (cross-compiling)"])])
case $guile_cv_use_csqrt in case $guile_cv_use_csqrt in
yes*) yes*)
AC_DEFINE(HAVE_USABLE_CSQRT, 1, [Define to 1 if csqrt is bug-free]) AC_DEFINE([HAVE_USABLE_CSQRT], 1, [Define to 1 if csqrt is bug-free])
;; ;;
esac esac
fi fi
@ -921,14 +921,14 @@ AC_CACHE_CHECK([return type of usleep], guile_cv_func_usleep_return_type,
[guile_cv_func_usleep_return_type=int])]) [guile_cv_func_usleep_return_type=int])])
case "$guile_cv_func_usleep_return_type" in case "$guile_cv_func_usleep_return_type" in
"void" ) "void" )
AC_DEFINE(USLEEP_RETURNS_VOID, 1, AC_DEFINE([USLEEP_RETURNS_VOID], 1,
[Define if the system headers declare usleep to return void.]) [Define if the system headers declare usleep to return void.])
;; ;;
esac esac
AC_CHECK_HEADER(sys/un.h, have_sys_un_h=1) AC_CHECK_HEADER(sys/un.h, have_sys_un_h=1)
if test -n "$have_sys_un_h" ; then if test -n "$have_sys_un_h" ; then
AC_DEFINE(HAVE_UNIX_DOMAIN_SOCKETS, 1, AC_DEFINE([HAVE_UNIX_DOMAIN_SOCKETS], 1,
[Define if the system supports Unix-domain (file-domain) sockets.]) [Define if the system supports Unix-domain (file-domain) sockets.])
fi fi
@ -962,7 +962,7 @@ extern char *__libc_stack_end;]],
AC_MSG_RESULT($guile_cv_have_libc_stack_end) AC_MSG_RESULT($guile_cv_have_libc_stack_end)
if test $guile_cv_have_libc_stack_end = yes; then if test $guile_cv_have_libc_stack_end = yes; then
AC_DEFINE(HAVE_LIBC_STACK_END, 1, AC_DEFINE([HAVE_LIBC_STACK_END], 1,
[Define if you have the __libc_stack_end variable.]) [Define if you have the __libc_stack_end variable.])
fi fi
@ -977,7 +977,7 @@ AC_CACHE_VAL(guile_cv_have_h_errno,
[guile_cv_have_h_errno=no])]) [guile_cv_have_h_errno=no])])
AC_MSG_RESULT($guile_cv_have_h_errno) AC_MSG_RESULT($guile_cv_have_h_errno)
if test $guile_cv_have_h_errno = yes; then if test $guile_cv_have_h_errno = yes; then
AC_DEFINE(HAVE_H_ERRNO, 1, [Define if h_errno is declared in netdb.h.]) AC_DEFINE([HAVE_H_ERRNO], 1, [Define if h_errno is declared in netdb.h.])
fi fi
AC_MSG_CHECKING(whether uint32_t is defined) AC_MSG_CHECKING(whether uint32_t is defined)
@ -994,7 +994,7 @@ AC_CACHE_VAL(guile_cv_have_uint32_t,
[guile_cv_have_uint32_t=no])]) [guile_cv_have_uint32_t=no])])
AC_MSG_RESULT($guile_cv_have_uint32_t) AC_MSG_RESULT($guile_cv_have_uint32_t)
if test $guile_cv_have_uint32_t = yes; then if test $guile_cv_have_uint32_t = yes; then
AC_DEFINE(HAVE_UINT32_T, 1, AC_DEFINE([HAVE_UINT32_T], 1,
[Define if uint32_t typedef is defined when netdb.h is include.]) [Define if uint32_t typedef is defined when netdb.h is include.])
fi fi
@ -1011,7 +1011,7 @@ AC_CACHE_VAL(guile_cv_have_ipv6,
[guile_cv_have_ipv6=no])]) [guile_cv_have_ipv6=no])])
AC_MSG_RESULT($guile_cv_have_ipv6) AC_MSG_RESULT($guile_cv_have_ipv6)
if test $guile_cv_have_ipv6 = yes; then if test $guile_cv_have_ipv6 = yes; then
AC_DEFINE(HAVE_IPV6, 1, [Define if you want support for IPv6.]) AC_DEFINE([HAVE_IPV6], 1, [Define if you want support for IPv6.])
fi fi
# included in rfc2553 but not in older implementations, e.g., glibc 2.1.3. # included in rfc2553 but not in older implementations, e.g., glibc 2.1.3.
@ -1027,7 +1027,7 @@ AC_CACHE_VAL(guile_cv_have_sin6_scope_id,
[guile_cv_have_sin6_scope_id=no])]) [guile_cv_have_sin6_scope_id=no])])
AC_MSG_RESULT($guile_cv_have_sin6_scope_id) AC_MSG_RESULT($guile_cv_have_sin6_scope_id)
if test $guile_cv_have_sin6_scope_id = yes; then if test $guile_cv_have_sin6_scope_id = yes; then
AC_DEFINE(HAVE_SIN6_SCOPE_ID, 1, AC_DEFINE([HAVE_SIN6_SCOPE_ID], 1,
[Define this if your IPv6 has sin6_scope_id in sockaddr_in6 struct.]) [Define this if your IPv6 has sin6_scope_id in sockaddr_in6 struct.])
fi fi
@ -1084,7 +1084,7 @@ else
fi])dnl fi])dnl
AC_MSG_RESULT($guile_cv_localtime_cache) AC_MSG_RESULT($guile_cv_localtime_cache)
if test $guile_cv_localtime_cache = yes; then if test $guile_cv_localtime_cache = yes; then
AC_DEFINE(LOCALTIME_CACHE, 1, [Define if localtime caches the TZ setting.]) AC_DEFINE([LOCALTIME_CACHE], 1, [Define if localtime caches the TZ setting.])
fi fi
if test "$enable_regex" = yes; then if test "$enable_regex" = yes; then
@ -1102,7 +1102,7 @@ if test "$enable_regex" = yes; then
if test "$ac_cv_func_regcomp_norx" = yes || if test "$ac_cv_func_regcomp_norx" = yes ||
test "$ac_cv_func_regcomp_regex" = yes || test "$ac_cv_func_regcomp_regex" = yes ||
test "$ac_cv_func_regcomp_rx" = yes; then test "$ac_cv_func_regcomp_rx" = yes; then
AC_DEFINE(HAVE_REGCOMP, 1, AC_DEFINE([HAVE_REGCOMP], 1,
[This is included as part of a workaround for a autoheader bug.]) [This is included as part of a workaround for a autoheader bug.])
fi fi
fi fi
@ -1134,7 +1134,7 @@ AC_LINK_IFELSE(AC_LANG_SOURCE(
volatile double x = 0.0; volatile double x = 0.0;
int main () { return (isinf(x) != 0); }]]), int main () { return (isinf(x) != 0); }]]),
[AC_MSG_RESULT([yes]) [AC_MSG_RESULT([yes])
AC_DEFINE(HAVE_ISINF, 1, AC_DEFINE([HAVE_ISINF], 1,
[Define to 1 if you have the `isinf' macro or function.])], [Define to 1 if you have the `isinf' macro or function.])],
[AC_MSG_RESULT([no])]) [AC_MSG_RESULT([no])])
AC_MSG_CHECKING([for isnan]) AC_MSG_CHECKING([for isnan])
@ -1143,7 +1143,7 @@ AC_LINK_IFELSE(AC_LANG_SOURCE(
volatile double x = 0.0; volatile double x = 0.0;
int main () { return (isnan(x) != 0); }]]), int main () { return (isnan(x) != 0); }]]),
[AC_MSG_RESULT([yes]) [AC_MSG_RESULT([yes])
AC_DEFINE(HAVE_ISNAN, 1, AC_DEFINE([HAVE_ISNAN], 1,
[Define to 1 if you have the `isnan' macro or function.])], [Define to 1 if you have the `isnan' macro or function.])],
[AC_MSG_RESULT([no])]) [AC_MSG_RESULT([no])])
@ -1245,7 +1245,7 @@ AC_CHECK_TYPE([GC_fn_type],
AC_CHECK_SIZEOF(float) AC_CHECK_SIZEOF(float)
if test "$ac_cv_sizeof_float" -le "$ac_cv_sizeof_long"; then if test "$ac_cv_sizeof_float" -le "$ac_cv_sizeof_long"; then
AC_DEFINE(SCM_SINGLES, 1, AC_DEFINE([SCM_SINGLES], 1,
[Define this if floats are the same size as longs.]) [Define this if floats are the same size as longs.])
fi fi
@ -1259,7 +1259,7 @@ AC_CACHE_VAL(scm_cv_struct_linger,
[scm_cv_struct_linger="no"])) [scm_cv_struct_linger="no"]))
AC_MSG_RESULT($scm_cv_struct_linger) AC_MSG_RESULT($scm_cv_struct_linger)
if test $scm_cv_struct_linger = yes; then if test $scm_cv_struct_linger = yes; then
AC_DEFINE(HAVE_STRUCT_LINGER, 1, AC_DEFINE([HAVE_STRUCT_LINGER], 1,
[Define this if your system defines struct linger, for use with the [Define this if your system defines struct linger, for use with the
getsockopt and setsockopt system calls.]) getsockopt and setsockopt system calls.])
fi fi
@ -1278,7 +1278,7 @@ AC_CACHE_VAL(scm_cv_struct_timespec,
[scm_cv_struct_timespec="no"])) [scm_cv_struct_timespec="no"]))
AC_MSG_RESULT($scm_cv_struct_timespec) AC_MSG_RESULT($scm_cv_struct_timespec)
if test $scm_cv_struct_timespec = yes; then if test $scm_cv_struct_timespec = yes; then
AC_DEFINE(HAVE_STRUCT_TIMESPEC, 1, AC_DEFINE([HAVE_STRUCT_TIMESPEC], 1,
[Define this if your system defines struct timespec via either <time.h> or <pthread.h>.]) [Define this if your system defines struct timespec via either <time.h> or <pthread.h>.])
fi fi
@ -1424,7 +1424,7 @@ int main ()
#endif #endif
]])], ]])],
[works=yes [works=yes
AC_DEFINE(PTHREAD_ATTR_GETSTACK_WORKS, [1], [Define when pthread_att_get_stack works for the main thread])], AC_DEFINE([PTHREAD_ATTR_GETSTACK_WORKS], [1], [Define when pthread_att_get_stack works for the main thread])],
[works=no], [works=no],
[]) [])
CFLAGS="$old_CFLAGS" CFLAGS="$old_CFLAGS"

2
examples/compat/acinclude.m4
View file

@ -12,7 +12,7 @@ AC_DEFUN([GUILE_COMPAT],
ac_cv_have_scm_t_bits=no)]) ac_cv_have_scm_t_bits=no)])
AC_MSG_RESULT($ac_cv_have_scm_t_bits) AC_MSG_RESULT($ac_cv_have_scm_t_bits)
if test $ac_cv_have_scm_t_bits = yes; then if test $ac_cv_have_scm_t_bits = yes; then
AC_DEFINE(HAVE_SCM_T_BITS) AC_DEFINE([HAVE_SCM_T_BITS])
fi fi
LIBS="$guile_compat_save_LIBS" LIBS="$guile_compat_save_LIBS"
CFLAGS="$guile_compat_save_CFLAGS"]) CFLAGS="$guile_compat_save_CFLAGS"])