Commit 90e2510e authored by Yang Tse's avatar Yang Tse
Browse files

Rename reentrant.m4 to avoid filename clash.

parent 9251dd7b

ares/m4/reentrant.m4→ares/m4/cares-reentrant.m4

+29 −7
Original line number Original line Diff line number Diff line 
#***************************************************************************

# $Id$

#

# Copyright (C) 2008 by Daniel Stenberg et al

#

# Permission to use, copy, modify, and distribute this software and its

# documentation for any purpose and without fee is hereby granted, provided

# that the above copyright notice appear in all copies and that both that

# copyright notice and this permission notice appear in supporting

# documentation, and that the name of M.I.T. not be used in advertising or

# publicity pertaining to distribution of the software without specific,

# written prior permission.  M.I.T. makes no representations about the

# suitability of this software for any purpose.  It is provided "as is"

# without express or implied warranty.

#

#***************************************************************************





# File version for 'aclocal' use.

# serial 1.1





# serial 1.10

dnl Note 1

dnl ------

dnl None of the CARES_CHECK_NEED_REENTRANT_* macros shall use HAVE_FOO_H to

dnl conditionally include header files. These macros are used early in the

dnl configure process much before header file availability is known.









dnl CARES_CHECK_NEED_REENTRANT_GMTIME_R

dnl CARES_CHECK_NEED_REENTRANT_GMTIME_R
@@ -354,13 +376,13 @@ dnl and that in turn setup.h will define _REENTRANT. 
dnl Internal macro for CARES_CONFIGURE_REENTRANT.

dnl Internal macro for CARES_CONFIGURE_REENTRANT.





AC_DEFUN([CARES_CONFIGURE_FROM_NOW_ON_WITH_REENTRANT], [

AC_DEFUN([CARES_CONFIGURE_FROM_NOW_ON_WITH_REENTRANT], [

AC_DEFINE([NEED_REENTRANT], [1],

AC_DEFINE(NEED_REENTRANT, 1,

  [Define to 1 if _REENTRANT preprocessor symbol must be defined.])

  [Define to 1 if _REENTRANT preprocessor symbol must be defined.])

cat >>confdefs.h <<_ACEOF

cat >>confdefs.h <<_EOF

#ifndef _REENTRANT

#ifndef _REENTRANT

#  define _REENTRANT

#  define _REENTRANT

#endif

#endif

_ACEOF

_EOF

])

])

m4/reentrant.m4→m4/curl-reentrant.m4

+11 −5
Original line number Original line Diff line number Diff line
@@ -21,8 +21,14 @@ 
# $Id$

# $Id$

#***************************************************************************

#***************************************************************************





# File version for 'aclocal' use.

# serial 1.1





# serial 1.12

dnl Note 1

dnl ------

dnl None of the CURL_CHECK_NEED_REENTRANT_* macros shall use HAVE_FOO_H to

dnl conditionally include header files. These macros are used early in the

dnl configure process much before header file availability is known.









dnl CURL_CHECK_NEED_REENTRANT_GMTIME_R

dnl CURL_CHECK_NEED_REENTRANT_GMTIME_R
@@ -376,13 +382,13 @@ dnl and that in turn setup.h will define _REENTRANT. 
dnl Internal macro for CURL_CONFIGURE_REENTRANT.

dnl Internal macro for CURL_CONFIGURE_REENTRANT.





AC_DEFUN([CURL_CONFIGURE_FROM_NOW_ON_WITH_REENTRANT], [

AC_DEFUN([CURL_CONFIGURE_FROM_NOW_ON_WITH_REENTRANT], [

AC_DEFINE([NEED_REENTRANT], [1],

AC_DEFINE(NEED_REENTRANT, 1,

  [Define to 1 if _REENTRANT preprocessor symbol must be defined.])

  [Define to 1 if _REENTRANT preprocessor symbol must be defined.])

cat >>confdefs.h <<_ACEOF

cat >>confdefs.h <<_EOF

#ifndef _REENTRANT

#ifndef _REENTRANT

#  define _REENTRANT

#  define _REENTRANT

#endif

#endif

_ACEOF

_EOF

])

])