Commit f49427d3 authored by Yang Tse's avatar Yang Tse
Browse files

Use *_CHECK_PATH_SEPARATOR_REQUIRED to ensure that *_CHECK_PATH_SEPARATOR 

is only expanded and included once in the configure script.
parent 04e8ff84

ares/configure.ac

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ CARES_CHECK_OPTION_OPTIMIZE 
CARES_CHECK_OPTION_WARNINGS

CARES_CHECK_OPTION_CURLDEBUG



CARES_CHECK_PATH_SEPARATOR

CARES_CHECK_PATH_SEPARATOR_REQUIRED



dnl SED is mandatory for configure process and libtool.

dnl Set it now, allowing it to be changed later.

ares/m4/cares-system.m4

+11 −2
Original line number Diff line number Diff line 
#***************************************************************************

# $Id$

#

# Copyright (C) 2008 by Daniel Stenberg et al

# Copyright (C) 2008 - 2009 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
@@ -16,7 +16,7 @@ 
#***************************************************************************



# File version for 'aclocal' use. Keep it a single number.

# serial 2

# serial 3





dnl CARES_CHECK_PATH_SEPARATOR
@@ -72,3 +72,12 @@ AC_DEFUN([CARES_CHECK_PATH_SEPARATOR], [ 
])





dnl CARES_CHECK_PATH_SEPARATOR_REQUIRED

dnl -------------------------------------------------

dnl Use this to ensure that the path separator check

dnl macro is only expanded and included once.



AC_DEFUN([CARES_CHECK_PATH_SEPARATOR_REQUIRED], [

  AC_REQUIRE([CARES_CHECK_PATH_SEPARATOR])dnl

])

configure.ac

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ CURL_CHECK_OPTION_OPTIMIZE 
CURL_CHECK_OPTION_WARNINGS

CURL_CHECK_OPTION_CURLDEBUG



CURL_CHECK_PATH_SEPARATOR

CURL_CHECK_PATH_SEPARATOR_REQUIRED



dnl SED is mandatory for configure process and libtool.

dnl Set it now, allowing it to be changed later.

m4/curl-system.m4

+12 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#                            | (__| |_| |  _ <| |___

#                             \___|\___/|_| \_\_____|

#

# Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.

# Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.

#

# This software is licensed as described in the file COPYING, which

# you should have received as part of this distribution. The terms
@@ -22,7 +22,7 @@ 
#***************************************************************************



# File version for 'aclocal' use. Keep it a single number.

# serial 2

# serial 3





dnl CURL_CHECK_PATH_SEPARATOR
@@ -77,3 +77,13 @@ AC_DEFUN([CURL_CHECK_PATH_SEPARATOR], [ 
  AC_SUBST([PATH])

])





dnl CURL_CHECK_PATH_SEPARATOR_REQUIRED

dnl -------------------------------------------------

dnl Use this to ensure that the path separator check

dnl macro is only expanded and included once.



AC_DEFUN([CURL_CHECK_PATH_SEPARATOR_REQUIRED], [

  AC_REQUIRE([CURL_CHECK_PATH_SEPARATOR])dnl

])