Module: wine Branch: master Commit: 2f149571d5627add6954a7b6bb71306bb779c652 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f149571d5627add6954a7b6b...
Author: Alexandre Julliard julliard@winehq.org Date: Sat Mar 9 21:11:25 2019 +0100
configure: Remove a few no longer used definitions.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
configure | 17 ----------------- configure.ac | 14 -------------- include/config.h.in | 3 --- 3 files changed, 34 deletions(-)
diff --git a/configure b/configure index 1d80c01..9988dcd 100755 --- a/configure +++ b/configure @@ -7788,7 +7788,6 @@ WINEPRELOADER_LDFLAGS=""
LIBEXT="so" DLLEXT=".so" -IMPLIBEXT="def" # Extract the first word of "ldd", so it can be a program name with args. set dummy ldd; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -8153,7 +8152,6 @@ fi
LIBEXT="dll" DLLEXT="" - IMPLIBEXT="a" enable_iphlpapi=${enable_iphlpapi:-no} enable_kernel32=${enable_kernel32:-no} enable_msvcrt=${enable_msvcrt:-no} @@ -8164,12 +8162,6 @@ fi with_x=${with_x:-no} with_pthread=${with_pthread:-no}
- crtlibs="" - case $host_os in - mingw32*) - crtlibs="-lmsvcrt" ;; - esac - LIBWINE_SHAREDLIB="libwine.dll"
LIBWINE_IMPORTLIB="libwine.a" @@ -16560,23 +16552,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_asm_func_def" >&5 $as_echo "$ac_cv_asm_func_def" >&6; }
- case "$ac_cv_asm_func_def" in ".def") - $as_echo "#define __ASM_FUNC(name) ".def " __ASM_NAME(name) "; .scl 2; .type 32; .endef"" >>confdefs.h - asm_func_header=".def $asm_name_prefix" #name suffix "; .scl 2; .type 32; .endef" ;; ".type @function") - $as_echo "#define __ASM_FUNC(name) ".type " __ASM_NAME(name) ",@function"" >>confdefs.h - asm_func_header=".type $asm_name_prefix" #name suffix ",@function" ;; ".type 2") - $as_echo "#define __ASM_FUNC(name) ".type " __ASM_NAME(name) ",2"" >>confdefs.h - asm_func_header=".type $asm_name_prefix" #name suffix ",2" ;; *) - $as_echo "#define __ASM_FUNC(name) """ >>confdefs.h - asm_func_header="" ;; esac
diff --git a/configure.ac b/configure.ac index 71e8606..25581a9 100644 --- a/configure.ac +++ b/configure.ac @@ -710,7 +710,6 @@ AC_SUBST(WINELOADER_LDFLAGS,"") AC_SUBST(WINEPRELOADER_LDFLAGS,"") LIBEXT="so" DLLEXT=".so" -IMPLIBEXT="def" WINE_PATH_SONAME_TOOLS WINE_CONFIG_HELPERS
@@ -724,7 +723,6 @@ case $host_os in AC_CHECK_TOOL(DLLTOOL,dlltool,false) LIBEXT="dll" DLLEXT="" - IMPLIBEXT="a" dnl Disable modules that can't be used on Windows enable_iphlpapi=${enable_iphlpapi:-no} enable_kernel32=${enable_kernel32:-no} @@ -737,13 +735,6 @@ case $host_os in with_x=${with_x:-no} with_pthread=${with_pthread:-no}
- dnl Mingw needs explicit msvcrt for linking libwine and winsock for wininet - crtlibs="" - case $host_os in - mingw32*) - crtlibs="-lmsvcrt" ;; - esac - AC_SUBST(LIBWINE_SHAREDLIB,"libwine.dll") AC_SUBST(LIBWINE_IMPORTLIB,"libwine.a") AC_SUBST(LIBWINE_LDFLAGS,"-shared $(srcdir)/wine.def") @@ -2058,19 +2049,14 @@ AC_CACHE_CHECK([how to define a function in assembly code], ac_cv_asm_func_def, ac_cv_asm_func_def=".type 2", ac_cv_asm_func_def="unknown")])]))
-AH_TEMPLATE(__ASM_FUNC,[Define to a macro to generate an assembly function directive]) case "$ac_cv_asm_func_def" in ".def") - AC_DEFINE([__ASM_FUNC(name)], [".def " __ASM_NAME(name) "; .scl 2; .type 32; .endef"]) asm_func_header=".def $asm_name_prefix" #name suffix "; .scl 2; .type 32; .endef" ;; ".type @function") - AC_DEFINE([__ASM_FUNC(name)], [".type " __ASM_NAME(name) ",@function"]) asm_func_header=".type $asm_name_prefix" #name suffix ",@function" ;; ".type 2") - AC_DEFINE([__ASM_FUNC(name)], [".type " __ASM_NAME(name) ",2"]) asm_func_header=".type $asm_name_prefix" #name suffix ",2" ;; *) - AC_DEFINE([__ASM_FUNC(name)], [""]) asm_func_header="" ;; esac
diff --git a/include/config.h.in b/include/config.h.in index 999f4a6..1d69e2e 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1631,9 +1631,6 @@ /* Define to a macro to define an assembly function */ #undef __ASM_DEFINE_FUNC
-/* Define to a macro to generate an assembly function directive */ -#undef __ASM_FUNC - /* Define to a macro to generate an assembly function with C calling convention */ #undef __ASM_GLOBAL_FUNC