From c59ad5a327a3f6a74327c6dba1f2c8bf64a072ef Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Wed, 9 Nov 2005 22:06:04 +0000 Subject: [PATCH] * libtool.m4 (AC_LIBTOOL_LANG_C_CONFIG): Move static_flag check.. (AC_LIBTOOL_PROG_COMPILER_PIC): ..here, so that both `lt_prog_compiler_static' have actually been set, and the check is applied to each tag. --- ChangeLog | 8 ++++++++ libtool.m4 | 19 +++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8282b5251..f086a838f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-11-09 Ralf Wildenhues + + * libtool.m4 (AC_LIBTOOL_LANG_C_CONFIG): Move static_flag + check.. + (AC_LIBTOOL_PROG_COMPILER_PIC): ..here, so that both + `lt_prog_compiler_static' have actually been set, and the check + is applied to each tag. + 2005-11-07 Kean Johnston * ltmain.in (link mode) [ sysv4*uw2*, unixware7* ]: Work around linker diff --git a/libtool.m4 b/libtool.m4 index 5b9b34923..86dfb99c5 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -2646,16 +2646,6 @@ if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then fi -# -# Check to make sure the static flag actually works. -# -AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works], - _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), - $_LT_AC_TAGVAR(lt_prog_compiler_static, $1), - [], - [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) - - ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change ## the running order or otherwise move them around unless you know exactly @@ -5256,6 +5246,15 @@ case $host_os in _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" ;; esac + +# +# Check to make sure the static flag actually works. +# +AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works], + _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), + $_LT_AC_TAGVAR(lt_prog_compiler_static, $1), + [], + [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) ]) -- 2.47.3