Author: peters
Date: Wed Jun 15 16:43:24 2011
New Revision: 1136114
URL: http://svn.apache.org/viewvc?rev=1136114&view=rev
Log:
* configure.ac: Followup r1134219: Use 'cmp -s' instead of 'diff' to
detect changes to svn_private_config.h. Take advantage of the fact
that cmp -s produces no output even if a file does not exist.
Use a temp variable to shorten the lines further.
Modified:
subversion/trunk/configure.ac
Modified: subversion/trunk/configure.ac
URL:
http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1136114&r1=1136113&r2=1136114&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Wed Jun 15 16:43:24 2011
@@ -1299,13 +1299,10 @@ AC_SUBST(INCLUDE_OUTPUTS)
AC_CONFIG_HEADERS(subversion/svn_private_config.h.tmp:subversion/svn_private_config.h.in)
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
- 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],
+ [svn_cf=subversion/svn_private_config.h;
+ $SED -e "s/@SVN_DB_HEADER@/$SVN_DB_HEADER/" $svn_cf.tmp >
$svn_cf.tmp.new
+ cmp -s $svn_cf.tmp.new $svn_cf || mv -f $svn_cf.tmp.new
$svn_cf
+ rm -f $svn_cf.tmp.new $svn_cf.tmp)],
[SED="$SED"
SVN_DB_HEADER="$SVN_DB_HEADER"])
AC_CONFIG_FILES([Makefile])
