| Message ID | 20190614072432.820-2-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | configure: Try to fix --static linking | expand |
On Fri, Jun 14, 2019 at 09:24:27AM +0200, Philippe Mathieu-Daudé wrote: > It is pointless and confusing to have GLUSTERFS variables > in config-host.mak when glusterfs is not usable. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Looks good to me, thanks. Reviewed-by: Niels de Vos <ndevos@redhat.com> > --- > configure | 36 ++++++++++++++++++------------------ > 1 file changed, 18 insertions(+), 18 deletions(-) > > diff --git a/configure b/configure > index b091b82cb3..13fd4a1166 100755 > --- a/configure > +++ b/configure > @@ -7118,30 +7118,30 @@ if test "$glusterfs" = "yes" ; then > echo "CONFIG_GLUSTERFS=m" >> $config_host_mak > echo "GLUSTERFS_CFLAGS=$glusterfs_cflags" >> $config_host_mak > echo "GLUSTERFS_LIBS=$glusterfs_libs" >> $config_host_mak > -fi > > -if test "$glusterfs_xlator_opt" = "yes" ; then > - echo "CONFIG_GLUSTERFS_XLATOR_OPT=y" >> $config_host_mak > -fi > + if test "$glusterfs_xlator_opt" = "yes" ; then > + echo "CONFIG_GLUSTERFS_XLATOR_OPT=y" >> $config_host_mak > + fi > > -if test "$glusterfs_discard" = "yes" ; then > - echo "CONFIG_GLUSTERFS_DISCARD=y" >> $config_host_mak > -fi > + if test "$glusterfs_discard" = "yes" ; then > + echo "CONFIG_GLUSTERFS_DISCARD=y" >> $config_host_mak > + fi > > -if test "$glusterfs_fallocate" = "yes" ; then > - echo "CONFIG_GLUSTERFS_FALLOCATE=y" >> $config_host_mak > -fi > + if test "$glusterfs_fallocate" = "yes" ; then > + echo "CONFIG_GLUSTERFS_FALLOCATE=y" >> $config_host_mak > + fi > > -if test "$glusterfs_zerofill" = "yes" ; then > - echo "CONFIG_GLUSTERFS_ZEROFILL=y" >> $config_host_mak > -fi > + if test "$glusterfs_zerofill" = "yes" ; then > + echo "CONFIG_GLUSTERFS_ZEROFILL=y" >> $config_host_mak > + fi > > -if test "$glusterfs_ftruncate_has_stat" = "yes" ; then > - echo "CONFIG_GLUSTERFS_FTRUNCATE_HAS_STAT=y" >> $config_host_mak > -fi > + if test "$glusterfs_ftruncate_has_stat" = "yes" ; then > + echo "CONFIG_GLUSTERFS_FTRUNCATE_HAS_STAT=y" >> $config_host_mak > + fi > > -if test "$glusterfs_iocb_has_stat" = "yes" ; then > - echo "CONFIG_GLUSTERFS_IOCB_HAS_STAT=y" >> $config_host_mak > + if test "$glusterfs_iocb_has_stat" = "yes" ; then > + echo "CONFIG_GLUSTERFS_IOCB_HAS_STAT=y" >> $config_host_mak > + fi > fi > > if test "$libssh2" = "yes" ; then > -- > 2.20.1 >
diff --git a/configure b/configure index b091b82cb3..13fd4a1166 100755 --- a/configure +++ b/configure @@ -7118,30 +7118,30 @@ if test "$glusterfs" = "yes" ; then echo "CONFIG_GLUSTERFS=m" >> $config_host_mak echo "GLUSTERFS_CFLAGS=$glusterfs_cflags" >> $config_host_mak echo "GLUSTERFS_LIBS=$glusterfs_libs" >> $config_host_mak -fi -if test "$glusterfs_xlator_opt" = "yes" ; then - echo "CONFIG_GLUSTERFS_XLATOR_OPT=y" >> $config_host_mak -fi + if test "$glusterfs_xlator_opt" = "yes" ; then + echo "CONFIG_GLUSTERFS_XLATOR_OPT=y" >> $config_host_mak + fi -if test "$glusterfs_discard" = "yes" ; then - echo "CONFIG_GLUSTERFS_DISCARD=y" >> $config_host_mak -fi + if test "$glusterfs_discard" = "yes" ; then + echo "CONFIG_GLUSTERFS_DISCARD=y" >> $config_host_mak + fi -if test "$glusterfs_fallocate" = "yes" ; then - echo "CONFIG_GLUSTERFS_FALLOCATE=y" >> $config_host_mak -fi + if test "$glusterfs_fallocate" = "yes" ; then + echo "CONFIG_GLUSTERFS_FALLOCATE=y" >> $config_host_mak + fi -if test "$glusterfs_zerofill" = "yes" ; then - echo "CONFIG_GLUSTERFS_ZEROFILL=y" >> $config_host_mak -fi + if test "$glusterfs_zerofill" = "yes" ; then + echo "CONFIG_GLUSTERFS_ZEROFILL=y" >> $config_host_mak + fi -if test "$glusterfs_ftruncate_has_stat" = "yes" ; then - echo "CONFIG_GLUSTERFS_FTRUNCATE_HAS_STAT=y" >> $config_host_mak -fi + if test "$glusterfs_ftruncate_has_stat" = "yes" ; then + echo "CONFIG_GLUSTERFS_FTRUNCATE_HAS_STAT=y" >> $config_host_mak + fi -if test "$glusterfs_iocb_has_stat" = "yes" ; then - echo "CONFIG_GLUSTERFS_IOCB_HAS_STAT=y" >> $config_host_mak + if test "$glusterfs_iocb_has_stat" = "yes" ; then + echo "CONFIG_GLUSTERFS_IOCB_HAS_STAT=y" >> $config_host_mak + fi fi if test "$libssh2" = "yes" ; then
It is pointless and confusing to have GLUSTERFS variables in config-host.mak when glusterfs is not usable. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- configure | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-)