[SCM] libav/experimental: configure: add cp_if_changed function and use for config.h

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:58:05 UTC 2013


The following commit has been merged in the experimental branch:
commit c34681df42a8ffe93491ce710ca01a6151f11004
Author: Måns Rullgård <mans at mansr.com>
Date:   Tue Jan 19 04:40:08 2010 +0000

    configure: add cp_if_changed function and use for config.h
    
    Originally committed as revision 21318 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index 78d2989..b3170dd 100755
--- a/configure
+++ b/configure
@@ -831,6 +831,12 @@ apply(){
     "$@" < "$file" > "$file.tmp" && mv "$file.tmp" "$file" || rm "$file.tmp"
 }
 
+cp_if_changed(){
+    cmp -s "$1" "$2" &&
+        echo "$2 is unchanged" ||
+        cp -f "$1" "$2"
+}
+
 # CONFIG_LIST contains configurable options, while HAVE_LIST is for
 # system-dependent things.
 
@@ -2909,9 +2915,7 @@ echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH
 echo "endif # FFMPEG_CONFIG_MAK" >> config.mak
 
 # Do not overwrite an unchanged config.h to avoid superfluous rebuilds.
-cmp -s $TMPH config.h &&
-    echo "config.h is unchanged" ||
-    mv -f $TMPH config.h
+cp_if_changed $TMPH config.h
 
 # build tree in object directory if source path is different from current one
 if enabled source_path_used; then

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list