Commit 4e4b6de5 authored by Yang Tse's avatar Yang Tse
Browse files

provide a common PATH_SEPARATOR check method which is required by 

upcomming work to support the broadest range of Autoconf versions
parent 9aac2328

ares/configure.ac

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ CARES_CHECK_OPTION_DEBUG 
CARES_CHECK_OPTION_OPTIMIZE

CARES_CHECK_OPTION_WARNINGS



CARES_CHECK_PATH_SEPARATOR



dnl SED is mandatory for configure process and libtool.

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

AC_PATH_PROG([SED], [sed], [not_found],

ares/m4/cares-override.m4

+18 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#***************************************************************************



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

# serial 1

# serial 2



dnl CARES_OVERRIDE_AUTOCONF

dnl -------------------------------------------------
@@ -39,7 +39,8 @@ m4_define([AC_LANG_PROGRAM(C)], 
int main (void)

{

$2

; return 0;

 ;

 return 0;

}])



dnl Override Autoconf's AC_LANG_CALL (C)
@@ -84,4 +85,19 @@ choke me 
#endif

], [return $1 ();])])



dnl Override Autoconf's PATH_SEPARATOR check

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

dnl This is done to ensure that the same check is

dnl used across different Autoconf versions and to

dnl allow us to use this macro early enough in the

dnl configure script.



m4_define([_AS_PATH_SEPARATOR_PREPARE],

[CARES_CHECK_PATH_SEPARATOR

m4_define([$0],[])])



m4_define([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR],

[CARES_CHECK_PATH_SEPARATOR

m4_define([$0],[])])

ares/m4/cares-system.m4

0 → 100644
+76 −0
Original line number 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. Keep it a single number.

# serial 1





dnl CARES_CHECK_PATH_SEPARATOR

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

dnl Check and compute the path separator for us. This

dnl path separator is the symbol used to diferentiate

dnl or separate paths inside the PATH environment var.



AC_DEFUN([CARES_CHECK_PATH_SEPARATOR], [

  if test -z "$cares_cv_PATH_SEPARATOR"; then

    if test -z "$PATH"; then

      AC_MSG_ERROR([PATH not set. Cannot continue without PATH being set.])

    fi

    dnl Directory count in PATH when using a colon separator.

    tst_dirs_col=0

    tst_save_IFS=$IFS; IFS=':'

    for tst_dir in $PATH; do

      IFS=$tst_save_IFS

      test -d "$tst_dir" && tst_dirs_col=`expr $tst_dirs_col + 1`

    done

    IFS=$tst_save_IFS

    dnl Directory count in PATH when using a semicolon separator.

    tst_dirs_sem=0

    tst_save_IFS=$IFS; IFS=';'

    for tst_dir in $PATH; do

      IFS=$tst_save_IFS

      test -d "$tst_dir" && tst_dirs_sem=`expr $tst_dirs_sem + 1`

    done

    IFS=$tst_save_IFS

    if test $tst_dirs_sem -eq $tst_dirs_col; then

      dnl When both counting methods give the same result we do not want to

      dnl chose one over the other, and consider auto-detection not possible.

      if test -z "$PATH_SEPARATOR"; then

        dnl Stop dead until user provides PATH_SEPARATOR definition.

        AC_MSG_ERROR([PATH_SEPARATOR not set. Cannot continue without it.])

      fi

    else

      dnl Separator with the greater directory count is the auto-detected one.

      if test $tst_dirs_sem -gt $tst_dirs_col; then

        tst_auto_separator=';'

        PATH_SEPARATOR=';'

      else

        tst_auto_separator=':'

        PATH_SEPARATOR=':'

      fi

      if test -z "$PATH_SEPARATOR"; then

        dnl Simply use the auto-detected one when not already set.

        PATH_SEPARATOR="$tst_auto_separator"

      fi

    fi

    cares_cv_PATH_SEPARATOR="$PATH_SEPARATOR"

  fi

  AC_SUBST([PATH_SEPARATOR])

  AC_SUBST([PATH])

])

configure.ac

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ CURL_CHECK_OPTION_DEBUG 
CURL_CHECK_OPTION_OPTIMIZE

CURL_CHECK_OPTION_WARNINGS



CURL_CHECK_PATH_SEPARATOR



dnl SED is mandatory for configure process and libtool.

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

AC_PATH_PROG([SED], [sed], [not_found],

m4/curl-override.m4

+18 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#***************************************************************************



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

# serial 1

# serial 2



dnl CURL_OVERRIDE_AUTOCONF

dnl -------------------------------------------------
@@ -39,7 +39,8 @@ m4_define([AC_LANG_PROGRAM(C)], 
int main (void)

{

$2

; return 0;

 ;

 return 0;

}])



dnl Override Autoconf's AC_LANG_CALL (C)
@@ -84,4 +85,19 @@ choke me 
#endif

], [return $1 ();])])



dnl Override Autoconf's PATH_SEPARATOR check

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

dnl This is done to ensure that the same check is

dnl used across different Autoconf versions and to

dnl allow us to use this macro early enough in the

dnl configure script.



m4_define([_AS_PATH_SEPARATOR_PREPARE],

[CURL_CHECK_PATH_SEPARATOR

m4_define([$0],[])])



m4_define([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR],

[CURL_CHECK_PATH_SEPARATOR

m4_define([$0],[])])