On 20/07/10 01:51, Mike Frysinger wrote: > Currently, only main programs (like stdbuf) can be disabled at configure > time. Helper programs (like libstdbuf.so) do not have a configure option. > > Even if you disable stdbuf with the configure option, libstdbuf.so will > still be compiled and installed. So delay the parsing of helper programs > until after we know the final enable list, and then only build libstdbuf.so > when stdbuf is also enabled. > > Signed-off-by: Mike Frysinger <[email protected]> > --- > configure.ac | 9 +++++++-- > 1 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/configure.ac b/configure.ac > index e7037a1..acd397e 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -332,7 +332,6 @@ if test $gl_cv_list_mounted_fs = yes && test > $gl_cv_fs_space = yes; then > fi > > # Limit stdbuf to ELF systems with GCC > -optional_pkglib_progs= > AC_MSG_CHECKING([whether this is an ELF system]) > AC_EGREP_CPP([yes], [#if __ELF__ > yes > @@ -341,7 +340,6 @@ AC_MSG_RESULT([$elf_sys]) > if test "$elf_sys" = "yes" && \ > test "$GCC" = "yes"; then > gl_ADD_PROG([optional_bin_progs], [stdbuf]) > - gl_ADD_PROG([optional_pkglib_progs], [libstdbuf.so]) > fi > > ############################################################################ > @@ -395,6 +393,13 @@ esac > # corresponding ./configure option argument is comma-separated on input. > gl_INCLUDE_EXCLUDE_PROG([optional_bin_progs], [arch,hostname,su]) > > +# Now that we know which programs will actually be built up, figure out > +# which optional helper progs should be compiled. > +optional_pkglib_progs= > +case " $optional_bin_progs " in > + *' stdbuf '*) gl_ADD_PROG([optional_pkglib_progs], [libstdbuf.so]) ;; > +esac > + > # Set INSTALL_SU if su installation has been requested via > # --enable-install-program=su. > AC_SUBST([INSTALL_SU])
Looks good Mike. I'll apply that soon. cheers, Pádraig.
