subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daniel Shahaf <...@daniel.shahaf.name>
Subject Re: svn commit: r1134219 - /subversion/trunk/configure.ac
Date Fri, 10 Jun 2011 21:09:31 GMT
philip@apache.org wrote on Fri, Jun 10, 2011 at 07:50:17 -0000:
> Author: philip
> Date: Fri Jun 10 07:50:17 2011
> New Revision: 1134219
> 
> URL: http://svn.apache.org/viewvc?rev=1134219&view=rev
> Log:
> * configure.ac: Don't replace svn_private_config.h if the content
>   is unchanged.
> 
> Modified:
>     subversion/trunk/configure.ac
> 
> Modified: subversion/trunk/configure.ac
> URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1134219&r1=1134218&r2=1134219&view=diff
> ==============================================================================
> --- subversion/trunk/configure.ac (original)
> +++ subversion/trunk/configure.ac Fri Jun 10 07:50:17 2011
> @@ -1297,10 +1297,15 @@ AC_SUBST(INCLUDE_OUTPUTS)
>  
>  # ==== Detection complete - output and run config.status =====================
>  
> -AC_CONFIG_HEADERS(subversion/svn_private_config.h)
> -AC_CONFIG_COMMANDS([svn_private_config.h],
> -                   [$SED -e "s/@SVN_DB_HEADER@/$SVN_DB_HEADER/" subversion/svn_private_config.h
> subversion/svn_private_config.h.new
> -                    mv -f subversion/svn_private_config.h.new subversion/svn_private_config.h],
> +AC_CONFIG_HEADERS(subversion/svn_private_config.h.tmp)
> +AC_CONFIG_COMMANDS([svn_private_config.h.tmp],
> +                   [$SED -e "s/@SVN_DB_HEADER@/$SVN_DB_HEADER/" subversion/svn_private_config.h.tmp
> subversion/svn_private_config.h.tmp.new
> +                    if test -e subversion/svn_private_config.h && diff subversion/svn_private_config.h
subversion/svn_private_config.h.tmp.new >/dev/null ; then

s/diff >/dev/null/cmp/ ?

> +                      rm -f subversion/svn_private_config.h.tmp.new
> +                    else
> +                      mv -f subversion/svn_private_config.h.tmp.new subversion/svn_private_config.h
> +                    fi
> +                    rm -f subversion/svn_private_config.h.tmp],
>                     [SED="$SED"
>                      SVN_DB_HEADER="$SVN_DB_HEADER"])
>  AC_CONFIG_FILES([Makefile])
> 
> 

Mime
View raw message