From: Andreas Schwab Date: Fri, 18 Apr 2008 21:43:19 +0000 (+0200) Subject: Properly emulate AC_ENABLE_SHARED([no]) and others. X-Git-Tag: v2.2.4~27 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=1006ccc48c14d3715c569cca68dab54742207273;p=thirdparty%2Flibtool.git Properly emulate AC_ENABLE_SHARED([no]) and others. * libltdl/m4/ltoptions.m4 (AC_ENABLE_SHARED): Check optional argument. (AC_ENABLE_STATIC): Likewise. (AC_ENABLE_FAST_INSTALL): Likewise. Signed-off-by: Ralf Wildenhues --- diff --git a/ChangeLog b/ChangeLog index 268e36925..e5934060e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-04-18 Andreas Schwab + + * libltdl/m4/ltoptions.m4 (AC_ENABLE_SHARED): Check optional + argument. + (AC_ENABLE_STATIC): Likewise. + (AC_ENABLE_FAST_INSTALL): Likewise. + 2008-04-16 Eric Blake Make ChangeLog merges easier. diff --git a/libltdl/m4/ltoptions.m4 b/libltdl/m4/ltoptions.m4 index a1c3aba42..339d6f58d 100644 --- a/libltdl/m4/ltoptions.m4 +++ b/libltdl/m4/ltoptions.m4 @@ -192,7 +192,7 @@ LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) # Old names: AC_DEFUN([AC_ENABLE_SHARED], -[_LT_SET_OPTION([LT_INIT], [shared]) +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) ]) AC_DEFUN([AC_DISABLE_SHARED], @@ -246,7 +246,7 @@ LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) # Old names: AC_DEFUN([AC_ENABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], [static]) +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) ]) AC_DEFUN([AC_DISABLE_STATIC], @@ -300,7 +300,7 @@ LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no # Old names: AU_DEFUN([AC_ENABLE_FAST_INSTALL], -[_LT_SET_OPTION([LT_INIT], [fast-install]) +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put the `fast-install' option into LT_INIT's first parameter.])