also update the multiple inclusion guards in config.h|mak
Unified · Split
| @@ -177,7 +177,7 @@ distclean:: · 176 unmodified lines | |||
| 177 | $(RM) version.h config.* libavutil/avconfig.h | 177 | $(RM) version.h config.* libavutil/avconfig.h |
| 178 | 178 | ||
| 179 | config: | 179 | config: |
| 180 | $(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION) | 180 | $(SRC_PATH)/configure $(value LIBAV_CONFIGURATION) |
| 181 | 181 | ||
| 182 | # regression tests | 182 | # regression tests |
| 183 | 183 | ||
| @@ -397,7 +397,7 @@ static int warned_cfg = 0; · 396 unmodified lines | |||
| 397 | } \ | 397 | } \ |
| 398 | if (flags & SHOW_CONFIG) { \ | 398 | if (flags & SHOW_CONFIG) { \ |
| 399 | const char *cfg = libname##_configuration(); \ | 399 | const char *cfg = libname##_configuration(); \ |
| 400 | if (strcmp(FFMPEG_CONFIGURATION, cfg)) { \ | 400 | if (strcmp(LIBAV_CONFIGURATION, cfg)) { \ |
| 401 | if (!warned_cfg) { \ | 401 | if (!warned_cfg) { \ |
| 402 | fprintf(outstream, \ | 402 | fprintf(outstream, \ |
| 403 | "%sWARNING: library configuration mismatch\n", \ | 403 | "%sWARNING: library configuration mismatch\n", \ |
| @@ -427,7 +427,7 @@ void show_banner(void) · 23 unmodified lines | |||
| 427 | program_name, program_birth_year, this_year); | 427 | program_name, program_birth_year, this_year); |
| 428 | fprintf(stderr, " built on %s %s with %s %s\n", | 428 | fprintf(stderr, " built on %s %s with %s %s\n", |
| 429 | __DATE__, __TIME__, CC_TYPE, CC_VERSION); | 429 | __DATE__, __TIME__, CC_TYPE, CC_VERSION); |
| 430 | fprintf(stderr, " configuration: " FFMPEG_CONFIGURATION "\n"); | 430 | fprintf(stderr, " configuration: " LIBAV_CONFIGURATION "\n"); |
| 431 | print_all_libs_info(stderr, INDENT|SHOW_CONFIG); | 431 | print_all_libs_info(stderr, INDENT|SHOW_CONFIG); |
| 432 | print_all_libs_info(stderr, INDENT|SHOW_VERSION); | 432 | print_all_libs_info(stderr, INDENT|SHOW_VERSION); |
| 433 | } | 433 | } |
| @@ -1688,7 +1688,7 @@ for v in "$@"; do · 1687 unmodified lines | |||
| 1688 | r=${v#*=} | 1688 | r=${v#*=} |
| 1689 | l=${v%"$r"} | 1689 | l=${v%"$r"} |
| 1690 | r=$(sh_quote "$r") | 1690 | r=$(sh_quote "$r") |
| 1691 | FFMPEG_CONFIGURATION="${FFMPEG_CONFIGURATION# } ${l}${r}" | 1691 | LIBAV_CONFIGURATION="${LIBAV_CONFIGURATION# } ${l}${r}" |
| 1692 | done | 1692 | done |
| 1693 | 1693 | ||
| 1694 | find_things(){ | 1694 | find_things(){ |
| @@ -1800,7 +1800,7 @@ done · 105 unmodified lines | |||
| 1800 | 1800 | ||
| 1801 | disabled logging && logfile=/dev/null | 1801 | disabled logging && logfile=/dev/null |
| 1802 | 1802 | ||
| 1803 | echo "# $0 $FFMPEG_CONFIGURATION" > $logfile | 1803 | echo "# $0 $LIBAV_CONFIGURATION" > $logfile |
| 1804 | set >> $logfile | 1804 | set >> $logfile |
| 1805 | 1805 | ||
| 1806 | test -n "$cross_prefix" && enable cross_compile | 1806 | test -n "$cross_prefix" && enable cross_compile |
| @@ -2495,7 +2495,7 @@ case $target_os in · 688 unmodified lines | |||
| 2495 | ;; | 2495 | ;; |
| 2496 | esac | 2496 | esac |
| 2497 | 2497 | ||
| 2498 | echo "config:$arch:$subarch:$cpu:$target_os:$cc_ident:$FFMPEG_CONFIGURATION" >config.fate | 2498 | echo "config:$arch:$subarch:$cpu:$target_os:$cc_ident:$LIBAV_CONFIGURATION" >config.fate |
| 2499 | 2499 | ||
| 2500 | check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable pic | 2500 | check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable pic |
| 2501 | 2501 | ||
| @@ -3204,9 +3204,9 @@ config_files="$TMPH config.mak" · 702 unmodified lines | |||
| 3204 | 3204 | ||
| 3205 | cat > config.mak <<EOF | 3205 | cat > config.mak <<EOF |
| 3206 | # Automatically generated by configure - do not modify! | 3206 | # Automatically generated by configure - do not modify! |
| 3207 | ifndef FFMPEG_CONFIG_MAK | 3207 | ifndef LIBAV_CONFIG_MAK |
| 3208 | FFMPEG_CONFIG_MAK=1 | 3208 | LIBAV_CONFIG_MAK=1 |
| 3209 | FFMPEG_CONFIGURATION=$FFMPEG_CONFIGURATION | 3209 | LIBAV_CONFIGURATION=$LIBAV_CONFIGURATION |
| 3210 | prefix=$prefix | 3210 | prefix=$prefix |
| 3211 | LIBDIR=\$(DESTDIR)$libdir | 3211 | LIBDIR=\$(DESTDIR)$libdir |
| 3212 | SHLIBDIR=\$(DESTDIR)$shlibdir | 3212 | SHLIBDIR=\$(DESTDIR)$shlibdir |
| @@ -3295,9 +3295,9 @@ get_version LIBAVFILTER libavfilter/avfilter.h · 82 unmodified lines | |||
| 3295 | 3295 | ||
| 3296 | cat > $TMPH <<EOF | 3296 | cat > $TMPH <<EOF |
| 3297 | /* Automatically generated by configure - do not modify! */ | 3297 | /* Automatically generated by configure - do not modify! */ |
| 3298 | #ifndef FFMPEG_CONFIG_H | 3298 | #ifndef LIBAV_CONFIG_H |
| 3299 | #define FFMPEG_CONFIG_H | 3299 | #define LIBAV_CONFIG_H |
| 3300 | #define FFMPEG_CONFIGURATION "$(c_escape $FFMPEG_CONFIGURATION)" | 3300 | #define LIBAV_CONFIGURATION "$(c_escape $LIBAV_CONFIGURATION)" |
| 3301 | #define FFMPEG_LICENSE "$(c_escape $license)" | 3301 | #define FFMPEG_LICENSE "$(c_escape $license)" |
| 3302 | #define FFMPEG_DATADIR "$(eval c_escape $datadir)" | 3302 | #define FFMPEG_DATADIR "$(eval c_escape $datadir)" |
| 3303 | #define CC_TYPE "$cc_type" | 3303 | #define CC_TYPE "$cc_type" |
| @@ -3349,8 +3349,8 @@ LAVFI_TESTS=$(print_enabled -n _test $LAVFI_TESTS) · 45 unmodified lines | |||
| 3349 | SEEK_TESTS=$(print_enabled -n _test $SEEK_TESTS) | 3349 | SEEK_TESTS=$(print_enabled -n _test $SEEK_TESTS) |
| 3350 | EOF | 3350 | EOF |
| 3351 | 3351 | ||
| 3352 | echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH | 3352 | echo "#endif /* LIBAV_CONFIG_H */" >> $TMPH |
| 3353 | echo "endif # FFMPEG_CONFIG_MAK" >> config.mak | 3353 | echo "endif # LIBAV_CONFIG_MAK" >> config.mak |
| 3354 | 3354 | ||
| 3355 | # Do not overwrite an unchanged config.h to avoid superfluous rebuilds. | 3355 | # Do not overwrite an unchanged config.h to avoid superfluous rebuilds. |
| 3356 | cp_if_changed $TMPH config.h | 3356 | cp_if_changed $TMPH config.h |
| @@ -1035,7 +1035,7 @@ unsigned avcodec_version( void ) · 1034 unmodified lines | |||
| 1035 | 1035 | ||
| 1036 | const char *avcodec_configuration(void) | 1036 | const char *avcodec_configuration(void) |
| 1037 | { | 1037 | { |
| 1038 | return FFMPEG_CONFIGURATION; | 1038 | return LIBAV_CONFIGURATION; |
| 1039 | } | 1039 | } |
| 1040 | 1040 | ||
| 1041 | const char *avcodec_license(void) | 1041 | const char *avcodec_license(void) |
| @@ -25,7 +25,7 @@ unsigned avdevice_version(void) · 24 unmodified lines | |||
| 25 | 25 | ||
| 26 | const char * avdevice_configuration(void) | 26 | const char * avdevice_configuration(void) |
| 27 | { | 27 | { |
| 28 | return FFMPEG_CONFIGURATION; | 28 | return LIBAV_CONFIGURATION; |
| 29 | } | 29 | } |
| 30 | 30 | ||
| 31 | const char * avdevice_license(void) | 31 | const char * avdevice_license(void) |
| @@ -34,7 +34,7 @@ unsigned avfilter_version(void) { · 33 unmodified lines | |||
| 34 | 34 | ||
| 35 | const char *avfilter_configuration(void) | 35 | const char *avfilter_configuration(void) |
| 36 | { | 36 | { |
| 37 | return FFMPEG_CONFIGURATION; | 37 | return LIBAV_CONFIGURATION; |
| 38 | } | 38 | } |
| 39 | 39 | ||
| 40 | const char *avfilter_license(void) | 40 | const char *avfilter_license(void) |
| @@ -51,7 +51,7 @@ unsigned avformat_version(void) · 50 unmodified lines | |||
| 51 | 51 | ||
| 52 | const char *avformat_configuration(void) | 52 | const char *avformat_configuration(void) |
| 53 | { | 53 | { |
| 54 | return FFMPEG_CONFIGURATION; | 54 | return LIBAV_CONFIGURATION; |
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | const char *avformat_license(void) | 57 | const char *avformat_license(void) |
| @@ -31,7 +31,7 @@ unsigned avutil_version(void) · 30 unmodified lines | |||
| 31 | 31 | ||
| 32 | const char *avutil_configuration(void) | 32 | const char *avutil_configuration(void) |
| 33 | { | 33 | { |
| 34 | return FFMPEG_CONFIGURATION; | 34 | return LIBAV_CONFIGURATION; |
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | const char *avutil_license(void) | 37 | const char *avutil_license(void) |
| @@ -94,7 +94,7 @@ unsigned postproc_version(void) · 93 unmodified lines | |||
| 94 | 94 | ||
| 95 | const char *postproc_configuration(void) | 95 | const char *postproc_configuration(void) |
| 96 | { | 96 | { |
| 97 | return FFMPEG_CONFIGURATION; | 97 | return LIBAV_CONFIGURATION; |
| 98 | } | 98 | } |
| 99 | 99 | ||
| 100 | const char *postproc_license(void) | 100 | const char *postproc_license(void) |
| @@ -53,7 +53,7 @@ unsigned swscale_version(void) · 52 unmodified lines | |||
| 53 | 53 | ||
| 54 | const char *swscale_configuration(void) | 54 | const char *swscale_configuration(void) |
| 55 | { | 55 | { |
| 56 | return FFMPEG_CONFIGURATION; | 56 | return LIBAV_CONFIGURATION; |
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | const char *swscale_license(void) | 59 | const char *swscale_license(void) |