From dd18be30b596ba0cf50bd6d28d23d3290e27939d Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Mon, 4 Sep 2000 05:10:03 +0000 Subject: [PATCH] * ltmain.in (link -static): Don't add $link_static_flag; only -all-static should do that. * mdemo/configure.in: Revert the previous delta. --- ChangeLog | 4 ++++ ltmain.in | 10 +++++----- mdemo/configure.in | 9 --------- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7ce5f63f..fdf16df93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2000-09-04 Alexandre Oliva + * ltmain.in (link -static): Don't add $link_static_flag; only + -all-static should do that. + * mdemo/configure.in: Revert the previous delta. + * mdemo/configure.in: Don't use -static on AIX4.1. 2000-09-03 Alexandre Oliva diff --git a/ltmain.in b/ltmain.in index cb51a4279..1a4a10864 100644 --- a/ltmain.in +++ b/ltmain.in @@ -1136,11 +1136,11 @@ compiler." ;; -static) - # If we have no pic_flag, then this is the same as -all-static. - if test -z "$pic_flag" && test -n "$link_static_flag"; then - compile_command="$compile_command $link_static_flag" - finalize_command="$finalize_command $link_static_flag" - fi + # The effects of -static are defined in a previous loop. + # We used to do the same as -all-static on platforms that + # didn't have a PIC flag, but the assumption that the effects + # would be equivalent was wrong. It would break on at least + # Digital Unix and AIX. continue ;; diff --git a/mdemo/configure.in b/mdemo/configure.in index e6fa3cd97..93ff01ef1 100644 --- a/mdemo/configure.in +++ b/mdemo/configure.in @@ -21,15 +21,6 @@ else fi AC_SUBST(STATIC) -case $host_os in -dnl aix 4.1 provides dlopen() through -lsvld, but this library can't -dnl be linked statically. -aix4.[[01]]*) - STATIC= ;; -*) - STATIC=-static ;; -esac - AC_CHECK_HEADERS(math.h) AC_CHECK_LIBM -- 2.47.2