comparison configure @ 288:fd4a6183482f kapoor_1202

Merge from branch piper-nopiper. The next release will be based on this.
author Chris Cannam
date Fri, 02 Dec 2016 10:04:44 +0000
parents 382f33b7f00e
children 4f6e6ee48be7
comparison
equal deleted inserted replaced
259:9e7d180be225 288:fd4a6183482f
618 #endif 618 #endif
619 #ifdef HAVE_UNISTD_H 619 #ifdef HAVE_UNISTD_H
620 # include <unistd.h> 620 # include <unistd.h>
621 #endif" 621 #endif"
622 622
623 enable_option_checking=no
624 ac_subst_vars='LTLIBOBJS 623 ac_subst_vars='LTLIBOBJS
625 LIBOBJS 624 LIBOBJS
626 subdirs
627 QMAKE_CONFIG 625 QMAKE_CONFIG
628 HAVES 626 HAVES
629 CXXFLAGS_MINIMAL 627 CXXFLAGS_MINIMAL
630 CUT 628 CUT
631 SHA1SUM 629 SHA1SUM
762 fishsound_LIBS 760 fishsound_LIBS
763 mad_CFLAGS 761 mad_CFLAGS
764 mad_LIBS 762 mad_LIBS
765 id3tag_CFLAGS 763 id3tag_CFLAGS
766 id3tag_LIBS' 764 id3tag_LIBS'
767 ac_subdirs_all='svcore' 765
768 766
769 # Initialize some variables set by options. 767 # Initialize some variables set by options.
770 ac_init_help= 768 ac_init_help=
771 ac_init_version=false 769 ac_init_version=false
772 ac_unrecognized_opts= 770 ac_unrecognized_opts=
6436 6434
6437 6435
6438 6436
6439 6437
6440 6438
6441
6442
6443 subdirs="$subdirs svcore"
6444
6445 ac_config_files="$ac_config_files config.pri" 6439 ac_config_files="$ac_config_files config.pri"
6446 6440
6447 6441
6448 cat >confcache <<\_ACEOF 6442 cat >confcache <<\_ACEOF
6449 # This file is a shell script that caches the results of configure 6443 # This file is a shell script that caches the results of configure
7606 exec 5>>config.log 7600 exec 5>>config.log
7607 # Use ||, not &&, to avoid exiting from the if with $? = 1, which 7601 # Use ||, not &&, to avoid exiting from the if with $? = 1, which
7608 # would make configure fail if this is the last instruction. 7602 # would make configure fail if this is the last instruction.
7609 $ac_cs_success || as_fn_exit 1 7603 $ac_cs_success || as_fn_exit 1
7610 fi 7604 fi
7611
7612 #
7613 # CONFIG_SUBDIRS section.
7614 #
7615 if test "$no_recursion" != yes; then
7616
7617 # Remove --cache-file, --srcdir, and --disable-option-checking arguments
7618 # so they do not pile up.
7619 ac_sub_configure_args=
7620 ac_prev=
7621 eval "set x $ac_configure_args"
7622 shift
7623 for ac_arg
7624 do
7625 if test -n "$ac_prev"; then
7626 ac_prev=
7627 continue
7628 fi
7629 case $ac_arg in
7630 -cache-file | --cache-file | --cache-fil | --cache-fi \
7631 | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
7632 ac_prev=cache_file ;;
7633 -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
7634 | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
7635 | --c=*)
7636 ;;
7637 --config-cache | -C)
7638 ;;
7639 -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
7640 ac_prev=srcdir ;;
7641 -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
7642 ;;
7643 -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
7644 ac_prev=prefix ;;
7645 -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
7646 ;;
7647 --disable-option-checking)
7648 ;;
7649 *)
7650 case $ac_arg in
7651 *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
7652 esac
7653 as_fn_append ac_sub_configure_args " '$ac_arg'" ;;
7654 esac
7655 done
7656
7657 # Always prepend --prefix to ensure using the same prefix
7658 # in subdir configurations.
7659 ac_arg="--prefix=$prefix"
7660 case $ac_arg in
7661 *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
7662 esac
7663 ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
7664
7665 # Pass --silent
7666 if test "$silent" = yes; then
7667 ac_sub_configure_args="--silent $ac_sub_configure_args"
7668 fi
7669
7670 # Always prepend --disable-option-checking to silence warnings, since
7671 # different subdirs can have different --enable and --with options.
7672 ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args"
7673
7674 ac_popdir=`pwd`
7675 for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
7676
7677 # Do not complain, so a configure script can configure whichever
7678 # parts of a large source tree are present.
7679 test -d "$srcdir/$ac_dir" || continue
7680
7681 ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
7682 $as_echo "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5
7683 $as_echo "$ac_msg" >&6
7684 as_dir="$ac_dir"; as_fn_mkdir_p
7685 ac_builddir=.
7686
7687 case "$ac_dir" in
7688 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
7689 *)
7690 ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
7691 # A ".." for each directory in $ac_dir_suffix.
7692 ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
7693 case $ac_top_builddir_sub in
7694 "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
7695 *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
7696 esac ;;
7697 esac
7698 ac_abs_top_builddir=$ac_pwd
7699 ac_abs_builddir=$ac_pwd$ac_dir_suffix
7700 # for backward compatibility:
7701 ac_top_builddir=$ac_top_build_prefix
7702
7703 case $srcdir in
7704 .) # We are building in place.
7705 ac_srcdir=.
7706 ac_top_srcdir=$ac_top_builddir_sub
7707 ac_abs_top_srcdir=$ac_pwd ;;
7708 [\\/]* | ?:[\\/]* ) # Absolute name.
7709 ac_srcdir=$srcdir$ac_dir_suffix;
7710 ac_top_srcdir=$srcdir
7711 ac_abs_top_srcdir=$srcdir ;;
7712 *) # Relative name.
7713 ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
7714 ac_top_srcdir=$ac_top_build_prefix$srcdir
7715 ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
7716 esac
7717 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
7718
7719
7720 cd "$ac_dir"
7721
7722 # Check for guested configure; otherwise get Cygnus style configure.
7723 if test -f "$ac_srcdir/configure.gnu"; then
7724 ac_sub_configure=$ac_srcdir/configure.gnu
7725 elif test -f "$ac_srcdir/configure"; then
7726 ac_sub_configure=$ac_srcdir/configure
7727 elif test -f "$ac_srcdir/configure.in"; then
7728 # This should be Cygnus configure.
7729 ac_sub_configure=$ac_aux_dir/configure
7730 else
7731 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5
7732 $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
7733 ac_sub_configure=
7734 fi
7735
7736 # The recursion is here.
7737 if test -n "$ac_sub_configure"; then
7738 # Make the cache file name correct relative to the subdirectory.
7739 case $cache_file in
7740 [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
7741 *) # Relative name.
7742 ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
7743 esac
7744
7745 { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
7746 $as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
7747 # The eval makes quoting arguments work.
7748 eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
7749 --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
7750 as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
7751 fi
7752
7753 cd "$ac_popdir"
7754 done
7755 fi
7756 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then 7605 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
7757 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 7606 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
7758 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} 7607 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
7759 fi 7608 fi
7760 7609