X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=configure;h=9c6efe4313f8d4c2e1bdc4114b8fbb379644f75a;hb=27829b920327ad00cdc6a388b247b14e1c95faf5;hp=ffc21f10b5ad4d3f2425ee8ab69eea07c69078ec;hpb=826562685ab9bff11f6a38cf19ced16bc04b293f;p=util-vserver.git diff --git a/configure b/configure index ffc21f1..9c6efe4 100755 --- a/configure +++ b/configure @@ -27820,17 +27820,9 @@ fi done - for b in 8 16 32 64; do - for s in s u; do - ensc_libnl_stdint_type= - if test x"$s" = xu; then - ensc_libnl_stdint_type=u - fi - ensc_libnl_stdint_type="${ensc_libnl_stdint_type}int${b}_t" - as_ac_Type=`echo "ac_cv_type___${s}${b}" | $as_tr_sh` -echo "$as_me:$LINENO: checking for __${s}${b}" >&5 -echo $ECHO_N "checking for __${s}${b}... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Type+set}\" = set"; then + echo "$as_me:$LINENO: checking for __s64" >&5 +echo $ECHO_N "checking for __s64... $ECHO_C" >&6 +if test "${ac_cv_type___s64+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -27844,13 +27836,87 @@ $ac_includes_default # include #endif +int +main () +{ +if ((__s64 *) 0) + return 0; +if (sizeof (__s64)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type___s64=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type___s64=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type___s64" >&5 +echo "${ECHO_T}$ac_cv_type___s64" >&6 +if test $ac_cv_type___s64 = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE___S64 1 +_ACEOF + + : +else + +cat >>confdefs.h <<_ACEOF +#define __s64 int64_t +_ACEOF + +fi + + echo "$as_me:$LINENO: checking for __u64" >&5 +echo $ECHO_N "checking for __u64... $ECHO_C" >&6 +if test "${ac_cv_type___u64+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#ifdef HAVE_ASM_TYPES_H +# include +#endif int main () { -if ((__${s}${b} *) 0) +if ((__u64 *) 0) return 0; -if (sizeof (__${s}${b})) +if (sizeof (__u64)) return 0; ; return 0; @@ -27878,34 +27944,32 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_Type=yes" + ac_cv_type___u64=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Type=no" +ac_cv_type___u64=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Type'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Type'}'`" >&6 -if test `eval echo '${'$as_ac_Type'}'` = yes; then +echo "$as_me:$LINENO: result: $ac_cv_type___u64" >&5 +echo "${ECHO_T}$ac_cv_type___u64" >&6 +if test $ac_cv_type___u64 = yes; then cat >>confdefs.h <<_ACEOF -#define `echo "HAVE___${s}${b}" | $as_tr_cpp` 1 +#define HAVE___U64 1 _ACEOF : else cat >>confdefs.h <<_ACEOF -#define __${s}${b} $ensc_libnl_stdint_type +#define __u64 uint64_t _ACEOF fi - done - done fi if test x"$ensc_have_libnl" = xyes; then @@ -27980,9 +28044,9 @@ done fi if test x"$ensc_have_libnl" = xyes; then - echo "$as_me:$LINENO: checking for rtnl_addr_alloc in -lnl" >&5 -echo $ECHO_N "checking for rtnl_addr_alloc in -lnl... $ECHO_C" >&6 -if test "${ac_cv_lib_nl_rtnl_addr_alloc+set}" = set; then + echo "$as_me:$LINENO: checking for nlmsg_get_src in -lnl" >&5 +echo $ECHO_N "checking for nlmsg_get_src in -lnl... $ECHO_C" >&6 +if test "${ac_cv_lib_nl_nlmsg_get_src+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -28000,11 +28064,11 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char rtnl_addr_alloc (); +char nlmsg_get_src (); int main () { -rtnl_addr_alloc (); +nlmsg_get_src (); ; return 0; } @@ -28031,20 +28095,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_nl_rtnl_addr_alloc=yes + ac_cv_lib_nl_nlmsg_get_src=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_nl_rtnl_addr_alloc=no +ac_cv_lib_nl_nlmsg_get_src=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_nl_rtnl_addr_alloc" >&5 -echo "${ECHO_T}$ac_cv_lib_nl_rtnl_addr_alloc" >&6 -if test $ac_cv_lib_nl_rtnl_addr_alloc = yes; then +echo "$as_me:$LINENO: result: $ac_cv_lib_nl_nlmsg_get_src" >&5 +echo "${ECHO_T}$ac_cv_lib_nl_nlmsg_get_src" >&6 +if test $ac_cv_lib_nl_nlmsg_get_src = yes; then : else ensc_have_libnl=no