Now that all libraries have separate version headers, some complexity can be
avoided.
---
configure | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/configure b/configure
index 3d0e529..da99025 100755
--- a/configure
+++ b/configure
@@ -3365,21 +3365,21 @@ EOF
get_version(){
name=$1
- file=$source_path/$2
- eval $(grep "#define ${name}_VERSION_M" "$file" | awk '{ print $2"="$3 }')
- eval
${name}_VERSION=\$${name}_VERSION_MAJOR.\$${name}_VERSION_MINOR.\$${name}_VERSION_MICRO
- lcname=$(tolower $name)
- eval echo "${lcname}_VERSION=\$${name}_VERSION" >> config.mak
- eval echo "${lcname}_VERSION_MAJOR=\$${name}_VERSION_MAJOR" >> config.mak
-}
-
-get_version LIBAVCODEC libavcodec/version.h
-get_version LIBAVDEVICE libavdevice/version.h
-get_version LIBAVFILTER libavfilter/version.h
-get_version LIBAVFORMAT libavformat/version.h
-get_version LIBAVRESAMPLE libavresample/version.h
-get_version LIBAVUTIL libavutil/version.h
-get_version LIBSWSCALE libswscale/version.h
+ NAME=$(toupper $name)
+ file=$source_path/$name/version.h
+ eval $(grep "#define ${NAME}_VERSION_M" "$file" | awk '{ print $2"="$3 }')
+ eval
${NAME}_VERSION=\$${NAME}_VERSION_MAJOR.\$${NAME}_VERSION_MINOR.\$${NAME}_VERSION_MICRO
+ eval echo "${name}_VERSION=\$${name}_VERSION" >> config.mak
+ eval echo "${name}_VERSION_MAJOR=\$${NAME}_VERSION_MAJOR" >> config.mak
+}
+
+get_version libavcodec
+get_version libavdevice
+get_version libavfilter
+get_version libavformat
+get_version libavresample
+get_version libavutil
+get_version libswscale
cat > $TMPH <<EOF
/* Automatically generated by configure - do not modify! */
--
1.7.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
