diff --git a/ase/config.h.in b/ase/config.h.in index 5ced01e9..3719910b 100644 --- a/ase/config.h.in +++ b/ase/config.h.in @@ -88,8 +88,8 @@ /* in6.scope_id */ #undef XP_HAVE_IN6_SCOPE_ID -/* getaddrinfo */ -#undef XP_HAVE_GETADDRINFO +/* sockaddr_storage.ss_family */ +#undef XP_HAVE_SS_FAMILY /* char is wchar */ #undef XP_CHAR_IS_WCHAR diff --git a/ase/configure b/ase/configure index 065718cd..e1a37ffa 100755 --- a/ase/configure +++ b/ase/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 1.56 . +# From configure.ac Revision: 1.57 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for xpkit deb-0.1.0. # @@ -5159,6 +5159,122 @@ _ACEOF fi +echo "$as_me:$LINENO: checking for struct sockaddr_storage.ss_family" >&5 +echo $ECHO_N "checking for struct sockaddr_storage.ss_family... $ECHO_C" >&6 +if test "${ac_cv_member_struct_sockaddr_storage_ss_family+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. */ +#include + #include + #include + +int +main () +{ +static struct sockaddr_storage ac_aggr; +if (ac_aggr.ss_family) +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_member_struct_sockaddr_storage_ss_family=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + #include + #include + +int +main () +{ +static struct sockaddr_storage ac_aggr; +if (sizeof ac_aggr.ss_family) +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_member_struct_sockaddr_storage_ss_family=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_member_struct_sockaddr_storage_ss_family=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_storage_ss_family" >&5 +echo "${ECHO_T}$ac_cv_member_struct_sockaddr_storage_ss_family" >&6 +if test $ac_cv_member_struct_sockaddr_storage_ss_family = yes; then + +cat >>confdefs.h <<\_ACEOF +#define XP_HAVE_SS_FAMILY +_ACEOF + +fi + + # Checks for typedefs, structures, and compiler characteristics. echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 @@ -11331,105 +11447,6 @@ _ACEOF #AC_FUNC_REALLOC #AC_CHECK_FUNCS([memset]) -echo "$as_me:$LINENO: checking for getaddrinfo" >&5 -echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6 -if test "${ac_cv_func_getaddrinfo+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. */ -/* Define getaddrinfo to an innocuous variant, in case declares getaddrinfo. - For example, HP-UX 11i declares gettimeofday. */ -#define getaddrinfo innocuous_getaddrinfo - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getaddrinfo (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef getaddrinfo - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -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 getaddrinfo (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_getaddrinfo) || defined (__stub___getaddrinfo) -choke me -#else -char (*f) () = getaddrinfo; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != getaddrinfo; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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_exeext' - { (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_func_getaddrinfo=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_getaddrinfo=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5 -echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6 -if test $ac_cv_func_getaddrinfo = yes; then - -cat >>confdefs.h <<\_ACEOF -#define XP_HAVE_GETADDRINFO -_ACEOF - -fi - - # Check whether --enable-wchar or --disable-wchar was given. if test "${enable_wchar+set}" = set; then enableval="$enable_wchar" @@ -11464,7 +11481,7 @@ then CFLAGS="$CFLAGS -D_REENTRANT -D_THREAD_SAFE" fi - ac_config_files="$ac_config_files Makefile utils/Makefile xp/Makefile xpp/Makefile xp/bas/Makefile xp/net/Makefile xp/utl/Makefile xp/stx/Makefile xp/awk/Makefile xp/lsp/Makefile xp/mp/Makefile xp/lnx/Makefile xp/missing/Makefile xp/test/bas/Makefile xp/test/net/Makefile xp/test/utl/Makefile xp/test/stx/Makefile xp/test/awk/Makefile xp/test/lsp/Makefile xp/test/lnx/Makefile xpp/bas/Makefile xpp/net/Makefile xpp/sys/Makefile xpp/utl/Makefile xpp/test/bas/Makefile xpp/test/net/Makefile xpp/test/sys/Makefile xpp/test/utl/Makefile xpo/bas/Makefile xpo/net/Makefile xpo/test/bas/Makefile xpo/test/net/Makefile" + ac_config_files="$ac_config_files Makefile utils/Makefile xp/Makefile xpp/Makefile xp/bas/Makefile xp/net/Makefile xp/utl/Makefile xp/stx/Makefile xp/awk/Makefile xp/lsp/Makefile xp/mp/Makefile xp/lnx/Makefile xp/test/bas/Makefile xp/test/net/Makefile xp/test/utl/Makefile xp/test/stx/Makefile xp/test/awk/Makefile xp/test/lsp/Makefile xp/test/lnx/Makefile xpp/bas/Makefile xpp/net/Makefile xpp/sys/Makefile xpp/utl/Makefile xpp/test/bas/Makefile xpp/test/net/Makefile xpp/test/sys/Makefile xpp/test/utl/Makefile xpo/bas/Makefile xpo/net/Makefile xpo/test/bas/Makefile xpo/test/net/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -12002,7 +12019,6 @@ do "xp/lsp/Makefile" ) CONFIG_FILES="$CONFIG_FILES xp/lsp/Makefile" ;; "xp/mp/Makefile" ) CONFIG_FILES="$CONFIG_FILES xp/mp/Makefile" ;; "xp/lnx/Makefile" ) CONFIG_FILES="$CONFIG_FILES xp/lnx/Makefile" ;; - "xp/missing/Makefile" ) CONFIG_FILES="$CONFIG_FILES xp/missing/Makefile" ;; "xp/test/bas/Makefile" ) CONFIG_FILES="$CONFIG_FILES xp/test/bas/Makefile" ;; "xp/test/net/Makefile" ) CONFIG_FILES="$CONFIG_FILES xp/test/net/Makefile" ;; "xp/test/utl/Makefile" ) CONFIG_FILES="$CONFIG_FILES xp/test/utl/Makefile" ;; diff --git a/ase/configure.ac b/ase/configure.ac index b308fea0..a80e9dd6 100644 --- a/ase/configure.ac +++ b/ase/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.53) AC_INIT([xpkit], [deb-0.1.0]) -AC_REVISION([$Revision: 1.57 $]) +AC_REVISION([$Revision: 1.58 $]) AC_CONFIG_HEADER([xp/config.h]) # Checks for programs. @@ -42,6 +42,13 @@ AC_CHECK_MEMBER(struct sockaddr_in6.sin6_scope_id, #include #include ]) +AC_CHECK_MEMBER(struct sockaddr_storage.ss_family, + [AC_DEFINE([XP_HAVE_SS_FAMILY],[],[sockaddr_storage.ss_family])], + [], + [#include + #include + #include ]) + # Checks for typedefs, structures, and compiler characteristics. AC_C_BIGENDIAN( [AC_DEFINE([XP_ENDIAN_BIG],[],[Big Endian])], @@ -76,8 +83,6 @@ AC_CHECK_SIZEOF(long double) #AC_FUNC_REALLOC #AC_CHECK_FUNCS([memset]) -AC_CHECK_FUNC(getaddrinfo,[AC_DEFINE([XP_HAVE_GETADDRINFO],[],[getaddrinfo])]) - AC_ARG_ENABLE([wchar], [AC_HELP_STRING([--enable-wchar], [use wchar_t a default charater type when enabled (default. yes)])], enable_wchar_is=$enableval,enable_wchar_is=yes) @@ -100,7 +105,6 @@ AC_CONFIG_FILES([ Makefile utils/Makefile xp/Makefile xpp/Makefile xp/bas/Makefile xp/net/Makefile xp/utl/Makefile xp/stx/Makefile xp/awk/Makefile xp/lsp/Makefile xp/mp/Makefile xp/lnx/Makefile - xp/missing/Makefile xp/test/bas/Makefile xp/test/net/Makefile xp/test/utl/Makefile xp/test/stx/Makefile xp/test/awk/Makefile xp/test/lsp/Makefile xp/test/lnx/Makefile