okHEADmaster

1 files changed, 23 insertions, 28 deletions

diff --git a/pysoundtouch/soundtouch/config.status b/pysoundtouch/soundtouch/config.status
index 45f8ca8..9ecd2c0 100755
--- a/pysoundtouch/soundtouch/config.status
+++ b/pysoundtouch/soundtouch/config.status
@@ -437,7 +437,7 @@ Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
-ac_pwd='/home/pepper/soundtouch/pysoundtouch/soundtouch'
+ac_pwd='/home/pepper/soundtouch-mirror/pysoundtouch/soundtouch'
 srcdir='.'
 INSTALL='/usr/bin/install -c'
 MKDIR_P='/usr/bin/mkdir -p'
@@ -550,8 +550,8 @@ sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
 double_quote_subst='s/\(["`\\]\)/\\\1/g'
 delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
 enable_shared='no'
-macro_version='2.4.6'
-macro_revision='2.4.6'
+macro_version='2.4.5'
+macro_revision='2.4.5'
 enable_static='yes'
 pic_mode='default'
 enable_fast_install='needless'
@@ -678,9 +678,8 @@ postuninstall_cmds=''
 finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
 finish_eval=''
 hardcode_into_libs='yes'
-sys_lib_search_path_spec='/usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0 /usr/lib /lib '
-configure_time_dlsearch_path='/lib /usr/lib /usr/lib/libfakeroot /usr/lib32 /usr/local/lib '
-configure_time_lt_sys_library_path=''
+sys_lib_search_path_spec='/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2 /usr/lib /lib '
+lt_cv_sys_lib_dlsearch_path_spec='/lib /usr/lib /usr/lib/libfakeroot /usr/lib/ /usr/lib/ffmpeg-compat/ /usr/lib32 /usr/lib/octave/3.8.2 /opt/opencv-old/lib/ /usr/lib/openmpi /usr/local/lib '
 hardcode_action='immediate'
 enable_dlopen='unknown'
 enable_dlopen_self='unknown'
@@ -735,12 +734,12 @@ prelink_cmds_CXX=''
 postlink_cmds_CXX=''
 file_list_spec_CXX=''
 hardcode_action_CXX='immediate'
-compiler_lib_search_dirs_CXX='/usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0 /usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/../../../../lib /lib/../lib /usr/lib/../lib /usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/../../..'
-predep_objects_CXX='/usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/../../../../lib/crti.o /usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/crtbeginS.o'
-postdep_objects_CXX='/usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/crtendS.o /usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/../../../../lib/crtn.o'
+compiler_lib_search_dirs_CXX='/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2 /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/../../../../lib /lib/../lib /usr/lib/../lib /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/../../..'
+predep_objects_CXX='/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/../../../../lib/crti.o /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/crtbeginS.o'
+postdep_objects_CXX='/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/crtendS.o /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/../../../../lib/crtn.o'
 predeps_CXX=''
 postdeps_CXX='-lstdc++ -lm -lgcc_s -lc -lgcc_s'
-compiler_lib_search_path_CXX='-L/usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0 -L/usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/x86_64-unknown-linux-gnu/5.1.0/../../..'
+compiler_lib_search_path_CXX='-L/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2 -L/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.2/../../..'
 
 LTCC='gcc'
 LTCFLAGS='-g -O2'
@@ -767,7 +766,7 @@ for var in SHELL ECHO PATH_SEPARATOR SED GREP EGREP FGREP LD NM LN_S lt_SP2NL lt
 done
 
 # Double-quote double-evaled strings.
-for var in reload_cmds old_postinstall_cmds old_postuninstall_cmds old_archive_cmds extract_expsyms_cmds old_archive_from_new_cmds old_archive_from_expsyms_cmds archive_cmds archive_expsym_cmds module_cmds module_expsym_cmds export_symbols_cmds prelink_cmds postlink_cmds postinstall_cmds postuninstall_cmds finish_cmds sys_lib_search_path_spec configure_time_dlsearch_path configure_time_lt_sys_library_path reload_cmds_CXX old_archive_cmds_CXX old_archive_from_new_cmds_CXX old_archive_from_expsyms_cmds_CXX archive_cmds_CXX archive_expsym_cmds_CXX module_cmds_CXX module_expsym_cmds_CXX export_symbols_cmds_CXX prelink_cmds_CXX postlink_cmds_CXX; do
+for var in reload_cmds old_postinstall_cmds old_postuninstall_cmds old_archive_cmds extract_expsyms_cmds old_archive_from_new_cmds old_archive_from_expsyms_cmds archive_cmds archive_expsym_cmds module_cmds module_expsym_cmds export_symbols_cmds prelink_cmds postlink_cmds postinstall_cmds postuninstall_cmds finish_cmds sys_lib_search_path_spec lt_cv_sys_lib_dlsearch_path_spec reload_cmds_CXX old_archive_cmds_CXX old_archive_from_new_cmds_CXX old_archive_from_expsyms_cmds_CXX archive_cmds_CXX archive_expsym_cmds_CXX module_cmds_CXX module_expsym_cmds_CXX export_symbols_cmds_CXX prelink_cmds_CXX postlink_cmds_CXX; do
     case `eval \\$ECHO \\""\\$$var"\\"` in
     *[\\\`\"\$]*)
       eval "lt_$var=\\\"\`\$ECHO \"\$$var\" | \$SED -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" ## exclude from sc_prohibit_nested_quotes
@@ -949,12 +948,12 @@ S["mkdir_p"]="$(MKDIR_P)"
 S["MKDIR_P"]="/usr/bin/mkdir -p"
 S["INSTALL_STRIP_PROGRAM"]="$(install_sh) -c -s"
 S["STRIP"]="strip"
-S["install_sh"]="${SHELL} /home/pepper/soundtouch/pysoundtouch/soundtouch/config/install-sh"
-S["MAKEINFO"]="${SHELL} /home/pepper/soundtouch/pysoundtouch/soundtouch/config/missing makeinfo"
-S["AUTOHEADER"]="${SHELL} /home/pepper/soundtouch/pysoundtouch/soundtouch/config/missing autoheader"
-S["AUTOMAKE"]="${SHELL} /home/pepper/soundtouch/pysoundtouch/soundtouch/config/missing automake-1.15"
-S["AUTOCONF"]="${SHELL} /home/pepper/soundtouch/pysoundtouch/soundtouch/config/missing autoconf"
-S["ACLOCAL"]="${SHELL} /home/pepper/soundtouch/pysoundtouch/soundtouch/config/missing aclocal-1.15"
+S["install_sh"]="${SHELL} /home/pepper/soundtouch-mirror/pysoundtouch/soundtouch/config/install-sh"
+S["MAKEINFO"]="${SHELL} /home/pepper/soundtouch-mirror/pysoundtouch/soundtouch/config/missing makeinfo"
+S["AUTOHEADER"]="${SHELL} /home/pepper/soundtouch-mirror/pysoundtouch/soundtouch/config/missing autoheader"
+S["AUTOMAKE"]="${SHELL} /home/pepper/soundtouch-mirror/pysoundtouch/soundtouch/config/missing automake-1.15"
+S["AUTOCONF"]="${SHELL} /home/pepper/soundtouch-mirror/pysoundtouch/soundtouch/config/missing autoconf"
+S["ACLOCAL"]="${SHELL} /home/pepper/soundtouch-mirror/pysoundtouch/soundtouch/config/missing aclocal-1.15"
 S["VERSION"]="1.4.0"
 S["PACKAGE"]="soundtouch"
 S["CYGPATH_W"]="echo"
@@ -1531,7 +1530,7 @@ $as_echo X"$file" |
 available_tags='CXX '
 
 # Configured defaults for sys_lib_dlsearch_path munging.
-: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+: \${LT_SYS_LIBRARY_PATH="$LT_SYS_LIBRARY_PATH"}
 
 # ### BEGIN LIBTOOL CONFIG
 
@@ -1782,11 +1781,8 @@ hardcode_into_libs=$hardcode_into_libs
 # Compile-time system search path for libraries.
 sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
-# Detected run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
-
-# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
-configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
+# Run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_lt_cv_sys_lib_dlsearch_path_spec
 
 # Whether dlopen is supported.
 dlopen_support=$enable_dlopen
@@ -1952,8 +1948,9 @@ compiler_lib_search_path=$lt_compiler_lib_search_path
 _LT_EOF
 
     cat <<'_LT_EOF' >> "$cfgfile"
-
-# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+## -------------------------------------- ##
+## Shell functions shared with configure. ##
+## -------------------------------------- ##
 
 # func_munge_path_list VARIABLE PATH
 # -----------------------------------
@@ -1975,7 +1972,7 @@ func_munge_path_list ()
     x)
         ;;
     *:)
-        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \S|@1\"
         ;;
     x:*)
         eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
@@ -2006,8 +2003,6 @@ func_cc_basename ()
 }
 
 
-# ### END FUNCTIONS SHARED WITH CONFIGURE
-
 _LT_EOF
 
   case $host_os in