aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2006-07-02 01:17:37 +0000
committerYang Tse <yangsita@gmail.com>2006-07-02 01:17:37 +0000
commit39745ac38ebc522fd77538515498348f0c30e10c (patch)
tree3e3d050a92bcb850c8ff3f9c76a4029dee6faa1a
parentcacf8bbb58a4df6ab9195d17ed177be9c6c86f96 (diff)
Fix shell globbing in CURL_CHECK_FUNC_GETNAMEINFO
-rw-r--r--acinclude.m453
-rw-r--r--ares/acinclude.m42
2 files changed, 24 insertions, 31 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 11f5e798f..46b844de5 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -370,6 +370,9 @@ AC_DEFUN([CURL_CHECK_FUNC_GETNAMEINFO], [
set dummy `echo "$curl_cv_func_getnameinfo_args" | sed 's/\*/\*/g'`
IFS=$gni_prev_IFS
shift
+ #
+ gni_qual_type_arg1=$[1]
+ #
AC_DEFINE_UNQUOTED(GETNAMEINFO_TYPE_ARG2, $[2],
[Define to the type of arg 2 for getnameinfo.])
AC_DEFINE_UNQUOTED(GETNAMEINFO_TYPE_ARG46, $[3],
@@ -377,50 +380,42 @@ AC_DEFUN([CURL_CHECK_FUNC_GETNAMEINFO], [
AC_DEFINE_UNQUOTED(GETNAMEINFO_TYPE_ARG7, $[4],
[Define to the type of arg 7 for getnameinfo.])
#
- AC_MSG_WARN([Debug output - START])
- gni_qual_type_arg1=$[1]
- AC_MSG_WARN(D1 $gni_qual_type_arg1)
+ gni_opts=$-
+ #
+ case $gni_opts in
+ esac
+ *f*)
+ ;;
+ *)
+ set -f
+ ;;
+ esac
#
case "$gni_qual_type_arg1" in
const*)
- AC_MSG_WARN(D2 $gni_qual_type_arg1)
- gni_e1=`echo $gni_qual_type_arg1`
- gni_e2=`echo $gni_qual_type_arg1 | sed 's/\*/\*/g'`
- gni_e3=`echo $gni_qual_type_arg1 | sed 's/\*/\\*/g'`
- AC_MSG_WARN(E1 $gni_e1)
- AC_MSG_WARN(E1 $gni_e2)
- AC_MSG_WARN(E1 $gni_e3)
- gni_f1=`echo "$gni_qual_type_arg1"`
- gni_f2=`echo "$gni_qual_type_arg1" | sed 's/\*/\*/g'`
- gni_f3=`echo "$gni_qual_type_arg1" | sed 's/\*/\\*/g'`
- AC_MSG_WARN(F1 $gni_f1)
- AC_MSG_WARN(F1 $gni_f2)
- AC_MSG_WARN(F1 $gni_f3)
- gni_g1=`echo "${gni_qual_type_arg1}"`
- gni_g2=`echo "${gni_qual_type_arg1}" | sed 's/\*/\*/g'`
- gni_g3=`echo "${gni_qual_type_arg1}" | sed 's/\*/\\*/g'`
- AC_MSG_WARN(G1 $gni_g1)
- AC_MSG_WARN(G1 $gni_g2)
- AC_MSG_WARN(G1 $gni_g3)
- #
gni_qual_arg1=const
- gni_type_arg1=`echo $gni_qual_type_arg1 | sed 's/^const //' | sed 's/\*/\*/g'`
+ gni_type_arg1=`echo $gni_qual_type_arg1 | sed 's/^const //'`
;;
*)
gni_qual_arg1=
- gni_type_arg1=`echo $gni_qual_type_arg1 | sed 's/\*/\*/g'`
+ gni_type_arg1=$gni_qual_type_arg1
;;
esac
- AC_MSG_WARN(Z1 $gni_type_arg1)
- AC_MSG_WARN(Z2 $[gni_type_arg1])
- AC_MSG_WARN(Z3 ${gni_type_arg1})
- AC_MSG_WARN([Debug output - END])
#
AC_DEFINE_UNQUOTED(GETNAMEINFO_QUAL_ARG1, $gni_qual_arg1,
[Define to the type qualifier of arg 1 for getnameinfo.])
AC_DEFINE_UNQUOTED(GETNAMEINFO_TYPE_ARG1, $gni_type_arg1,
[Define to the type of arg 1 for getnameinfo.])
#
+ case $gni_opts in
+ esac
+ *f*)
+ ;;
+ *)
+ set +f
+ ;;
+ esac
+ #
AC_DEFINE_UNQUOTED(HAVE_GETNAMEINFO, 1,
[Define to 1 if you have the getnameinfo function.])
ac_cv_func_getnameinfo="yes"
diff --git a/ares/acinclude.m4 b/ares/acinclude.m4
index 09bf743cb..96e0a1740 100644
--- a/ares/acinclude.m4
+++ b/ares/acinclude.m4
@@ -362,7 +362,6 @@ AC_DEFUN([CURL_CHECK_FUNC_GETNAMEINFO], [
gni_opts=$-
#
case $gni_opts in
- esac
*f*)
;;
*)
@@ -387,7 +386,6 @@ AC_DEFUN([CURL_CHECK_FUNC_GETNAMEINFO], [
[Define to the type of arg 1 for getnameinfo.])
#
case $gni_opts in
- esac
*f*)
;;
*)