Alexandre Julliard : configure: Remove some no longer needed configure checks.
Alexandre Julliard
julliard at winehq.org
Thu Oct 7 16:21:21 CDT 2021
Module: wine
Branch: master
Commit: ae9f64c4642fdb3d1ff3bc54220ae55b2e0a3e4f
URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae9f64c4642fdb3d1ff3bc54220ae55b2e0a3e4f
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Oct 7 14:35:03 2021 +0200
configure: Remove some no longer needed configure checks.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
configure | 98 +++--------------------------------------------------
configure.ac | 36 ++------------------
include/config.h.in | 24 -------------
libs/wine/config.c | 2 --
4 files changed, 6 insertions(+), 154 deletions(-)
diff --git a/configure b/configure
index 8a7e8fece1e..7fdd2085ad1 100755
--- a/configure
+++ b/configure
@@ -7480,7 +7480,6 @@ for ac_header in \
elf.h \
float.h \
gettext-po.h \
- grp.h \
gsm.h \
gsm/gsm.h \
ieeefp.h \
@@ -17893,8 +17892,6 @@ esac
ac_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $BUILTINFLAG"
for ac_func in \
- __res_get_state \
- __res_getservers \
epoll_create \
fork \
fstatfs \
@@ -17992,13 +17989,12 @@ fi
ac_wine_check_funcs_save_LIBS="$LIBS"
LIBS="$LIBS $DL_LIBS"
-for ac_func in dladdr dlinfo
+for ac_func in dlinfo
do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ ac_fn_c_check_func "$LINENO" "dlinfo" "ac_cv_func_dlinfo"
+if test "x$ac_cv_func_dlinfo" = xyes; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_DLINFO 1
_ACEOF
fi
@@ -18569,47 +18565,6 @@ _ACEOF
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for if_nameindex" >&5
-$as_echo_n "checking for if_nameindex... " >&6; }
-if ${wine_cv_have_if_nameindex+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NET_IF_H
-# include <net/if.h>
-#endif
-int
-main ()
-{
-struct if_nameindex *p = if_nameindex(); return p->if_index;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- wine_cv_have_if_nameindex=yes
-else
- wine_cv_have_if_nameindex=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_have_if_nameindex" >&5
-$as_echo "$wine_cv_have_if_nameindex" >&6; }
-if test "$wine_cv_have_if_nameindex" = "yes"
-then
-
-$as_echo "#define HAVE_IF_NAMEINDEX 1" >>confdefs.h
-
-fi
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigaddset" >&5
$as_echo_n "checking for sigaddset... " >&6; }
if ${wine_cv_have_sigaddset+:} false; then :
@@ -18751,22 +18706,6 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
-fi
-ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_sockaddr_sa_len" "#include <sys/types.h>
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-#ifdef HAVE_SYS_UN_H
-# include <sys/un.h>
-#endif
-"
-if test "x$ac_cv_member_struct_sockaddr_sa_len" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_SOCKADDR_SA_LEN 1
-_ACEOF
-
-
fi
ac_fn_c_check_member "$LINENO" "struct sockaddr_un" "sun_len" "ac_cv_member_struct_sockaddr_un_sun_len" "#include <sys/types.h>
#ifdef HAVE_SYS_SOCKET_H
@@ -18867,15 +18806,6 @@ _ACEOF
fi
-ac_fn_c_check_member "$LINENO" "struct stat" "st_blocks" "ac_cv_member_struct_stat_st_blocks" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_blocks" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_BLOCKS 1
-_ACEOF
-
-
-fi
ac_fn_c_check_member "$LINENO" "struct stat" "st_mtim" "ac_cv_member_struct_stat_st_mtim" "$ac_includes_default"
if test "x$ac_cv_member_struct_stat_st_mtim" = xyes; then :
@@ -19028,26 +18958,6 @@ _ACEOF
fi
-ac_fn_c_check_member "$LINENO" "ns_msg" "_msg_ptr" "ac_cv_member_ns_msg__msg_ptr" "#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-# include <arpa/nameser.h>
-#endif
-"
-if test "x$ac_cv_member_ns_msg__msg_ptr" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_NS_MSG__MSG_PTR 1
-_ACEOF
-
-
-fi
-
-
ac_fn_c_check_member "$LINENO" "struct icmpstat" "icps_inhist" "ac_cv_member_struct_icmpstat_icps_inhist" "#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
diff --git a/configure.ac b/configure.ac
index 39fb1eabc4b..d9935f63c3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -451,7 +451,6 @@ AC_CHECK_HEADERS(\
elf.h \
float.h \
gettext-po.h \
- grp.h \
gsm.h \
gsm/gsm.h \
ieeefp.h \
@@ -2125,8 +2124,6 @@ dnl **** Check for functions ****
ac_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $BUILTINFLAG"
AC_CHECK_FUNCS(\
- __res_get_state \
- __res_getservers \
epoll_create \
fork \
fstatfs \
@@ -2157,7 +2154,7 @@ CFLAGS="$ac_save_CFLAGS"
dnl Check for -ldl
AC_SEARCH_LIBS(dlopen, dl)
-WINE_CHECK_LIB_FUNCS(dladdr dlinfo,[$DL_LIBS])
+WINE_CHECK_LIB_FUNCS(dlinfo,[$DL_LIBS])
dnl Check for -lnsl for Solaris
AC_SEARCH_LIBS(gethostbyname, nsl)
@@ -2262,22 +2259,6 @@ AC_CHECK_MEMBERS([struct ff_effect.direction],,,
#include <linux/input.h>
#endif])
-AC_CACHE_CHECK([for if_nameindex],wine_cv_have_if_nameindex,
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NET_IF_H
-# include <net/if.h>
-#endif]],
- [[struct if_nameindex *p = if_nameindex(); return p->if_index;]])],[wine_cv_have_if_nameindex=yes],[wine_cv_have_if_nameindex=no]))
-if test "$wine_cv_have_if_nameindex" = "yes"
-then
- AC_DEFINE(HAVE_IF_NAMEINDEX, 1, [Define to 1 if you have the `if_nameindex' function.])
-fi
-
AC_CACHE_CHECK([for sigaddset],wine_cv_have_sigaddset,
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <signal.h>]], [[sigset_t set; sigaddset(&set,SIGTERM);]])],[wine_cv_have_sigaddset=yes],[wine_cv_have_sigaddset=no]))
if test "$wine_cv_have_sigaddset" = "yes"
@@ -2332,7 +2313,7 @@ then
fi
dnl Check for socket structure members
-AC_CHECK_MEMBERS([struct msghdr.msg_accrights, struct sockaddr.sa_len, struct sockaddr_un.sun_len],,,
+AC_CHECK_MEMBERS([struct msghdr.msg_accrights, struct sockaddr_un.sun_len],,,
[#include <sys/types.h>
#ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h>
@@ -2360,7 +2341,6 @@ AC_CHECK_MEMBERS([struct mtget.mt_blksiz, struct mtget.mt_gstat, struct mtget.mt
dnl Check for stat.st_blocks and ns-resolved times
AC_CHECK_MEMBERS([
- struct stat.st_blocks,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_ctim,
@@ -2400,18 +2380,6 @@ AC_CHECK_MEMBERS([struct __res_state._u._ext.nscount6],,,
#include <resolv.h>
#endif])
-dnl Check for ns_msg ptr member
-AC_CHECK_MEMBERS([ns_msg._msg_ptr],,,
-[#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-# include <arpa/nameser.h>
-#endif])
-
dnl Check for struct icmpstat
AC_CHECK_MEMBERS([struct icmpstat.icps_inhist],,,
[#ifdef HAVE_SYS_TYPES_H
diff --git a/include/config.h.in b/include/config.h.in
index fc3749895a3..f262f8a0a12 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -59,9 +59,6 @@
file. */
#undef HAVE_DISKARBITRATION_DISKARBITRATION_H
-/* Define to 1 if you have the `dladdr' function. */
-#undef HAVE_DLADDR
-
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
@@ -150,9 +147,6 @@
/* Define if we have the libgphoto2_port development environment */
#undef HAVE_GPHOTO2_PORT
-/* Define to 1 if you have the <grp.h> header file. */
-#undef HAVE_GRP_H
-
/* Define to 1 if you have the <gsm/gsm.h> header file. */
#undef HAVE_GSM_GSM_H
@@ -171,9 +165,6 @@
/* Define to 1 if you have the <ifaddrs.h> header file. */
#undef HAVE_IFADDRS_H
-/* Define to 1 if you have the `if_nameindex' function. */
-#undef HAVE_IF_NAMEINDEX
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
@@ -447,9 +438,6 @@
/* Define to 1 if you have the <net/route.h> header file. */
#undef HAVE_NET_ROUTE_H
-/* Define to 1 if `_msg_ptr' is a member of `ns_msg'. */
-#undef HAVE_NS_MSG__MSG_PTR
-
/* Define to 1 if OpenAL is available */
#undef HAVE_OPENAL
@@ -621,9 +609,6 @@
/* Define to 1 if `sin6_scope_id' is a member of `struct sockaddr_in6'. */
#undef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID
-/* Define to 1 if `sa_len' is a member of `struct sockaddr'. */
-#undef HAVE_STRUCT_SOCKADDR_SA_LEN
-
/* Define to 1 if `sun_len' is a member of `struct sockaddr_un'. */
#undef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN
@@ -642,9 +627,6 @@
/* Define to 1 if `st_birthtimespec' is a member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC
-/* Define to 1 if `st_blocks' is a member of `struct stat'. */
-#undef HAVE_STRUCT_STAT_ST_BLOCKS
-
/* Define to 1 if `st_ctim' is a member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_CTIM
@@ -963,12 +945,6 @@
function. */
#undef HAVE___CLEAR_CACHE
-/* Define to 1 if you have the `__res_getservers' function. */
-#undef HAVE___RES_GETSERVERS
-
-/* Define to 1 if you have the `__res_get_state' function. */
-#undef HAVE___RES_GET_STATE
-
/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>.
*/
#undef MAJOR_IN_MKDEV
diff --git a/libs/wine/config.c b/libs/wine/config.c
index 368491c3ae9..b8f1bd5f86d 100644
--- a/libs/wine/config.c
+++ b/libs/wine/config.c
@@ -109,7 +109,6 @@ static char *build_path( const char *dir, const char *name )
/* return the directory that contains the library at run-time */
static char *get_runtime_libdir(void)
{
-#ifdef HAVE_DLADDR
Dl_info info;
char *libdir;
@@ -123,7 +122,6 @@ static char *get_runtime_libdir(void)
libdir[len] = 0;
return libdir;
}
-#endif /* HAVE_DLADDR */
return NULL;
}
More information about the wine-cvs
mailing list