cvs | 2 Jul 2006 03:17
Picon
Favicon

yangtse: curl/ares acinclude.m4,1.33,1.34

Update of /cvsroot/curl/curl/ares
In directory labb:/tmp/cvs-serv24531/ares

Modified Files:
	acinclude.m4 
Log Message:
Fix shell globbing in CURL_CHECK_FUNC_GETNAMEINFO

Index: acinclude.m4
===================================================================
RCS file: /cvsroot/curl/curl/ares/acinclude.m4,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- acinclude.m4	1 Jul 2006 02:53:18 -0000	1.33
+++ acinclude.m4	2 Jul 2006 01:17:37 -0000	1.34
 <at>  <at>  -349,6 +349,9  <at>  <at> 
       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],
 <at>  <at>  -356,7 +359,16  <at>  <at> 
       AC_DEFINE_UNQUOTED(GETNAMEINFO_TYPE_ARG7, $[4],
         [Define to the type of arg 7 for getnameinfo.])
       #
-      gni_qual_type_arg1=$[1]
+      gni_opts=$-
+      #
+      case $gni_opts in
+      esac
+        *f*)
+          ;;
+        *)
+          set -f
+          ;;
+      esac
       #
       case "$gni_qual_type_arg1" in
         const*)
 <at>  <at>  -374,6 +386,15  <at>  <at> 
       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"

Gmane