summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPepper <pepper@scannerjammer.com>2015-01-30 03:55:43 -0500
committerPepper <pepper@scannerjammer.com>2015-01-30 03:55:43 -0500
commitec2808990dbc15b6652070c1bdf9487cb1b3f38a (patch)
tree02d2bcbb242004e998c4059904e2c3e039e78590
parent3b1f919e65c4c88d0d760121d61456eb68dc79b6 (diff)
fixed leak and sample rate issueworking
-rw-r--r--Makefile12
-rw-r--r--TODO3
-rw-r--r--aclocal.m489
-rw-r--r--autom4te.cache/output.072
-rw-r--r--autom4te.cache/output.172
-rw-r--r--autom4te.cache/requests424
-rw-r--r--autom4te.cache/traces.091
-rw-r--r--autom4te.cache/traces.12
-rw-r--r--config.log519
-rwxr-xr-xconfig.status42
-rwxr-xr-xconfigure72
-rwxr-xr-xlibtool52
-rw-r--r--src/.deps/dssi-render.Po202
-rw-r--r--src/.deps/ladspa_run_synth.Po205
-rw-r--r--src/.ladspa_run_synth.c.swpbin16384 -> 16384 bytes
-rw-r--r--src/Makefile14
-rw-r--r--src/Makefile.in2
-rw-r--r--src/VALOUT6
-rwxr-xr-xsrc/dssi-renderbin128128 -> 130509 bytes
-rw-r--r--src/dssi-render.c3
-rw-r--r--src/dssi-render.h9
-rw-r--r--src/dssi-render.obin88656 -> 88672 bytes
-rw-r--r--src/ladspa_run_synth.c9
-rw-r--r--src/ladspa_run_synth.obin22640 -> 23512 bytes
-rw-r--r--src/midi/.deps/fluid_list.Plo132
-rw-r--r--src/midi/.deps/fluid_midi.Plo156
-rw-r--r--src/midi/.deps/midi_loader.Plo127
-rw-r--r--src/midi/.deps/test_midi_loader.Po127
-rw-r--r--src/midi/.libs/fluid_list.obin16672 -> 16696 bytes
-rw-r--r--src/midi/.libs/fluid_midi.obin79400 -> 79536 bytes
-rw-r--r--src/midi/.libs/libfluidmidi.abin126432 -> 130688 bytes
-rw-r--r--src/midi/.libs/midi_loader.obin27656 -> 31752 bytes
-rw-r--r--src/midi/Makefile12
-rw-r--r--src/midi/fluid_list.lo2
-rw-r--r--src/midi/fluid_list.obin17512 -> 17536 bytes
-rw-r--r--src/midi/fluid_midi.lo2
-rw-r--r--src/midi/fluid_midi.obin86048 -> 86056 bytes
-rw-r--r--src/midi/libfluidmidi.la2
-rw-r--r--src/midi/midi_loader.c144
-rw-r--r--src/midi/midi_loader.h5
-rw-r--r--src/midi/midi_loader.lo2
-rw-r--r--src/midi/midi_loader.obin27184 -> 31840 bytes
-rwxr-xr-xsrc/midi/test_midi_loaderbin82280 -> 84462 bytes
-rw-r--r--src/midi/test_midi_loader.c2
-rw-r--r--src/midi/test_midi_loader.obin10320 -> 10632 bytes
45 files changed, 1202 insertions, 1411 deletions
diff --git a/Makefile b/Makefile
index d9c90d2..c409f06 100644
--- a/Makefile
+++ b/Makefile
@@ -216,10 +216,10 @@ DUMPBIN =
ECHO_C =
ECHO_N = -n
ECHO_T =
-EGREP = /bin/grep -E
+EGREP = /usr/bin/grep -E
EXEEXT =
-FGREP = /bin/grep -F
-GREP = /bin/grep
+FGREP = /usr/bin/grep -F
+GREP = /usr/bin/grep
INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
@@ -235,7 +235,7 @@ LN_S = ln -s
LTLIBOBJS =
MAKEINFO = ${SHELL} /home/pepper/dssi-render/missing makeinfo
MANIFEST_TOOL = :
-MKDIR_P = /bin/mkdir -p
+MKDIR_P = /usr/bin/mkdir -p
NM = /usr/bin/nm -B
NMEDIT =
OBJDUMP = objdump
@@ -254,9 +254,9 @@ PKG_CONFIG = /usr/bin/pkg-config
PKG_CONFIG_LIBDIR =
PKG_CONFIG_PATH =
RANLIB = ranlib
-SED = /bin/sed
+SED = /usr/bin/sed
SET_MAKE =
-SHELL = /bin/bash
+SHELL = /bin/sh
SNDFILE_CFLAGS =
SNDFILE_LIBS = -lsndfile
STRIP = strip
diff --git a/TODO b/TODO
new file mode 100644
index 0000000..e9f18c9
--- /dev/null
+++ b/TODO
@@ -0,0 +1,3 @@
+pass in sample rate from command line args
+take out test for outfile
+test presets
diff --git a/aclocal.m4 b/aclocal.m4
index 9fb1ad6..b5b33b2 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1326,7 +1326,7 @@ ia64-*-hpux*)
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -1338,19 +1338,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- case `/usr/bin/file conftest.o` in
- *x86-64*)
- LD="${LD-ld} -m elf32_x86_64"
- ;;
- *)
- LD="${LD-ld} -m elf_i386"
- ;;
- esac
- ;;
- powerpc64le-*)
- LD="${LD-ld} -m elf32lppclinux"
+ LD="${LD-ld} -m elf_i386"
;;
- powerpc64-*)
+ ppc64-*linux*|powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -1369,10 +1359,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- powerpcle-*)
- LD="${LD-ld} -m elf64lppc"
- ;;
- powerpc-*)
+ ppc*-*linux*|powerpc*-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
@@ -1715,8 +1702,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len" && \
- test undefined != "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
@@ -2540,6 +2526,17 @@ freebsd* | dragonfly*)
esac
;;
+gnu*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
@@ -2656,7 +2653,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
@@ -2701,18 +2698,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -3272,6 +3257,10 @@ freebsd* | dragonfly*)
fi
;;
+gnu*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3310,11 +3299,11 @@ irix5* | irix6* | nonstopux*)
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -4062,7 +4051,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -4126,7 +4115,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4361,7 +4350,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -4603,9 +4592,6 @@ m4_if([$1], [CXX], [
;;
esac
;;
- linux* | k*bsd*-gnu | gnu*)
- _LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -4668,9 +4654,6 @@ dnl Note also adjust exclude_expsyms for C++ above.
openbsd*)
with_gnu_ld=no
;;
- linux* | k*bsd*-gnu | gnu*)
- _LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
@@ -4892,7 +4875,7 @@ _LT_EOF
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -5069,7 +5052,6 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
- _LT_TAGVAR(link_all_deplibs, $1)=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -5374,7 +5356,7 @@ _LT_EOF
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -6250,6 +6232,9 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=yes
;;
+ gnu*)
+ ;;
+
haiku*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
_LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -6411,7 +6396,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -8920,9 +8905,10 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-# Expand $ac_aux_dir to an absolute path.
-am_aux_dir=`cd "$ac_aux_dir" && pwd`
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
@@ -9389,8 +9375,7 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi
-])
+fi])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0
index 5af1bc3..979cb4c 100644
--- a/autom4te.cache/output.0
+++ b/autom4te.cache/output.0
@@ -2332,8 +2332,8 @@ esac
-# Expand $ac_aux_dir to an absolute path.
-am_aux_dir=`cd "$ac_aux_dir" && pwd`
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -3903,8 +3903,7 @@ else
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len" && \
- test undefined != "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
@@ -4305,6 +4304,10 @@ freebsd* | dragonfly*)
fi
;;
+gnu*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -4343,11 +4346,11 @@ irix5* | irix6* | nonstopux*)
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
@@ -5467,7 +5470,7 @@ ia64-*-hpux*)
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -5483,19 +5486,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- case `/usr/bin/file conftest.o` in
- *x86-64*)
- LD="${LD-ld} -m elf32_x86_64"
- ;;
- *)
- LD="${LD-ld} -m elf_i386"
- ;;
- esac
- ;;
- powerpc64le-*)
- LD="${LD-ld} -m elf32lppclinux"
+ LD="${LD-ld} -m elf_i386"
;;
- powerpc64-*)
+ ppc64-*linux*|powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -5514,10 +5507,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- powerpcle-*)
- LD="${LD-ld} -m elf64lppc"
- ;;
- powerpc-*)
+ ppc*-*linux*|powerpc*-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
@@ -7325,7 +7315,7 @@ lt_prog_compiler_static=
lt_prog_compiler_static='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -7803,9 +7793,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
openbsd*)
with_gnu_ld=no
;;
- linux* | k*bsd*-gnu | gnu*)
- link_all_deplibs=no
- ;;
esac
ld_shlibs=yes
@@ -8027,7 +8014,7 @@ _LT_EOF
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -8204,7 +8191,6 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
- link_all_deplibs=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -8658,7 +8644,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
link_all_deplibs=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -9495,6 +9481,17 @@ freebsd* | dragonfly*)
esac
;;
+gnu*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
@@ -9611,7 +9608,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
@@ -9675,18 +9672,6 @@ fi
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -11394,7 +11379,6 @@ fi
-
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
diff --git a/autom4te.cache/output.1 b/autom4te.cache/output.1
index 7cd1828..cd3f535 100644
--- a/autom4te.cache/output.1
+++ b/autom4te.cache/output.1
@@ -2332,8 +2332,8 @@ esac
-# Expand $ac_aux_dir to an absolute path.
-am_aux_dir=`cd "$ac_aux_dir" && pwd`
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -3903,8 +3903,7 @@ else
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len" && \
- test undefined != "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
@@ -4305,6 +4304,10 @@ freebsd* | dragonfly*)
fi
;;
+gnu*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -4343,11 +4346,11 @@ irix5* | irix6* | nonstopux*)
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
@@ -5467,7 +5470,7 @@ ia64-*-hpux*)
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -5483,19 +5486,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- case `/usr/bin/file conftest.o` in
- *x86-64*)
- LD="${LD-ld} -m elf32_x86_64"
- ;;
- *)
- LD="${LD-ld} -m elf_i386"
- ;;
- esac
- ;;
- powerpc64le-*)
- LD="${LD-ld} -m elf32lppclinux"
+ LD="${LD-ld} -m elf_i386"
;;
- powerpc64-*)
+ ppc64-*linux*|powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -5514,10 +5507,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- powerpcle-*)
- LD="${LD-ld} -m elf64lppc"
- ;;
- powerpc-*)
+ ppc*-*linux*|powerpc*-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
@@ -7321,7 +7311,7 @@ lt_prog_compiler_static=
lt_prog_compiler_static='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -7799,9 +7789,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
openbsd*)
with_gnu_ld=no
;;
- linux* | k*bsd*-gnu | gnu*)
- link_all_deplibs=no
- ;;
esac
ld_shlibs=yes
@@ -8023,7 +8010,7 @@ _LT_EOF
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -8200,7 +8187,6 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
- link_all_deplibs=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -8654,7 +8640,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
link_all_deplibs=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -9491,6 +9477,17 @@ freebsd* | dragonfly*)
esac
;;
+gnu*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
@@ -9607,7 +9604,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
@@ -9671,18 +9668,6 @@ fi
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -11390,7 +11375,6 @@ fi
-
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
diff --git a/autom4te.cache/requests b/autom4te.cache/requests
index f7260c9..cd95be7 100644
--- a/autom4te.cache/requests
+++ b/autom4te.cache/requests
@@ -1,4 +1,4 @@
-# This file was generated by Autom4te Sun Aug 31 17:43:43 UTC 2014.
+# This file was generated.
# It contains the lists of macros which have been traced.
# It can be safely removed.
@@ -42,192 +42,192 @@
'configure.ac'
],
{
- '_AM_PROG_TAR' => 1,
- 'LT_AC_PROG_EGREP' => 1,
- 'LT_PROG_GCJ' => 1,
- 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
- 'AC_LIBTOOL_COMPILER_OPTION' => 1,
- 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
- 'LTOPTIONS_VERSION' => 1,
- '_LT_AC_TAGVAR' => 1,
- 'AM_SET_LEADING_DOT' => 1,
- 'AC_LIBTOOL_FC' => 1,
- 'AM_CONDITIONAL' => 1,
- '_LT_AC_TRY_DLOPEN_SELF' => 1,
- 'LT_CONFIG_LTDL_DIR' => 1,
- 'LTDL_CONVENIENCE' => 1,
- 'AC_LIBTOOL_CXX' => 1,
- 'LT_SYS_MODULE_PATH' => 1,
- '_LT_AC_LANG_F77' => 1,
- 'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
- '_LT_COMPILER_OPTION' => 1,
- '_AM_IF_OPTION' => 1,
- 'AC_PROG_LD_RELOAD_FLAG' => 1,
- '_LT_PROG_ECHO_BACKSLASH' => 1,
- '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
- 'AC_PROG_EGREP' => 1,
- '_LT_PROG_LTMAIN' => 1,
- 'LTOBSOLETE_VERSION' => 1,
- 'AM_ENABLE_STATIC' => 1,
- 'AC_LIBLTDL_CONVENIENCE' => 1,
- 'LT_PROG_GO' => 1,
- 'AC_PATH_TOOL_PREFIX' => 1,
- 'AC_LTDL_DLSYM_USCORE' => 1,
- 'AM_MAKE_INCLUDE' => 1,
+ 'AC_ENABLE_FAST_INSTALL' => 1,
'AC_LIB_LTDL' => 1,
- 'LT_FUNC_DLSYM_USCORE' => 1,
- 'LT_SYS_DLOPEN_DEPLIBS' => 1,
- 'AM_PROG_INSTALL_STRIP' => 1,
- '_LT_AC_LANG_GCJ_CONFIG' => 1,
- '_AM_CONFIG_MACRO_DIRS' => 1,
- 'LT_SYS_DLOPEN_SELF' => 1,
- '_AM_DEPENDENCIES' => 1,
- '_AM_SET_OPTIONS' => 1,
- 'AM_PROG_LD' => 1,
- '_AM_AUTOCONF_VERSION' => 1,
- 'AC_CHECK_LIBM' => 1,
- 'AC_LIBTOOL_F77' => 1,
- 'gl_PREREQ_ARGZ' => 1,
- 'LT_SYS_SYMBOL_USCORE' => 1,
- 'AC_LIBLTDL_INSTALLABLE' => 1,
- '_LTDL_SETUP' => 1,
- 'LT_WITH_LTDL' => 1,
- 'AC_LIBTOOL_LINKER_OPTION' => 1,
'AC_DEFUN' => 1,
- 'PKG_CHECK_MODULES' => 1,
- '_LT_COMPILER_BOILERPLATE' => 1,
- 'LT_LIB_M' => 1,
- 'AC_WITH_LTDL' => 1,
- 'AM_MISSING_HAS_RUN' => 1,
- 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
- 'AM_SUBST_NOTMAKE' => 1,
- 'AC_LTDL_SHLIBPATH' => 1,
- '_LT_LINKER_BOILERPLATE' => 1,
- 'PKG_PROG_PKG_CONFIG' => 1,
- '_LT_WITH_SYSROOT' => 1,
- 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
- '_LT_AC_LANG_CXX' => 1,
- 'LT_PATH_NM' => 1,
+ 'PKG_INSTALLDIR' => 1,
+ 'LT_LIB_DLLOAD' => 1,
+ 'm4_pattern_allow' => 1,
+ 'AC_PROG_EGREP' => 1,
'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+ 'AM_AUX_DIR_EXPAND' => 1,
+ 'LTDL_INSTALLABLE' => 1,
+ 'gl_PREREQ_ARGZ' => 1,
+ 'AM_SET_DEPDIR' => 1,
+ 'AM_DISABLE_SHARED' => 1,
'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ 'LT_WITH_LTDL' => 1,
+ 'AM_PROG_INSTALL_STRIP' => 1,
+ '_LT_AC_TAGCONFIG' => 1,
+ 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+ '_AM_CONFIG_MACRO_DIRS' => 1,
+ 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+ '_LT_COMPILER_OPTION' => 1,
+ 'AC_PROG_LD_RELOAD_FLAG' => 1,
+ '_LT_AC_LANG_GCJ_CONFIG' => 1,
+ '_LT_PROG_F77' => 1,
+ '_LT_AC_LANG_F77_CONFIG' => 1,
+ '_LT_PROG_LTMAIN' => 1,
+ '_AC_PROG_LIBTOOL' => 1,
+ 'LT_FUNC_DLSYM_USCORE' => 1,
+ 'AC_LIBTOOL_COMPILER_OPTION' => 1,
+ '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
'AC_ENABLE_STATIC' => 1,
- 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
- 'AC_PROG_LD' => 1,
'AC_DISABLE_STATIC' => 1,
- '_LT_AC_LANG_CXX_CONFIG' => 1,
- 'LT_PROG_RC' => 1,
- 'AC_LTDL_SHLIBEXT' => 1,
- 'PKG_CHECK_EXISTS' => 1,
- 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
- '_LT_AC_LANG_RC_CONFIG' => 1,
- 'AM_SET_DEPDIR' => 1,
- '_LT_AC_TAGCONFIG' => 1,
- 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
- 'AM_AUX_DIR_EXPAND' => 1,
+ 'PKG_CHECK_VAR' => 1,
+ 'LT_SYS_MODULE_PATH' => 1,
+ 'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
'gl_FUNC_ARGZ' => 1,
- 'AC_LIBTOOL_RC' => 1,
- '_m4_warn' => 1,
- 'AC_LTDL_DLLIB' => 1,
+ '_AM_IF_OPTION' => 1,
+ 'AC_LTDL_SYMBOL_USCORE' => 1,
+ 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+ 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+ 'AC_LTDL_PREOPEN' => 1,
+ 'AC_LIBTOOL_GCJ' => 1,
+ '_LT_AC_FILE_LTDLL_C' => 1,
+ 'AC_CHECK_LIBM' => 1,
+ '_LT_AC_LANG_C_CONFIG' => 1,
+ '_LT_PROG_CXX' => 1,
'AC_ENABLE_SHARED' => 1,
- 'PKG_INSTALLDIR' => 1,
- 'LT_OUTPUT' => 1,
- 'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
- 'LT_SUPPORTED_TAG' => 1,
- 'LT_SYS_MODULE_EXT' => 1,
- 'LTVERSION_VERSION' => 1,
- 'LT_AC_PROG_RC' => 1,
- 'AC_LTDL_ENABLE_INSTALL' => 1,
+ 'AC_LIBTOOL_WIN32_DLL' => 1,
+ 'LTSUGAR_VERSION' => 1,
+ 'AC_LIBTOOL_CONFIG' => 1,
+ 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
'LT_AC_PROG_SED' => 1,
- '_LT_AC_SYS_COMPILER' => 1,
- '_AC_AM_CONFIG_HEADER_HOOK' => 1,
'LT_LANG' => 1,
- '_LT_LIBOBJ' => 1,
- 'AC_CONFIG_MACRO_DIR_TRACE' => 1,
- 'AM_PROG_CC_C_O' => 1,
- 'LT_SYS_DLSEARCH_PATH' => 1,
- 'AC_LTDL_SYMBOL_USCORE' => 1,
- '_LT_AC_SHELL_INIT' => 1,
- 'LTDL_INIT' => 1,
- 'AM_DEP_TRACK' => 1,
- 'm4_include' => 1,
- 'PKG_CHECK_VAR' => 1,
- 'AC_LTDL_SYSSEARCHPATH' => 1,
- '_AM_PROG_CC_C_O' => 1,
- 'LTSUGAR_VERSION' => 1,
- '_LT_LINKER_OPTION' => 1,
'_AM_MANGLE_OPTION' => 1,
- '_LT_AC_LANG_F77_CONFIG' => 1,
- 'AM_DISABLE_SHARED' => 1,
'PKG_NOARCH_INSTALLDIR' => 1,
- 'AM_RUN_LOG' => 1,
- '_LT_REQUIRED_DARWIN_CHECKS' => 1,
- 'AM_PROG_LIBTOOL' => 1,
- 'AM_ENABLE_SHARED' => 1,
+ 'LT_PATH_NM' => 1,
'AM_MISSING_PROG' => 1,
- 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
- 'AC_PATH_MAGIC' => 1,
- 'AC_LIBTOOL_SETUP' => 1,
- 'AC_LTDL_OBJDIR' => 1,
- '_LT_AC_LOCK' => 1,
- '_AM_SUBST_NOTMAKE' => 1,
- '_LT_PREPARE_SED_QUOTE_VARS' => 1,
- 'LT_INIT' => 1,
- 'AC_DISABLE_FAST_INSTALL' => 1,
- 'AC_PROG_LD_GNU' => 1,
- '_LT_CC_BASENAME' => 1,
+ '_LT_AC_SYS_COMPILER' => 1,
+ 'AM_PROG_LD' => 1,
+ 'AC_LIBTOOL_CXX' => 1,
+ '_AM_PROG_TAR' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
+ 'PKG_CHECK_MODULES' => 1,
+ '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+ '_LT_LINKER_OPTION' => 1,
+ 'LT_SYS_DLSEARCH_PATH' => 1,
+ '_m4_warn' => 1,
+ 'AC_LTDL_SHLIBEXT' => 1,
+ 'AC_LTDL_SHLIBPATH' => 1,
+ 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+ 'AC_LIBTOOL_DLOPEN_SELF' => 1,
+ 'AC_LIBTOOL_OBJDIR' => 1,
+ 'AM_SUBST_NOTMAKE' => 1,
+ 'LT_OUTPUT' => 1,
+ 'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+ 'm4_include' => 1,
+ 'LT_SUPPORTED_TAG' => 1,
+ 'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+ '_LT_COMPILER_BOILERPLATE' => 1,
+ 'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+ 'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+ '_AM_SET_OPTIONS' => 1,
+ 'AM_PROG_INSTALL_SH' => 1,
+ 'AC_PROG_LD' => 1,
'_LT_AC_PROG_CXXCPP' => 1,
- '_LT_PROG_FC' => 1,
- 'AU_DEFUN' => 1,
- 'AC_DISABLE_SHARED' => 1,
+ 'AC_LTDL_OBJDIR' => 1,
+ 'AM_SILENT_RULES' => 1,
+ '_AM_PROG_CC_C_O' => 1,
+ 'LT_AC_PROG_EGREP' => 1,
+ 'LTVERSION_VERSION' => 1,
+ 'AM_DEP_TRACK' => 1,
+ '_LT_AC_SHELL_INIT' => 1,
+ 'AC_DISABLE_FAST_INSTALL' => 1,
+ '_LT_AC_TRY_DLOPEN_SELF' => 1,
+ 'LT_PROG_RC' => 1,
'_LT_AC_LANG_GCJ' => 1,
- 'm4_pattern_forbid' => 1,
- 'AC_LIBTOOL_PICMODE' => 1,
- 'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
- 'AC_PROG_LIBTOOL' => 1,
- '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- 'AC_LIBTOOL_GCJ' => 1,
- 'AC_CONFIG_MACRO_DIR' => 1,
- '_LT_AC_CHECK_DLFCN' => 1,
- 'AM_PROG_NM' => 1,
- 'include' => 1,
+ '_LT_PREPARE_SED_QUOTE_VARS' => 1,
'AC_DEPLIBS_CHECK_METHOD' => 1,
- 'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
- 'LT_CMD_MAX_LEN' => 1,
- 'AC_LIBTOOL_LANG_C_CONFIG' => 1,
- 'AC_PROG_NM' => 1,
- '_LT_PROG_CXX' => 1,
- 'AC_LIBTOOL_CONFIG' => 1,
- 'LT_LIB_DLLOAD' => 1,
'AM_DISABLE_STATIC' => 1,
- '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
- 'LTDL_INSTALLABLE' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
+ 'AC_LIBTOOL_PROG_CC_C_O' => 1,
+ 'AC_LTDL_SYSSEARCHPATH' => 1,
+ 'AC_LIBTOOL_RC' => 1,
+ 'AC_PROG_LIBTOOL' => 1,
+ 'AC_LTDL_ENABLE_INSTALL' => 1,
+ 'AM_PROG_NM' => 1,
+ 'PKG_PROG_PKG_CONFIG' => 1,
+ '_LT_LIBOBJ' => 1,
+ 'AM_PROG_CC_C_O' => 1,
+ 'AC_LIBTOOL_FC' => 1,
+ 'AM_PROG_LIBTOOL' => 1,
+ 'AC_LIBLTDL_INSTALLABLE' => 1,
+ 'AC_LIBTOOL_SETUP' => 1,
+ 'LT_PATH_LD' => 1,
+ 'AC_CONFIG_MACRO_DIR' => 1,
+ 'LT_INIT' => 1,
+ 'LTDL_INIT' => 1,
+ 'AC_LIBTOOL_PICMODE' => 1,
+ 'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
+ 'AM_RUN_LOG' => 1,
+ '_LT_AC_LANG_CXX' => 1,
+ '_LT_AC_LOCK' => 1,
+ 'AC_WITH_LTDL' => 1,
'_LT_AC_SYS_LIBPATH_AIX' => 1,
- 'AM_PROG_INSTALL_SH' => 1,
- 'AC_LIBTOOL_DLOPEN' => 1,
- 'm4_pattern_allow' => 1,
- 'AC_ENABLE_FAST_INSTALL' => 1,
- 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
- '_LT_PATH_TOOL_PREFIX' => 1,
- 'AM_SANITY_CHECK' => 1,
+ 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+ 'LTDL_CONVENIENCE' => 1,
+ 'LT_LIB_M' => 1,
+ 'LT_AC_PROG_RC' => 1,
+ '_LT_PROG_ECHO_BACKSLASH' => 1,
+ '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+ 'AC_PROG_NM' => 1,
+ 'AC_PATH_TOOL_PREFIX' => 1,
+ 'AC_DISABLE_SHARED' => 1,
+ '_AM_AUTOCONF_VERSION' => 1,
+ 'AU_DEFUN' => 1,
+ 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+ 'AM_ENABLE_SHARED' => 1,
+ '_LT_AC_TAGVAR' => 1,
+ 'LT_SYS_DLOPEN_SELF' => 1,
+ 'LT_PROG_GO' => 1,
+ 'LT_SYS_SYMBOL_USCORE' => 1,
+ 'PKG_CHECK_EXISTS' => 1,
+ '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ '_LTDL_SETUP' => 1,
+ 'AM_CONDITIONAL' => 1,
'AC_DEFUN_ONCE' => 1,
- '_LT_PROG_F77' => 1,
- 'AM_SILENT_RULES' => 1,
+ 'LT_CONFIG_LTDL_DIR' => 1,
+ 'LT_CMD_MAX_LEN' => 1,
'_AM_SET_OPTION' => 1,
- 'AC_LIBTOOL_OBJDIR' => 1,
+ 'AC_LIBTOOL_DLOPEN' => 1,
+ 'LT_SYS_DLOPEN_DEPLIBS' => 1,
+ '_LT_AC_CHECK_DLFCN' => 1,
'LT_AC_PROG_GCJ' => 1,
+ 'AM_MAKE_INCLUDE' => 1,
+ '_LT_PROG_FC' => 1,
+ 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+ 'AC_LIBTOOL_F77' => 1,
+ '_LT_CC_BASENAME' => 1,
+ '_AM_DEPENDENCIES' => 1,
+ 'AC_LIBLTDL_CONVENIENCE' => 1,
+ 'include' => 1,
+ 'AM_MISSING_HAS_RUN' => 1,
+ 'AC_LIBTOOL_LINKER_OPTION' => 1,
+ 'AM_SANITY_CHECK' => 1,
+ 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+ 'AC_PATH_MAGIC' => 1,
+ '_LT_AC_LANG_RC_CONFIG' => 1,
+ 'AM_SET_LEADING_DOT' => 1,
+ '_LT_LINKER_BOILERPLATE' => 1,
+ '_LT_WITH_SYSROOT' => 1,
+ 'AC_PROG_LD_GNU' => 1,
+ 'LT_SYS_MODULE_EXT' => 1,
+ '_LT_AC_LANG_F77' => 1,
+ '_LT_AC_LANG_CXX_CONFIG' => 1,
+ 'm4_pattern_forbid' => 1,
+ 'AC_LTDL_DLSYM_USCORE' => 1,
+ '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
+ 'LT_PROG_GCJ' => 1,
+ 'AC_LTDL_DLLIB' => 1,
+ '_LT_PATH_TOOL_PREFIX' => 1,
+ 'LTOPTIONS_VERSION' => 1,
+ 'LTOBSOLETE_VERSION' => 1,
'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
- 'AC_LTDL_PREOPEN' => 1,
- 'AC_LIBTOOL_PROG_CC_C_O' => 1,
- 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
- '_AC_PROG_LIBTOOL' => 1,
- 'AC_LIBTOOL_DLOPEN_SELF' => 1,
- 'AM_INIT_AUTOMAKE' => 1,
- '_LT_AC_LANG_C_CONFIG' => 1,
- 'LT_PATH_LD' => 1,
- '_LT_AC_FILE_LTDLL_C' => 1,
- 'AC_LIBTOOL_WIN32_DLL' => 1
+ 'AM_ENABLE_STATIC' => 1
}
], 'Autom4te::Request' ),
bless( [
@@ -242,66 +242,66 @@
'configure.ac'
],
{
- 'sinclude' => 1,
- 'AC_FC_PP_DEFINE' => 1,
- 'AM_PROG_AR' => 1,
- 'AC_FC_PP_SRCEXT' => 1,
'AM_PROG_FC_C_O' => 1,
- 'AC_CANONICAL_TARGET' => 1,
- 'AC_CONFIG_SUBDIRS' => 1,
+ 'sinclude' => 1,
'm4_pattern_allow' => 1,
+ 'AM_SILENT_RULES' => 1,
+ 'AM_MAKEFILE_INCLUDE' => 1,
+ 'AM_XGETTEXT_OPTION' => 1,
+ 'LT_CONFIG_LTDL_DIR' => 1,
+ 'AC_CANONICAL_BUILD' => 1,
+ 'AC_SUBST' => 1,
+ 'AM_GNU_GETTEXT' => 1,
+ 'AC_CONFIG_LIBOBJ_DIR' => 1,
+ 'AM_CONDITIONAL' => 1,
'AM_MAINTAINER_MODE' => 1,
+ 'AC_INIT' => 1,
+ '_LT_AC_TAGCONFIG' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
+ '_m4_warn' => 1,
+ 'AC_LIBSOURCE' => 1,
+ 'include' => 1,
+ 'AM_PROG_MOC' => 1,
'_AM_COND_ENDIF' => 1,
+ 'AM_PROG_CXX_C_O' => 1,
+ 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+ 'AM_PROG_AR' => 1,
+ '_AM_COND_ELSE' => 1,
+ 'AC_CONFIG_AUX_DIR' => 1,
+ 'AC_CONFIG_SUBDIRS' => 1,
+ '_AM_MAKEFILE_INCLUDE' => 1,
+ 'AC_PROG_LIBTOOL' => 1,
+ 'AC_FC_FREEFORM' => 1,
'AM_PROG_LIBTOOL' => 1,
- '_AM_COND_IF' => 1,
- 'AM_GNU_GETTEXT' => 1,
- 'm4_pattern_forbid' => 1,
- 'AM_PATH_GUILE' => 1,
- 'AC_SUBST' => 1,
'AC_CONFIG_LINKS' => 1,
- 'AC_REQUIRE_AUX_FILE' => 1,
- 'AM_PROG_MKDIR_P' => 1,
- 'AC_SUBST_TRACE' => 1,
- '_m4_warn' => 1,
- 'AM_INIT_AUTOMAKE' => 1,
+ 'AM_PROG_CC_C_O' => 1,
+ 'AC_CANONICAL_SYSTEM' => 1,
'AM_POT_TOOLS' => 1,
- '_AM_MAKEFILE_INCLUDE' => 1,
- 'AC_FC_SRCEXT' => 1,
- 'AM_PROG_MOC' => 1,
- 'AH_OUTPUT' => 1,
- 'AM_EXTRA_RECURSIVE_TARGETS' => 1,
- 'AC_LIBSOURCE' => 1,
+ 'LT_SUPPORTED_TAG' => 1,
+ 'm4_include' => 1,
+ 'AM_NLS' => 1,
'LT_INIT' => 1,
- 'AC_DEFINE_TRACE_LITERAL' => 1,
+ 'AM_PROG_MKDIR_P' => 1,
'_AM_SUBST_NOTMAKE' => 1,
- 'AM_SILENT_RULES' => 1,
- '_LT_AC_TAGCONFIG' => 1,
- 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+ 'AC_FC_PP_SRCEXT' => 1,
+ 'AC_FC_SRCEXT' => 1,
+ 'AM_EXTRA_RECURSIVE_TARGETS' => 1,
'm4_sinclude' => 1,
- 'AC_FC_FREEFORM' => 1,
- 'AM_PROG_CC_C_O' => 1,
- 'AC_CANONICAL_HOST' => 1,
+ 'AC_SUBST_TRACE' => 1,
+ 'AC_CANONICAL_TARGET' => 1,
'AC_CONFIG_FILES' => 1,
- 'AC_CONFIG_AUX_DIR' => 1,
- 'LT_SUPPORTED_TAG' => 1,
- 'AM_PROG_F77_C_O' => 1,
- 'AC_PROG_LIBTOOL' => 1,
- 'AC_CANONICAL_SYSTEM' => 1,
- 'AC_CONFIG_HEADERS' => 1,
- 'AC_INIT' => 1,
- 'AC_CONFIG_LIBOBJ_DIR' => 1,
- '_AM_COND_ELSE' => 1,
- 'AM_XGETTEXT_OPTION' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
- 'AM_MAKEFILE_INCLUDE' => 1,
+ 'AH_OUTPUT' => 1,
+ 'AC_CANONICAL_HOST' => 1,
+ 'm4_pattern_forbid' => 1,
+ 'AC_DEFINE_TRACE_LITERAL' => 1,
+ 'AC_REQUIRE_AUX_FILE' => 1,
'AM_ENABLE_MULTILIB' => 1,
- 'AC_CANONICAL_BUILD' => 1,
- 'LT_CONFIG_LTDL_DIR' => 1,
- 'm4_include' => 1,
- 'AM_NLS' => 1,
- 'include' => 1,
- 'AM_CONDITIONAL' => 1,
- 'AM_PROG_CXX_C_O' => 1
+ 'AM_PATH_GUILE' => 1,
+ 'AM_PROG_F77_C_O' => 1,
+ 'AC_FC_PP_DEFINE' => 1,
+ '_AM_COND_IF' => 1,
+ 'AC_CONFIG_HEADERS' => 1
}
], 'Autom4te::Request' )
);
diff --git a/autom4te.cache/traces.0 b/autom4te.cache/traces.0
index eee3708..81fc9df 100644
--- a/autom4te.cache/traces.0
+++ b/autom4te.cache/traces.0
@@ -254,7 +254,7 @@ esac
AC_MSG_RESULT([${lt_sysroot:-no}])
_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
[dependent libraries, and in which our libraries should be installed.])])
-m4trace:/usr/share/aclocal/libtool.m4:1515: -1- AC_DEFUN([_LT_COMPILER_OPTION], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4trace:/usr/share/aclocal/libtool.m4:1502: -1- AC_DEFUN([_LT_COMPILER_OPTION], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_SED])dnl
AC_CACHE_CHECK([$1], [$2],
[$2=no
@@ -293,11 +293,11 @@ else
m4_if([$6], , :, [$6])
fi
])
-m4trace:/usr/share/aclocal/libtool.m4:1557: -1- AU_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [m4_if($#, 0, [_LT_COMPILER_OPTION], [_LT_COMPILER_OPTION($@)])])
-m4trace:/usr/share/aclocal/libtool.m4:1557: -1- AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [AC_DIAGNOSE([obsolete], [The macro `AC_LIBTOOL_COMPILER_OPTION' is obsolete.
+m4trace:/usr/share/aclocal/libtool.m4:1544: -1- AU_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [m4_if($#, 0, [_LT_COMPILER_OPTION], [_LT_COMPILER_OPTION($@)])])
+m4trace:/usr/share/aclocal/libtool.m4:1544: -1- AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [AC_DIAGNOSE([obsolete], [The macro `AC_LIBTOOL_COMPILER_OPTION' is obsolete.
You should run autoupdate.])dnl
m4_if($#, 0, [_LT_COMPILER_OPTION], [_LT_COMPILER_OPTION($@)])])
-m4trace:/usr/share/aclocal/libtool.m4:1566: -1- AC_DEFUN([_LT_LINKER_OPTION], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4trace:/usr/share/aclocal/libtool.m4:1553: -1- AC_DEFUN([_LT_LINKER_OPTION], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_SED])dnl
AC_CACHE_CHECK([$1], [$2],
[$2=no
@@ -329,11 +329,11 @@ else
m4_if([$5], , :, [$5])
fi
])
-m4trace:/usr/share/aclocal/libtool.m4:1601: -1- AU_DEFUN([AC_LIBTOOL_LINKER_OPTION], [m4_if($#, 0, [_LT_LINKER_OPTION], [_LT_LINKER_OPTION($@)])])
-m4trace:/usr/share/aclocal/libtool.m4:1601: -1- AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [AC_DIAGNOSE([obsolete], [The macro `AC_LIBTOOL_LINKER_OPTION' is obsolete.
+m4trace:/usr/share/aclocal/libtool.m4:1588: -1- AU_DEFUN([AC_LIBTOOL_LINKER_OPTION], [m4_if($#, 0, [_LT_LINKER_OPTION], [_LT_LINKER_OPTION($@)])])
+m4trace:/usr/share/aclocal/libtool.m4:1588: -1- AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [AC_DIAGNOSE([obsolete], [The macro `AC_LIBTOOL_LINKER_OPTION' is obsolete.
You should run autoupdate.])dnl
m4_if($#, 0, [_LT_LINKER_OPTION], [_LT_LINKER_OPTION($@)])])
-m4trace:/usr/share/aclocal/libtool.m4:1608: -1- AC_DEFUN([LT_CMD_MAX_LEN], [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4trace:/usr/share/aclocal/libtool.m4:1595: -1- AC_DEFUN([LT_CMD_MAX_LEN], [AC_REQUIRE([AC_CANONICAL_HOST])dnl
# find the maximum length of command line arguments
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
@@ -428,8 +428,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len" && \
- test undefined != "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
@@ -469,11 +468,11 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
_LT_DECL([], [max_cmd_len], [0],
[What is the maximum length of a command?])
])
-m4trace:/usr/share/aclocal/libtool.m4:1747: -1- AU_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [m4_if($#, 0, [LT_CMD_MAX_LEN], [LT_CMD_MAX_LEN($@)])])
-m4trace:/usr/share/aclocal/libtool.m4:1747: -1- AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [AC_DIAGNOSE([obsolete], [The macro `AC_LIBTOOL_SYS_MAX_CMD_LEN' is obsolete.
+m4trace:/usr/share/aclocal/libtool.m4:1733: -1- AU_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [m4_if($#, 0, [LT_CMD_MAX_LEN], [LT_CMD_MAX_LEN($@)])])
+m4trace:/usr/share/aclocal/libtool.m4:1733: -1- AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [AC_DIAGNOSE([obsolete], [The macro `AC_LIBTOOL_SYS_MAX_CMD_LEN' is obsolete.
You should run autoupdate.])dnl
m4_if($#, 0, [LT_CMD_MAX_LEN], [LT_CMD_MAX_LEN($@)])])
-m4trace:/usr/share/aclocal/libtool.m4:1858: -1- AC_DEFUN([LT_SYS_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl
+m4trace:/usr/share/aclocal/libtool.m4:1844: -1- AC_DEFUN([LT_SYS_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl
if test "x$enable_dlopen" != xyes; then
enable_dlopen=unknown
enable_dlopen_self=unknown
@@ -587,11 +586,11 @@ _LT_DECL([dlopen_self], [enable_dlopen_self], [0],
_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
[Whether dlopen of statically linked programs is supported])
])
-m4trace:/usr/share/aclocal/libtool.m4:1975: -1- AU_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [m4_if($#, 0, [LT_SYS_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF($@)])])
-m4trace:/usr/share/aclocal/libtool.m4:1975: -1- AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [AC_DIAGNOSE([obsolete], [The macro `AC_LIBTOOL_DLOPEN_SELF' is obsolete.
+m4trace:/usr/share/aclocal/libtool.m4:1961: -1- AU_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [m4_if($#, 0, [LT_SYS_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF($@)])])
+m4trace:/usr/share/aclocal/libtool.m4:1961: -1- AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [AC_DIAGNOSE([obsolete], [The macro `AC_LIBTOOL_DLOPEN_SELF' is obsolete.
You should run autoupdate.])dnl
m4_if($#, 0, [LT_SYS_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF($@)])])
-m4trace:/usr/share/aclocal/libtool.m4:2945: -1- AC_DEFUN([_LT_PATH_TOOL_PREFIX], [m4_require([_LT_DECL_EGREP])dnl
+m4trace:/usr/share/aclocal/libtool.m4:2930: -1- AC_DEFUN([_LT_PATH_TOOL_PREFIX], [m4_require([_LT_DECL_EGREP])dnl
AC_MSG_CHECKING([for $1])
AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
[case $MAGIC_CMD in
@@ -650,11 +649,11 @@ fi
_LT_DECL([], [MAGIC_CMD], [0],
[Used to examine libraries when file_magic_cmd begins with "file"])dnl
])
-m4trace:/usr/share/aclocal/libtool.m4:3007: -1- AU_DEFUN([AC_PATH_TOOL_PREFIX], [m4_if($#, 0, [_LT_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX($@)])])
-m4trace:/usr/share/aclocal/libtool.m4:3007: -1- AC_DEFUN([AC_PATH_TOOL_PREFIX], [AC_DIAGNOSE([obsolete], [The macro `AC_PATH_TOOL_PREFIX' is obsolete.
+m4trace:/usr/share/aclocal/libtool.m4:2992: -1- AU_DEFUN([AC_PATH_TOOL_PREFIX], [m4_if($#, 0, [_LT_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX($@)])])
+m4trace:/usr/share/aclocal/libtool.m4:2992: -1- AC_DEFUN([AC_PATH_TOOL_PREFIX], [AC_DIAGNOSE([obsolete], [The macro `AC_PATH_TOOL_PREFIX' is obsolete.
You should run autoupdate.])dnl
m4_if($#, 0, [_LT_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX($@)])])
-m4trace:/usr/share/aclocal/libtool.m4:3030: -1- AC_DEFUN([LT_PATH_LD], [AC_REQUIRE([AC_PROG_CC])dnl
+m4trace:/usr/share/aclocal/libtool.m4:3015: -1- AC_DEFUN([LT_PATH_LD], [AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
m4_require([_LT_DECL_SED])dnl
@@ -740,15 +739,15 @@ AC_SUBST([LD])
_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
])
-m4trace:/usr/share/aclocal/libtool.m4:3119: -1- AU_DEFUN([AM_PROG_LD], [m4_if($#, 0, [LT_PATH_LD], [LT_PATH_LD($@)])])
-m4trace:/usr/share/aclocal/libtool.m4:3119: -1- AC_DEFUN([AM_PROG_LD], [AC_DIAGNOSE([obsolete], [The macro `AM_PROG_LD' is obsolete.
+m4trace:/usr/share/aclocal/libtool.m4:3104: -1- AU_DEFUN([AM_PROG_LD], [m4_if($#, 0, [LT_PATH_LD], [LT_PATH_LD($@)])])
+m4trace:/usr/share/aclocal/libtool.m4:3104: -1- AC_DEFUN([AM_PROG_LD], [AC_DIAGNOSE([obsolete], [The macro `AM_PROG_LD' is obsolete.
You should run autoupdate.])dnl
m4_if($#, 0, [LT_PATH_LD], [LT_PATH_LD($@)])])
-m4trace:/usr/share/aclocal/libtool.m4:3120: -1- AU_DEFUN([AC_PROG_LD], [m4_if($#, 0, [LT_PATH_LD], [LT_PATH_LD($@)])])
-m4trace:/usr/share/aclocal/libtool.m4:3120: -1- AC_DEFUN([AC_PROG_LD], [AC_DIAGNOSE([obsolete], [The macro `AC_PROG_LD' is obsolete.
+m4trace:/usr/share/aclocal/libtool.m4:3105: -1- AU_DEFUN([AC_PROG_LD], [m4_if($#, 0, [LT_PATH_LD], [LT_PATH_LD($@)])])
+m4trace:/usr/share/aclocal/libtool.m4:3105: -1- AC_DEFUN([AC_PROG_LD], [AC_DIAGNOSE([obsolete], [The macro `AC_PROG_LD' is obsolete.
You should run autoupdate.])dnl
m4_if($#, 0, [LT_PATH_LD], [LT_PATH_LD($@)])])
-m4trace:/usr/share/aclocal/libtool.m4:3410: -1- AC_DEFUN([LT_PATH_NM], [AC_REQUIRE([AC_PROG_CC])dnl
+m4trace:/usr/share/aclocal/libtool.m4:3399: -1- AC_DEFUN([LT_PATH_NM], [AC_REQUIRE([AC_PROG_CC])dnl
AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
[if test -n "$NM"; then
# Let the user override the test.
@@ -835,15 +834,15 @@ AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
fi
rm -f conftest*])
])
-m4trace:/usr/share/aclocal/libtool.m4:3500: -1- AU_DEFUN([AM_PROG_NM], [m4_if($#, 0, [LT_PATH_NM], [LT_PATH_NM($@)])])
-m4trace:/usr/share/aclocal/libtool.m4:3500: -1- AC_DEFUN([AM_PROG_NM], [AC_DIAGNOSE([obsolete], [The macro `AM_PROG_NM' is obsolete.
+m4trace:/usr/share/aclocal/libtool.m4:3489: -1- AU_DEFUN([AM_PROG_NM], [m4_if($#, 0, [LT_PATH_NM], [LT_PATH_NM($@)])])
+m4trace:/usr/share/aclocal/libtool.m4:3489: -1- AC_DEFUN([AM_PROG_NM], [AC_DIAGNOSE([obsolete], [The macro `AM_PROG_NM' is obsolete.
You should run autoupdate.])dnl
m4_if($#, 0, [LT_PATH_NM], [LT_PATH_NM($@)])])
-m4trace:/usr/share/aclocal/libtool.m4:3501: -1- AU_DEFUN([AC_PROG_NM], [m4_if($#, 0, [LT_PATH_NM], [LT_PATH_NM($@)])])
-m4trace:/usr/share/aclocal/libtool.m4:3501: -1- AC_DEFUN([AC_PROG_NM], [AC_DIAGNOSE([obsolete], [The macro `AC_PROG_NM' is obsolete.
+m4trace:/usr/share/aclocal/libtool.m4:3490: -1- AU_DEFUN([AC_PROG_NM], [m4_if($#, 0, [LT_PATH_NM], [LT_PATH_NM($@)])])
+m4trace:/usr/share/aclocal/libtool.m4:3490: -1- AC_DEFUN([AC_PROG_NM], [AC_DIAGNOSE([obsolete], [The macro `AC_PROG_NM' is obsolete.
You should run autoupdate.])dnl
m4_if($#, 0, [LT_PATH_NM], [LT_PATH_NM($@)])])
-m4trace:/usr/share/aclocal/libtool.m4:3571: -1- AC_DEFUN([LT_LIB_M], [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4trace:/usr/share/aclocal/libtool.m4:3560: -1- AC_DEFUN([LT_LIB_M], [AC_REQUIRE([AC_CANONICAL_HOST])dnl
LIBM=
case $host in
*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
@@ -859,30 +858,30 @@ case $host in
esac
AC_SUBST([LIBM])
])
-m4trace:/usr/share/aclocal/libtool.m4:3590: -1- AU_DEFUN([AC_CHECK_LIBM], [m4_if($#, 0, [LT_LIB_M], [LT_LIB_M($@)])])
-m4trace:/usr/share/aclocal/libtool.m4:3590: -1- AC_DEFUN([AC_CHECK_LIBM], [AC_DIAGNOSE([obsolete], [The macro `AC_CHECK_LIBM' is obsolete.
+m4trace:/usr/share/aclocal/libtool.m4:3579: -1- AU_DEFUN([AC_CHECK_LIBM], [m4_if($#, 0, [LT_LIB_M], [LT_LIB_M($@)])])
+m4trace:/usr/share/aclocal/libtool.m4:3579: -1- AC_DEFUN([AC_CHECK_LIBM], [AC_DIAGNOSE([obsolete], [The macro `AC_CHECK_LIBM' is obsolete.
You should run autoupdate.])dnl
m4_if($#, 0, [LT_LIB_M], [LT_LIB_M($@)])])
-m4trace:/usr/share/aclocal/libtool.m4:7637: -1- AC_DEFUN([LT_PROG_GCJ], [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+m4trace:/usr/share/aclocal/libtool.m4:7622: -1- AC_DEFUN([LT_PROG_GCJ], [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
[m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
[AC_CHECK_TOOL(GCJ, gcj,)
test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
AC_SUBST(GCJFLAGS)])])[]dnl
])
-m4trace:/usr/share/aclocal/libtool.m4:7646: -1- AU_DEFUN([LT_AC_PROG_GCJ], [m4_if($#, 0, [LT_PROG_GCJ], [LT_PROG_GCJ($@)])])
-m4trace:/usr/share/aclocal/libtool.m4:7646: -1- AC_DEFUN([LT_AC_PROG_GCJ], [AC_DIAGNOSE([obsolete], [The macro `LT_AC_PROG_GCJ' is obsolete.
+m4trace:/usr/share/aclocal/libtool.m4:7631: -1- AU_DEFUN([LT_AC_PROG_GCJ], [m4_if($#, 0, [LT_PROG_GCJ], [LT_PROG_GCJ($@)])])
+m4trace:/usr/share/aclocal/libtool.m4:7631: -1- AC_DEFUN([LT_AC_PROG_GCJ], [AC_DIAGNOSE([obsolete], [The macro `LT_AC_PROG_GCJ' is obsolete.
You should run autoupdate.])dnl
m4_if($#, 0, [LT_PROG_GCJ], [LT_PROG_GCJ($@)])])
-m4trace:/usr/share/aclocal/libtool.m4:7653: -1- AC_DEFUN([LT_PROG_GO], [AC_CHECK_TOOL(GOC, gccgo,)
+m4trace:/usr/share/aclocal/libtool.m4:7638: -1- AC_DEFUN([LT_PROG_GO], [AC_CHECK_TOOL(GOC, gccgo,)
])
-m4trace:/usr/share/aclocal/libtool.m4:7660: -1- AC_DEFUN([LT_PROG_RC], [AC_CHECK_TOOL(RC, windres,)
+m4trace:/usr/share/aclocal/libtool.m4:7645: -1- AC_DEFUN([LT_PROG_RC], [AC_CHECK_TOOL(RC, windres,)
])
-m4trace:/usr/share/aclocal/libtool.m4:7665: -1- AU_DEFUN([LT_AC_PROG_RC], [m4_if($#, 0, [LT_PROG_RC], [LT_PROG_RC($@)])])
-m4trace:/usr/share/aclocal/libtool.m4:7665: -1- AC_DEFUN([LT_AC_PROG_RC], [AC_DIAGNOSE([obsolete], [The macro `LT_AC_PROG_RC' is obsolete.
+m4trace:/usr/share/aclocal/libtool.m4:7650: -1- AU_DEFUN([LT_AC_PROG_RC], [m4_if($#, 0, [LT_PROG_RC], [LT_PROG_RC($@)])])
+m4trace:/usr/share/aclocal/libtool.m4:7650: -1- AC_DEFUN([LT_AC_PROG_RC], [AC_DIAGNOSE([obsolete], [The macro `LT_AC_PROG_RC' is obsolete.
You should run autoupdate.])dnl
m4_if($#, 0, [LT_PROG_RC], [LT_PROG_RC($@)])])
-m4trace:/usr/share/aclocal/libtool.m4:7785: -1- AU_DEFUN([LT_AC_PROG_SED], [m4_if($#, 0, [AC_PROG_SED], [AC_PROG_SED($@)])])
-m4trace:/usr/share/aclocal/libtool.m4:7785: -1- AC_DEFUN([LT_AC_PROG_SED], [AC_DIAGNOSE([obsolete], [The macro `LT_AC_PROG_SED' is obsolete.
+m4trace:/usr/share/aclocal/libtool.m4:7770: -1- AU_DEFUN([LT_AC_PROG_SED], [m4_if($#, 0, [AC_PROG_SED], [AC_PROG_SED($@)])])
+m4trace:/usr/share/aclocal/libtool.m4:7770: -1- AC_DEFUN([LT_AC_PROG_SED], [AC_DIAGNOSE([obsolete], [The macro `LT_AC_PROG_SED' is obsolete.
You should run autoupdate.])dnl
m4_if($#, 0, [AC_PROG_SED], [AC_PROG_SED($@)])])
m4trace:/usr/share/aclocal/ltdl.m4:16: -1- AC_DEFUN([LT_CONFIG_LTDL_DIR], [AC_BEFORE([$0], [LTDL_INIT])
@@ -1163,7 +1162,7 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
# at 6.2 and later dlopen does load deplibs.
lt_cv_sys_dlopen_deplibs=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
lt_cv_sys_dlopen_deplibs=yes
;;
openbsd*)
@@ -1698,9 +1697,10 @@ m4trace:/usr/share/aclocal-1.14/amversion.m4:33: -1- AC_DEFUN([AM_SET_CURRENT_AU
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-m4trace:/usr/share/aclocal-1.14/auxdir.m4:47: -1- AC_DEFUN([AM_AUX_DIR_EXPAND], [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-# Expand $ac_aux_dir to an absolute path.
-am_aux_dir=`cd "$ac_aux_dir" && pwd`
+m4trace:/usr/share/aclocal-1.14/auxdir.m4:47: -1- AC_DEFUN([AM_AUX_DIR_EXPAND], [dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
])
m4trace:/usr/share/aclocal-1.14/cond.m4:12: -1- AC_DEFUN([AM_CONDITIONAL], [AC_PREREQ([2.52])dnl
m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
@@ -2063,9 +2063,8 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi
-])
-m4trace:/usr/share/aclocal-1.14/init.m4:183: -1- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers.
+fi])
+m4trace:/usr/share/aclocal-1.14/init.m4:182: -1- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers.
_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
diff --git a/autom4te.cache/traces.1 b/autom4te.cache/traces.1
index 0928454..440df14 100644
--- a/autom4te.cache/traces.1
+++ b/autom4te.cache/traces.1
@@ -358,7 +358,7 @@ m4trace:configure.ac:8: -1- _AM_SUBST_NOTMAKE([am__isrc])
m4trace:configure.ac:8: -1- AC_SUBST([CYGPATH_W])
m4trace:configure.ac:8: -1- AC_SUBST_TRACE([CYGPATH_W])
m4trace:configure.ac:8: -1- m4_pattern_allow([^CYGPATH_W$])
-m4trace:configure.ac:8: -1- _m4_warn([obsolete], [AM_INIT_AUTOMAKE: two- and three-arguments forms are deprecated.], [aclocal.m4:9254: AM_INIT_AUTOMAKE is expanded from...
+m4trace:configure.ac:8: -1- _m4_warn([obsolete], [AM_INIT_AUTOMAKE: two- and three-arguments forms are deprecated.], [aclocal.m4:9240: AM_INIT_AUTOMAKE is expanded from...
configure.ac:8: the top level])
m4trace:configure.ac:8: -1- AC_SUBST([PACKAGE], [$PACKAGE])
m4trace:configure.ac:8: -1- AC_SUBST_TRACE([PACKAGE])
diff --git a/config.log b/config.log
index 4cbb082..00c0f21 100644
--- a/config.log
+++ b/config.log
@@ -10,11 +10,11 @@ generated by GNU Autoconf 2.69. Invocation command line was
## Platform. ##
## --------- ##
-hostname = Glitterhawk
+hostname = dino.fm
uname -m = x86_64
-uname -r = 3.14-2-amd64
+uname -r = 3.15.5-1-ARCH
uname -s = Linux
-uname -v = #1 SMP Debian 3.14.15-2 (2014-08-09)
+uname -v = #1 SMP PREEMPT Thu Jul 10 07:08:50 CEST 2014
/usr/bin/uname -p = unknown
/bin/uname -X = unknown
@@ -27,16 +27,24 @@ uname -v = #1 SMP Debian 3.14.15-2 (2014-08-09)
/usr/bin/oslevel = unknown
/bin/universe = unknown
-PATH: /usr/local/lib/eclipse
-PATH: /usr/local/lib/sbt/bin
-PATH: /usr/firstscripts
PATH: /usr/local/bin
PATH: /usr/bin
PATH: /bin
-PATH: /usr/local/games
-PATH: /usr/games
-PATH: /usr/firstscripts
-PATH: /usr/firstscripts;
+PATH: /usr/local/bin
+PATH: /usr/bin
+PATH: /bin
+PATH: /usr/bin
+PATH: /bin
+PATH: /usr/sbin
+PATH: /sbin
+PATH: /opt/marytts/bin
+PATH: /usr/bin/site_perl
+PATH: /usr/bin/vendor_perl
+PATH: /usr/bin/core_perl
+PATH: /opt/marytts/bin
+PATH: /usr/bin/site_perl
+PATH: /usr/bin/vendor_perl
+PATH: /usr/bin/core_perl
## ----------- ##
@@ -54,7 +62,7 @@ configure:2402: found /usr/bin/gcc
configure:2413: result: gcc
configure:2642: checking for C compiler version
configure:2651: gcc --version >&5
-gcc (Debian 4.9.2-10) 4.9.2
+gcc (GCC) 4.9.0 20140604 (prerelease)
Copyright (C) 2014 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -63,22 +71,22 @@ configure:2662: $? = 0
configure:2651: gcc -v >&5
Using built-in specs.
COLLECT_GCC=gcc
-COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-linux-gnu/4.9/lto-wrapper
-Target: x86_64-linux-gnu
-Configured with: ../src/configure -v --with-pkgversion='Debian 4.9.2-10' --with-bugurl=file:///usr/share/doc/gcc-4.9/README.Bugs --enable-languages=c,c++,java,go,d,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-4.9 --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.9 --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --enable-gnu-unique-object --disable-vtable-verify --enable-plugin --with-system-zlib --disable-browser-plugin --enable-java-awt=gtk --enable-gtk-cairo --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-4.9-amd64/jre --enable-java-home --with-jvm-root-dir=/usr/lib/jvm/java-1.5.0-gcj-4.9-amd64 --with-jvm-jar-dir=/usr/lib/jvm-exports/java-1.5.0-gcj-4.9-amd64 --with-arch-directory=amd64 --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --enable-objc-gc --enable-multiarch --with-arch-32=i586 --with-abi=m64 --with-multilib-list=m32,m64,mx32 --enable-multilib --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu
+COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/lto-wrapper
+Target: x86_64-unknown-linux-gnu
+Configured with: /build/gcc/src/gcc-4.9-20140604/configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=https://bugs.archlinux.org/ --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ --enable-shared --enable-threads=posix --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-clocale=gnu --disable-libstdcxx-pch --disable-libssp --enable-gnu-unique-object --enable-linker-build-id --enable-cloog-backend=isl --disable-isl-version-check --disable-cloog-version-check --enable-lto --enable-plugin --enable-install-libiberty --with-linker-hash-style=gnu --disable-multilib --disable-werror --enable-checking=release
Thread model: posix
-gcc version 4.9.2 (Debian 4.9.2-10)
+gcc version 4.9.0 20140604 (prerelease) (GCC)
configure:2662: $? = 0
configure:2651: gcc -V >&5
gcc: error: unrecognized command line option '-V'
gcc: fatal error: no input files
compilation terminated.
-configure:2662: $? = 4
+configure:2662: $? = 1
configure:2651: gcc -qversion >&5
gcc: error: unrecognized command line option '-qversion'
gcc: fatal error: no input files
compilation terminated.
-configure:2662: $? = 4
+configure:2662: $? = 1
configure:2682: checking whether the C compiler works
configure:2704: gcc conftest.c >&5
configure:2708: $? = 0
@@ -118,13 +126,13 @@ configure:3154: gcc -c conftest.c -o conftest2.o
configure:3157: $? = 0
configure:3169: result: yes
configure:3186: checking for a sed that does not truncate output
-configure:3250: result: /bin/sed
+configure:3250: result: /usr/bin/sed
configure:3268: checking for grep that handles long lines and -e
-configure:3326: result: /bin/grep
+configure:3326: result: /usr/bin/grep
configure:3331: checking for egrep
-configure:3393: result: /bin/grep -E
+configure:3393: result: /usr/bin/grep -E
configure:3398: checking for fgrep
-configure:3460: result: /bin/grep -F
+configure:3460: result: /usr/bin/grep -F
configure:3495: checking for ld used by gcc
configure:3562: result: /usr/bin/ld
configure:3569: checking if the linker (/usr/bin/ld) is GNU ld
@@ -140,75 +148,73 @@ configure:3795: result: BSD nm
configure:3798: checking whether ln -s works
configure:3802: result: yes
configure:3810: checking the maximum length of command line arguments
-configure:3941: result: 1572864
-configure:3958: checking whether the shell understands some XSI constructs
-configure:3968: result: yes
-configure:3972: checking whether the shell understands "+="
-configure:3978: result: yes
-configure:4013: checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format
-configure:4053: result: func_convert_file_noop
-configure:4060: checking how to convert x86_64-unknown-linux-gnu file names to toolchain format
-configure:4080: result: func_convert_file_noop
-configure:4087: checking for /usr/bin/ld option to reload object files
-configure:4094: result: -r
-configure:4168: checking for objdump
-configure:4184: found /usr/bin/objdump
-configure:4195: result: objdump
-configure:4227: checking how to recognize dependent libraries
-configure:4425: result: pass_all
-configure:4510: checking for dlltool
-configure:4540: result: no
-configure:4570: checking how to associate runtime and link libraries
-configure:4597: result: printf %s\n
-configure:4658: checking for ar
-configure:4674: found /usr/bin/ar
-configure:4685: result: ar
-configure:4722: checking for archiver @FILE support
-configure:4739: gcc -c -g -O2 conftest.c >&5
-configure:4739: $? = 0
-configure:4742: ar cru libconftest.a @conftest.lst >&5
-configure:4745: $? = 0
-configure:4750: ar cru libconftest.a @conftest.lst >&5
+configure:3940: result: 1572864
+configure:3957: checking whether the shell understands some XSI constructs
+configure:3967: result: yes
+configure:3971: checking whether the shell understands "+="
+configure:3977: result: yes
+configure:4012: checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format
+configure:4052: result: func_convert_file_noop
+configure:4059: checking how to convert x86_64-unknown-linux-gnu file names to toolchain format
+configure:4079: result: func_convert_file_noop
+configure:4086: checking for /usr/bin/ld option to reload object files
+configure:4093: result: -r
+configure:4167: checking for objdump
+configure:4183: found /usr/bin/objdump
+configure:4194: result: objdump
+configure:4226: checking how to recognize dependent libraries
+configure:4428: result: pass_all
+configure:4513: checking for dlltool
+configure:4543: result: no
+configure:4573: checking how to associate runtime and link libraries
+configure:4600: result: printf %s\n
+configure:4661: checking for ar
+configure:4677: found /usr/bin/ar
+configure:4688: result: ar
+configure:4725: checking for archiver @FILE support
+configure:4742: gcc -c -g -O2 conftest.c >&5
+configure:4742: $? = 0
+configure:4745: ar cru libconftest.a @conftest.lst >&5
+configure:4748: $? = 0
+configure:4753: ar cru libconftest.a @conftest.lst >&5
ar: conftest.o: No such file or directory
-configure:4753: $? = 1
-configure:4765: result: @
-configure:4823: checking for strip
-configure:4839: found /usr/bin/strip
-configure:4850: result: strip
-configure:4922: checking for ranlib
-configure:4938: found /usr/bin/ranlib
-configure:4949: result: ranlib
-configure:5026: checking for gawk
-configure:5042: found /usr/bin/gawk
-configure:5053: result: gawk
-configure:5093: checking command to parse /usr/bin/nm -B output from gcc object
-configure:5213: gcc -c -g -O2 conftest.c >&5
-configure:5216: $? = 0
-configure:5220: /usr/bin/nm -B conftest.o \| sed -n -e 's/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' | sed '/ __gnu_lto/d' \> conftest.nm
-configure:5223: $? = 0
-configure:5289: gcc -o conftest -g -O2 conftest.c conftstm.o >&5
-configure:5292: $? = 0
-configure:5330: result: ok
-configure:5367: checking for sysroot
-configure:5397: result: no
-configure:5474: gcc -c -g -O2 conftest.c >&5
-configure:5477: $? = 0
-configure:5666: checking for mt
-configure:5682: found /bin/mt
-configure:5693: result: mt
-configure:5716: checking if mt is a manifest tool
-configure:5722: mt '-?'
-usage: mt [-v] [--version] [-h] [ -f device ] command [ count ]
-configure:5730: result: no
-configure:6372: checking how to run the C preprocessor
-configure:6403: gcc -E conftest.c
-configure:6403: $? = 0
-configure:6417: gcc -E conftest.c
+configure:4756: $? = 1
+configure:4768: result: @
+configure:4826: checking for strip
+configure:4842: found /usr/bin/strip
+configure:4853: result: strip
+configure:4925: checking for ranlib
+configure:4941: found /usr/bin/ranlib
+configure:4952: result: ranlib
+configure:5029: checking for gawk
+configure:5045: found /usr/bin/gawk
+configure:5056: result: gawk
+configure:5096: checking command to parse /usr/bin/nm -B output from gcc object
+configure:5216: gcc -c -g -O2 conftest.c >&5
+configure:5219: $? = 0
+configure:5223: /usr/bin/nm -B conftest.o \| sed -n -e 's/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' | sed '/ __gnu_lto/d' \> conftest.nm
+configure:5226: $? = 0
+configure:5292: gcc -o conftest -g -O2 conftest.c conftstm.o >&5
+configure:5295: $? = 0
+configure:5333: result: ok
+configure:5370: checking for sysroot
+configure:5400: result: no
+configure:5477: gcc -c -g -O2 conftest.c >&5
+configure:5480: $? = 0
+configure:5656: checking for mt
+configure:5686: result: no
+configure:5706: checking if : is a manifest tool
+configure:5712: : '-?'
+configure:5720: result: no
+configure:6362: checking how to run the C preprocessor
+configure:6393: gcc -E conftest.c
+configure:6393: $? = 0
+configure:6407: gcc -E conftest.c
conftest.c:9:28: fatal error: ac_nonexistent.h: No such file or directory
#include <ac_nonexistent.h>
^
compilation terminated.
-configure:6417: $? = 1
+configure:6407: $? = 1
configure: failed program was:
| /* confdefs.h */
| #define PACKAGE_NAME ""
@@ -219,15 +225,15 @@ configure: failed program was:
| #define PACKAGE_URL ""
| /* end confdefs.h. */
| #include <ac_nonexistent.h>
-configure:6442: result: gcc -E
-configure:6462: gcc -E conftest.c
-configure:6462: $? = 0
-configure:6476: gcc -E conftest.c
+configure:6432: result: gcc -E
+configure:6452: gcc -E conftest.c
+configure:6452: $? = 0
+configure:6466: gcc -E conftest.c
conftest.c:9:28: fatal error: ac_nonexistent.h: No such file or directory
#include <ac_nonexistent.h>
^
compilation terminated.
-configure:6476: $? = 1
+configure:6466: $? = 1
configure: failed program was:
| /* confdefs.h */
| #define PACKAGE_NAME ""
@@ -238,174 +244,174 @@ configure: failed program was:
| #define PACKAGE_URL ""
| /* end confdefs.h. */
| #include <ac_nonexistent.h>
-configure:6505: checking for ANSI C header files
-configure:6525: gcc -c -g -O2 conftest.c >&5
-configure:6525: $? = 0
-configure:6598: gcc -o conftest -g -O2 conftest.c >&5
-configure:6598: $? = 0
-configure:6598: ./conftest
-configure:6598: $? = 0
-configure:6609: result: yes
-configure:6622: checking for sys/types.h
-configure:6622: gcc -c -g -O2 conftest.c >&5
-configure:6622: $? = 0
-configure:6622: result: yes
-configure:6622: checking for sys/stat.h
-configure:6622: gcc -c -g -O2 conftest.c >&5
-configure:6622: $? = 0
-configure:6622: result: yes
-configure:6622: checking for stdlib.h
-configure:6622: gcc -c -g -O2 conftest.c >&5
-configure:6622: $? = 0
-configure:6622: result: yes
-configure:6622: checking for string.h
-configure:6622: gcc -c -g -O2 conftest.c >&5
-configure:6622: $? = 0
-configure:6622: result: yes
-configure:6622: checking for memory.h
-configure:6622: gcc -c -g -O2 conftest.c >&5
-configure:6622: $? = 0
-configure:6622: result: yes
-configure:6622: checking for strings.h
-configure:6622: gcc -c -g -O2 conftest.c >&5
-configure:6622: $? = 0
-configure:6622: result: yes
-configure:6622: checking for inttypes.h
-configure:6622: gcc -c -g -O2 conftest.c >&5
-configure:6622: $? = 0
-configure:6622: result: yes
-configure:6622: checking for stdint.h
-configure:6622: gcc -c -g -O2 conftest.c >&5
-configure:6622: $? = 0
-configure:6622: result: yes
-configure:6622: checking for unistd.h
-configure:6622: gcc -c -g -O2 conftest.c >&5
-configure:6622: $? = 0
-configure:6622: result: yes
-configure:6636: checking for dlfcn.h
-configure:6636: gcc -c -g -O2 conftest.c >&5
-configure:6636: $? = 0
-configure:6636: result: yes
-configure:6842: checking for objdir
-configure:6857: result: .libs
-configure:7124: checking if gcc supports -fno-rtti -fno-exceptions
-configure:7142: gcc -c -g -O2 -fno-rtti -fno-exceptions conftest.c >&5
+configure:6495: checking for ANSI C header files
+configure:6515: gcc -c -g -O2 conftest.c >&5
+configure:6515: $? = 0
+configure:6588: gcc -o conftest -g -O2 conftest.c >&5
+configure:6588: $? = 0
+configure:6588: ./conftest
+configure:6588: $? = 0
+configure:6599: result: yes
+configure:6612: checking for sys/types.h
+configure:6612: gcc -c -g -O2 conftest.c >&5
+configure:6612: $? = 0
+configure:6612: result: yes
+configure:6612: checking for sys/stat.h
+configure:6612: gcc -c -g -O2 conftest.c >&5
+configure:6612: $? = 0
+configure:6612: result: yes
+configure:6612: checking for stdlib.h
+configure:6612: gcc -c -g -O2 conftest.c >&5
+configure:6612: $? = 0
+configure:6612: result: yes
+configure:6612: checking for string.h
+configure:6612: gcc -c -g -O2 conftest.c >&5
+configure:6612: $? = 0
+configure:6612: result: yes
+configure:6612: checking for memory.h
+configure:6612: gcc -c -g -O2 conftest.c >&5
+configure:6612: $? = 0
+configure:6612: result: yes
+configure:6612: checking for strings.h
+configure:6612: gcc -c -g -O2 conftest.c >&5
+configure:6612: $? = 0
+configure:6612: result: yes
+configure:6612: checking for inttypes.h
+configure:6612: gcc -c -g -O2 conftest.c >&5
+configure:6612: $? = 0
+configure:6612: result: yes
+configure:6612: checking for stdint.h
+configure:6612: gcc -c -g -O2 conftest.c >&5
+configure:6612: $? = 0
+configure:6612: result: yes
+configure:6612: checking for unistd.h
+configure:6612: gcc -c -g -O2 conftest.c >&5
+configure:6612: $? = 0
+configure:6612: result: yes
+configure:6626: checking for dlfcn.h
+configure:6626: gcc -c -g -O2 conftest.c >&5
+configure:6626: $? = 0
+configure:6626: result: yes
+configure:6832: checking for objdir
+configure:6847: result: .libs
+configure:7114: checking if gcc supports -fno-rtti -fno-exceptions
+configure:7132: gcc -c -g -O2 -fno-rtti -fno-exceptions conftest.c >&5
cc1: warning: command line option '-fno-rtti' is valid for C++/ObjC++ but not for C
-configure:7146: $? = 0
-configure:7159: result: no
-configure:7486: checking for gcc option to produce PIC
-configure:7493: result: -fPIC -DPIC
-configure:7501: checking if gcc PIC flag -fPIC -DPIC works
-configure:7519: gcc -c -g -O2 -fPIC -DPIC -DPIC conftest.c >&5
-configure:7523: $? = 0
-configure:7536: result: yes
-configure:7565: checking if gcc static flag -static works
-configure:7593: result: yes
-configure:7608: checking if gcc supports -c -o file.o
-configure:7629: gcc -c -g -O2 -o out/conftest2.o conftest.c >&5
-configure:7633: $? = 0
-configure:7655: result: yes
-configure:7663: checking if gcc supports -c -o file.o
-configure:7710: result: yes
-configure:7743: checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries
-configure:8900: result: yes
-configure:8937: checking whether -lc should be explicitly linked in
-configure:8945: gcc -c -g -O2 conftest.c >&5
-configure:8948: $? = 0
-configure:8963: gcc -shared -fPIC -DPIC conftest.o -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| /bin/grep -lc \>/dev/null 2\>\&1
-configure:8966: $? = 0
-configure:8980: result: no
-configure:9140: checking dynamic linker characteristics
-configure:9640: gcc -o conftest -g -O2 -Wl,-rpath -Wl,/foo conftest.c >&5
-configure:9640: $? = 0
-configure:9874: result: GNU/Linux ld.so
-configure:9981: checking how to hardcode library paths into programs
-configure:10006: result: immediate
-configure:10546: checking whether stripping libraries is possible
-configure:10551: result: yes
-configure:10586: checking if libtool supports shared libraries
-configure:10588: result: yes
-configure:10591: checking whether to build shared libraries
-configure:10612: result: yes
-configure:10615: checking whether to build static libraries
-configure:10619: result: yes
-configure:10676: checking for a BSD-compatible install
-configure:10744: result: /usr/bin/install -c
-configure:10755: checking whether build environment is sane
-configure:10810: result: yes
-configure:10958: checking for a thread-safe mkdir -p
-configure:10997: result: /bin/mkdir -p
-configure:11000: checking whether make sets $(MAKE)
-configure:11022: result: yes
-configure:11052: checking for style of include used by make
-configure:11080: result: GNU
-configure:11114: checking whether make supports nested variables
-configure:11131: result: yes
-configure:11217: checking dependency style of gcc
-configure:11328: result: gcc3
-configure:11441: checking for pkg-config
-configure:11459: found /usr/bin/pkg-config
-configure:11471: result: /usr/bin/pkg-config
-configure:11496: checking pkg-config is at least version 0.9.0
-configure:11499: result: yes
-configure:11509: checking for DSSI
-configure:11516: $PKG_CONFIG --exists --print-errors "dssi >= 0.9"
-configure:11519: $? = 0
-configure:11533: $PKG_CONFIG --exists --print-errors "dssi >= 0.9"
-configure:11536: $? = 0
-configure:11594: result: yes
-configure:11600: checking for SNDFILE
-configure:11607: $PKG_CONFIG --exists --print-errors "sndfile >= 1.0.9"
-configure:11610: $? = 0
-configure:11624: $PKG_CONFIG --exists --print-errors "sndfile >= 1.0.9"
-configure:11627: $? = 0
-configure:11685: result: yes
-configure:11692: checking for ALSA
-configure:11699: $PKG_CONFIG --exists --print-errors "alsa >= 0.9"
-configure:11702: $? = 0
-configure:11716: $PKG_CONFIG --exists --print-errors "alsa >= 0.9"
-configure:11719: $? = 0
-configure:11757: result: yes
-configure:11891: checking for gcc
-configure:11918: result: gcc
-configure:12147: checking for C compiler version
-configure:12156: gcc --version >&5
-gcc (Debian 4.9.2-10) 4.9.2
+configure:7136: $? = 0
+configure:7149: result: no
+configure:7476: checking for gcc option to produce PIC
+configure:7483: result: -fPIC -DPIC
+configure:7491: checking if gcc PIC flag -fPIC -DPIC works
+configure:7509: gcc -c -g -O2 -fPIC -DPIC -DPIC conftest.c >&5
+configure:7513: $? = 0
+configure:7526: result: yes
+configure:7555: checking if gcc static flag -static works
+configure:7583: result: yes
+configure:7598: checking if gcc supports -c -o file.o
+configure:7619: gcc -c -g -O2 -o out/conftest2.o conftest.c >&5
+configure:7623: $? = 0
+configure:7645: result: yes
+configure:7653: checking if gcc supports -c -o file.o
+configure:7700: result: yes
+configure:7733: checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries
+configure:8886: result: yes
+configure:8923: checking whether -lc should be explicitly linked in
+configure:8931: gcc -c -g -O2 conftest.c >&5
+configure:8934: $? = 0
+configure:8949: gcc -shared -fPIC -DPIC conftest.o -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| /usr/bin/grep -lc \>/dev/null 2\>\&1
+configure:8952: $? = 0
+configure:8966: result: no
+configure:9126: checking dynamic linker characteristics
+configure:9637: gcc -o conftest -g -O2 -Wl,-rpath -Wl,/foo conftest.c >&5
+configure:9637: $? = 0
+configure:9859: result: GNU/Linux ld.so
+configure:9966: checking how to hardcode library paths into programs
+configure:9991: result: immediate
+configure:10531: checking whether stripping libraries is possible
+configure:10536: result: yes
+configure:10571: checking if libtool supports shared libraries
+configure:10573: result: yes
+configure:10576: checking whether to build shared libraries
+configure:10597: result: yes
+configure:10600: checking whether to build static libraries
+configure:10604: result: yes
+configure:10661: checking for a BSD-compatible install
+configure:10729: result: /usr/bin/install -c
+configure:10740: checking whether build environment is sane
+configure:10795: result: yes
+configure:10943: checking for a thread-safe mkdir -p
+configure:10982: result: /usr/bin/mkdir -p
+configure:10985: checking whether make sets $(MAKE)
+configure:11007: result: yes
+configure:11037: checking for style of include used by make
+configure:11065: result: GNU
+configure:11099: checking whether make supports nested variables
+configure:11116: result: yes
+configure:11202: checking dependency style of gcc
+configure:11313: result: gcc3
+configure:11425: checking for pkg-config
+configure:11443: found /usr/bin/pkg-config
+configure:11455: result: /usr/bin/pkg-config
+configure:11480: checking pkg-config is at least version 0.9.0
+configure:11483: result: yes
+configure:11493: checking for DSSI
+configure:11500: $PKG_CONFIG --exists --print-errors "dssi >= 0.9"
+configure:11503: $? = 0
+configure:11517: $PKG_CONFIG --exists --print-errors "dssi >= 0.9"
+configure:11520: $? = 0
+configure:11578: result: yes
+configure:11584: checking for SNDFILE
+configure:11591: $PKG_CONFIG --exists --print-errors "sndfile >= 1.0.9"
+configure:11594: $? = 0
+configure:11608: $PKG_CONFIG --exists --print-errors "sndfile >= 1.0.9"
+configure:11611: $? = 0
+configure:11669: result: yes
+configure:11676: checking for ALSA
+configure:11683: $PKG_CONFIG --exists --print-errors "alsa >= 0.9"
+configure:11686: $? = 0
+configure:11700: $PKG_CONFIG --exists --print-errors "alsa >= 0.9"
+configure:11703: $? = 0
+configure:11741: result: yes
+configure:11875: checking for gcc
+configure:11902: result: gcc
+configure:12131: checking for C compiler version
+configure:12140: gcc --version >&5
+gcc (GCC) 4.9.0 20140604 (prerelease)
Copyright (C) 2014 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-configure:12167: $? = 0
-configure:12156: gcc -v >&5
+configure:12151: $? = 0
+configure:12140: gcc -v >&5
Using built-in specs.
COLLECT_GCC=gcc
-COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-linux-gnu/4.9/lto-wrapper
-Target: x86_64-linux-gnu
-Configured with: ../src/configure -v --with-pkgversion='Debian 4.9.2-10' --with-bugurl=file:///usr/share/doc/gcc-4.9/README.Bugs --enable-languages=c,c++,java,go,d,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-4.9 --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.9 --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --enable-gnu-unique-object --disable-vtable-verify --enable-plugin --with-system-zlib --disable-browser-plugin --enable-java-awt=gtk --enable-gtk-cairo --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-4.9-amd64/jre --enable-java-home --with-jvm-root-dir=/usr/lib/jvm/java-1.5.0-gcj-4.9-amd64 --with-jvm-jar-dir=/usr/lib/jvm-exports/java-1.5.0-gcj-4.9-amd64 --with-arch-directory=amd64 --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --enable-objc-gc --enable-multiarch --with-arch-32=i586 --with-abi=m64 --with-multilib-list=m32,m64,mx32 --enable-multilib --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu
+COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/lto-wrapper
+Target: x86_64-unknown-linux-gnu
+Configured with: /build/gcc/src/gcc-4.9-20140604/configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=https://bugs.archlinux.org/ --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ --enable-shared --enable-threads=posix --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-clocale=gnu --disable-libstdcxx-pch --disable-libssp --enable-gnu-unique-object --enable-linker-build-id --enable-cloog-backend=isl --disable-isl-version-check --disable-cloog-version-check --enable-lto --enable-plugin --enable-install-libiberty --with-linker-hash-style=gnu --disable-multilib --disable-werror --enable-checking=release
Thread model: posix
-gcc version 4.9.2 (Debian 4.9.2-10)
-configure:12167: $? = 0
-configure:12156: gcc -V >&5
+gcc version 4.9.0 20140604 (prerelease) (GCC)
+configure:12151: $? = 0
+configure:12140: gcc -V >&5
gcc: error: unrecognized command line option '-V'
gcc: fatal error: no input files
compilation terminated.
-configure:12167: $? = 4
-configure:12156: gcc -qversion >&5
+configure:12151: $? = 1
+configure:12140: gcc -qversion >&5
gcc: error: unrecognized command line option '-qversion'
gcc: fatal error: no input files
compilation terminated.
-configure:12167: $? = 4
-configure:12171: checking whether we are using the GNU C compiler
-configure:12199: result: yes
-configure:12208: checking whether gcc accepts -g
-configure:12269: result: yes
-configure:12286: checking for gcc option to accept ISO C89
-configure:12362: result: none needed
-configure:12387: checking whether gcc understands -c and -o together
-configure:12424: result: yes
-configure:12589: checking that generated files are newer than configure
-configure:12595: result: done
-configure:12618: creating ./config.status
+configure:12151: $? = 1
+configure:12155: checking whether we are using the GNU C compiler
+configure:12183: result: yes
+configure:12192: checking whether gcc accepts -g
+configure:12253: result: yes
+configure:12270: checking for gcc option to accept ISO C89
+configure:12346: result: none needed
+configure:12371: checking whether gcc understands -c and -o together
+configure:12408: result: yes
+configure:12573: checking that generated files are newer than configure
+configure:12579: result: done
+configure:12602: creating ./config.status
## ---------------------- ##
## Running config.status. ##
@@ -420,7 +426,7 @@ generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_COMMANDS =
$ ./config.status
-on Glitterhawk
+on dino.fm
config.status:1013: creating Makefile
config.status:1013: creating src/Makefile
@@ -483,18 +489,17 @@ ac_cv_header_sys_types_h=yes
ac_cv_header_unistd_h=yes
ac_cv_host=x86_64-unknown-linux-gnu
ac_cv_objext=o
-ac_cv_path_EGREP='/bin/grep -E'
-ac_cv_path_FGREP='/bin/grep -F'
-ac_cv_path_GREP=/bin/grep
-ac_cv_path_SED=/bin/sed
+ac_cv_path_EGREP='/usr/bin/grep -E'
+ac_cv_path_FGREP='/usr/bin/grep -F'
+ac_cv_path_GREP=/usr/bin/grep
+ac_cv_path_SED=/usr/bin/sed
ac_cv_path_ac_pt_PKG_CONFIG=/usr/bin/pkg-config
ac_cv_path_install='/usr/bin/install -c'
-ac_cv_path_mkdir=/bin/mkdir
+ac_cv_path_mkdir=/usr/bin/mkdir
ac_cv_prog_AWK=gawk
ac_cv_prog_CPP='gcc -E'
ac_cv_prog_ac_ct_AR=ar
ac_cv_prog_ac_ct_CC=gcc
-ac_cv_prog_ac_ct_MANIFEST_TOOL=mt
ac_cv_prog_ac_ct_OBJDUMP=objdump
ac_cv_prog_ac_ct_RANLIB=ranlib
ac_cv_prog_ac_ct_STRIP=strip
@@ -573,10 +578,10 @@ DUMPBIN=''
ECHO_C=''
ECHO_N='-n'
ECHO_T=''
-EGREP='/bin/grep -E'
+EGREP='/usr/bin/grep -E'
EXEEXT=''
-FGREP='/bin/grep -F'
-GREP='/bin/grep'
+FGREP='/usr/bin/grep -F'
+GREP='/usr/bin/grep'
INSTALL_DATA='${INSTALL} -m 644'
INSTALL_PROGRAM='${INSTALL}'
INSTALL_SCRIPT='${INSTALL}'
@@ -591,7 +596,7 @@ LN_S='ln -s'
LTLIBOBJS=''
MAKEINFO='${SHELL} /home/pepper/dssi-render/missing makeinfo'
MANIFEST_TOOL=':'
-MKDIR_P='/bin/mkdir -p'
+MKDIR_P='/usr/bin/mkdir -p'
NM='/usr/bin/nm -B'
NMEDIT=''
OBJDUMP='objdump'
@@ -610,9 +615,9 @@ PKG_CONFIG='/usr/bin/pkg-config'
PKG_CONFIG_LIBDIR=''
PKG_CONFIG_PATH=''
RANLIB='ranlib'
-SED='/bin/sed'
+SED='/usr/bin/sed'
SET_MAKE=''
-SHELL='/bin/bash'
+SHELL='/bin/sh'
SNDFILE_CFLAGS=''
SNDFILE_LIBS='-lsndfile '
STRIP='strip'
diff --git a/config.status b/config.status
index 404c7ab..de32a4d 100755
--- a/config.status
+++ b/config.status
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /bin/sh
# Generated by configure.
# Run this file to recreate the current configuration.
# Compiler output produced by configure, useful for debugging
@@ -8,7 +8,7 @@ debug=false
ac_cs_recheck=false
ac_cs_silent=false
-SHELL=${CONFIG_SHELL-/bin/bash}
+SHELL=${CONFIG_SHELL-/bin/sh}
export SHELL
## -------------------- ##
## M4sh Initialization. ##
@@ -434,7 +434,7 @@ gives unlimited permission to copy, distribute and modify it."
ac_pwd='/home/pepper/dssi-render'
srcdir='.'
INSTALL='/usr/bin/install -c'
-MKDIR_P='/bin/mkdir -p'
+MKDIR_P='/usr/bin/mkdir -p'
AWK='gawk'
test -n "$AWK" || AWK=awk
# The default lists apply if the user does not specify any file.
@@ -502,10 +502,10 @@ if $ac_cs_silent; then
fi
if $ac_cs_recheck; then
- set X /bin/bash './configure' $ac_configure_extra_args --no-create --no-recursion
+ set X /bin/sh './configure' $ac_configure_extra_args --no-create --no-recursion
shift
- $as_echo "running CONFIG_SHELL=/bin/bash $*" >&6
- CONFIG_SHELL='/bin/bash'
+ $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6
+ CONFIG_SHELL='/bin/sh'
export CONFIG_SHELL
exec "$@"
fi
@@ -537,7 +537,7 @@ enable_shared='yes'
enable_static='yes'
pic_mode='default'
enable_fast_install='yes'
-SHELL='/bin/bash'
+SHELL='/bin/sh'
ECHO='printf %s\n'
PATH_SEPARATOR=':'
host_alias=''
@@ -546,11 +546,11 @@ host_os='linux-gnu'
build_alias=''
build='x86_64-unknown-linux-gnu'
build_os='linux-gnu'
-SED='/bin/sed'
-Xsed='/bin/sed -e 1s/^X//'
-GREP='/bin/grep'
-EGREP='/bin/grep -E'
-FGREP='/bin/grep -F'
+SED='/usr/bin/sed'
+Xsed='/usr/bin/sed -e 1s/^X//'
+GREP='/usr/bin/grep'
+EGREP='/usr/bin/grep -E'
+FGREP='/usr/bin/grep -F'
LD='/usr/bin/ld -m elf_x86_64'
NM='/usr/bin/nm -B'
LN_S='ln -s'
@@ -632,7 +632,7 @@ hardcode_minus_L='no'
hardcode_shlibpath_var='unsupported'
hardcode_automatic='no'
inherit_rpath='no'
-link_all_deplibs='no'
+link_all_deplibs='unknown'
always_export_symbols='no'
export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
@@ -656,8 +656,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-linux-gnu/4.9 /usr/lib/x86_64-linux-gnu /usr/lib /lib/x86_64-linux-gnu /lib '
-sys_lib_dlsearch_path_spec='/lib /usr/lib /usr/lib/x86_64-linux-gnu/libfakeroot /usr/lib/x86_64-linux-gnu/freetype-infinality /usr/local/lib /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu /lib32 /usr/lib32 /libx32 /usr/libx32 '
+sys_lib_search_path_spec='/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0 /usr/lib /lib '
+sys_lib_dlsearch_path_spec='/lib /usr/lib /usr/lib/libfakeroot /usr/lib/octave/3.8.2 /usr/lib/openmpi '
hardcode_action='immediate'
enable_dlopen='unknown'
enable_dlopen_self='unknown'
@@ -829,7 +829,7 @@ S["AMTAR"]="$${TAR-tar}"
S["am__leading_dot"]="."
S["SET_MAKE"]=""
S["mkdir_p"]="$(MKDIR_P)"
-S["MKDIR_P"]="/bin/mkdir -p"
+S["MKDIR_P"]="/usr/bin/mkdir -p"
S["INSTALL_STRIP_PROGRAM"]="$(install_sh) -c -s"
S["install_sh"]="${SHELL} /home/pepper/dssi-render/install-sh"
S["MAKEINFO"]="${SHELL} /home/pepper/dssi-render/missing makeinfo"
@@ -863,10 +863,10 @@ S["NM"]="/usr/bin/nm -B"
S["ac_ct_DUMPBIN"]=""
S["DUMPBIN"]=""
S["LD"]="/usr/bin/ld -m elf_x86_64"
-S["FGREP"]="/bin/grep -F"
-S["EGREP"]="/bin/grep -E"
-S["GREP"]="/bin/grep"
-S["SED"]="/bin/sed"
+S["FGREP"]="/usr/bin/grep -F"
+S["EGREP"]="/usr/bin/grep -E"
+S["GREP"]="/usr/bin/grep"
+S["SED"]="/usr/bin/sed"
S["OBJEXT"]="o"
S["EXEEXT"]=""
S["ac_ct_CC"]="gcc"
@@ -922,7 +922,7 @@ S["PACKAGE_VERSION"]=""
S["PACKAGE_TARNAME"]=""
S["PACKAGE_NAME"]=""
S["PATH_SEPARATOR"]=":"
-S["SHELL"]="/bin/bash"
+S["SHELL"]="/bin/sh"
_ACAWK
cat >>"$ac_tmp/subs1.awk" <<_ACAWK &&
for (key in S) S_is_set[key] = 1
diff --git a/configure b/configure
index f8619c3..954b776 100755
--- a/configure
+++ b/configure
@@ -2332,8 +2332,8 @@ esac
-# Expand $ac_aux_dir to an absolute path.
-am_aux_dir=`cd "$ac_aux_dir" && pwd`
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -3903,8 +3903,7 @@ else
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len" && \
- test undefined != "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
@@ -4305,6 +4304,10 @@ freebsd* | dragonfly*)
fi
;;
+gnu*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -4343,11 +4346,11 @@ irix5* | irix6* | nonstopux*)
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
@@ -5467,7 +5470,7 @@ ia64-*-hpux*)
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -5483,19 +5486,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- case `/usr/bin/file conftest.o` in
- *x86-64*)
- LD="${LD-ld} -m elf32_x86_64"
- ;;
- *)
- LD="${LD-ld} -m elf_i386"
- ;;
- esac
- ;;
- powerpc64le-*)
- LD="${LD-ld} -m elf32lppclinux"
+ LD="${LD-ld} -m elf_i386"
;;
- powerpc64-*)
+ ppc64-*linux*|powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -5514,10 +5507,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- powerpcle-*)
- LD="${LD-ld} -m elf64lppc"
- ;;
- powerpc-*)
+ ppc*-*linux*|powerpc*-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
@@ -7321,7 +7311,7 @@ lt_prog_compiler_static=
lt_prog_compiler_static='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -7799,9 +7789,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
openbsd*)
with_gnu_ld=no
;;
- linux* | k*bsd*-gnu | gnu*)
- link_all_deplibs=no
- ;;
esac
ld_shlibs=yes
@@ -8023,7 +8010,7 @@ _LT_EOF
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -8200,7 +8187,6 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
- link_all_deplibs=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -8654,7 +8640,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
link_all_deplibs=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -9491,6 +9477,17 @@ freebsd* | dragonfly*)
esac
;;
+gnu*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
@@ -9607,7 +9604,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
@@ -9671,18 +9668,6 @@ fi
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -11390,7 +11375,6 @@ fi
-
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
diff --git a/libtool b/libtool
index e8272ae..4c3f855 100755
--- a/libtool
+++ b/libtool
@@ -1,8 +1,8 @@
-#! /bin/bash
+#! /bin/sh
# libtool - Provide generalized library-building support services.
# Generated automatically by config.status (dssi-render) 0.0.1
-# Libtool was configured on host Glitterhawk:
+# Libtool was configured on host dino.fm:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -56,7 +56,7 @@ pic_mode=default
fast_install=yes
# Shell to use when invoking shell scripts.
-SHELL="/bin/bash"
+SHELL="/bin/sh"
# An echo program that protects backslashes.
ECHO="printf %s\\n"
@@ -75,19 +75,19 @@ build=x86_64-unknown-linux-gnu
build_os=linux-gnu
# A sed program that does not truncate output.
-SED="/bin/sed"
+SED="/usr/bin/sed"
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
Xsed="$SED -e 1s/^X//"
# A grep program that handles long lines.
-GREP="/bin/grep"
+GREP="/usr/bin/grep"
# An ERE matcher.
-EGREP="/bin/grep -E"
+EGREP="/usr/bin/grep -E"
# A literal string matcher.
-FGREP="/bin/grep -F"
+FGREP="/usr/bin/grep -F"
# A BSD- or MS-compatible name lister.
NM="/usr/bin/nm -B"
@@ -272,10 +272,10 @@ finish_eval=""
hardcode_into_libs=yes
# Compile-time system search path for libraries.
-sys_lib_search_path_spec="/usr/lib/gcc/x86_64-linux-gnu/4.9 /usr/lib/x86_64-linux-gnu /usr/lib /lib/x86_64-linux-gnu /lib "
+sys_lib_search_path_spec="/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0 /usr/lib /lib "
# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/x86_64-linux-gnu/libfakeroot /usr/lib/x86_64-linux-gnu/freetype-infinality /usr/local/lib /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu /lib32 /usr/lib32 /libx32 /usr/libx32 "
+sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/libfakeroot /usr/lib/octave/3.8.2 /usr/lib/openmpi "
# Whether dlopen is supported.
dlopen_support=unknown
@@ -399,7 +399,7 @@ hardcode_automatic=no
inherit_rpath=no
# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=no
+link_all_deplibs=unknown
# Set to "yes" if exported symbols are required.
always_export_symbols=no
@@ -499,7 +499,7 @@ hardcode_action=immediate
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.11
+# $progname: (GNU libtool) 2.4.2
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -509,7 +509,7 @@ hardcode_action=immediate
PROGRAM=libtool
PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1.11"
+VERSION=2.4.2
TIMESTAMP=""
package_revision=1.3337
@@ -6546,10 +6546,7 @@ func_mode_link ()
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
- link)
- libs="$deplibs %DEPLIBS%"
- test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
- ;;
+ link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -6869,19 +6866,19 @@ func_mode_link ()
# It is a libtool convenience library, so add in its objects.
convenience+=" $ladir/$objdir/$old_library"
old_convenience+=" $ladir/$objdir/$old_library"
- tmp_libs=
- for deplib in $dependency_libs; do
- deplibs="$deplib $deplibs"
- if $opt_preserve_dup_deps ; then
- case "$tmp_libs " in
- *" $deplib "*) specialdeplibs+=" $deplib" ;;
- esac
- fi
- tmp_libs+=" $deplib"
- done
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
fi
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+ if $opt_preserve_dup_deps ; then
+ case "$tmp_libs " in
+ *" $deplib "*) specialdeplibs+=" $deplib" ;;
+ esac
+ fi
+ tmp_libs+=" $deplib"
+ done
continue
fi # $pass = conv
@@ -7774,9 +7771,6 @@ func_mode_link ()
revision="$number_minor"
lt_irix_increment=no
;;
- *)
- func_fatal_configuration "$modename: unknown library version type \`$version_type'"
- ;;
esac
;;
no)
diff --git a/src/.deps/dssi-render.Po b/src/.deps/dssi-render.Po
index c0b6c2a..4d102e5 100644
--- a/src/.deps/dssi-render.Po
+++ b/src/.deps/dssi-render.Po
@@ -1,61 +1,43 @@
dssi-render.o: dssi-render.c /usr/include/stdc-predef.h dssi-render.h \
/usr/include/sndfile.h /usr/include/stdio.h /usr/include/features.h \
- /usr/include/x86_64-linux-gnu/sys/cdefs.h \
- /usr/include/x86_64-linux-gnu/bits/wordsize.h \
- /usr/include/x86_64-linux-gnu/gnu/stubs.h \
- /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
- /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h \
- /usr/include/x86_64-linux-gnu/bits/types.h \
- /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/wchar.h \
- /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h \
- /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \
- /usr/include/x86_64-linux-gnu/bits/sys_errlist.h \
- /usr/include/x86_64-linux-gnu/bits/stdio.h \
- /usr/include/x86_64-linux-gnu/sys/types.h /usr/include/time.h \
- /usr/include/endian.h /usr/include/x86_64-linux-gnu/bits/endian.h \
- /usr/include/x86_64-linux-gnu/bits/byteswap.h \
- /usr/include/x86_64-linux-gnu/bits/byteswap-16.h \
- /usr/include/x86_64-linux-gnu/sys/select.h \
- /usr/include/x86_64-linux-gnu/bits/select.h \
- /usr/include/x86_64-linux-gnu/bits/sigset.h \
- /usr/include/x86_64-linux-gnu/bits/time.h \
- /usr/include/x86_64-linux-gnu/sys/sysmacros.h /usr/include/ladspa.h \
- /usr/include/dssi.h /usr/include/alsa/seq_event.h /usr/include/stdlib.h \
- /usr/include/alloca.h \
- /usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h \
- /usr/include/x86_64-linux-gnu/bits/stdlib-float.h /usr/include/string.h \
- /usr/include/x86_64-linux-gnu/bits/string.h \
- /usr/include/x86_64-linux-gnu/bits/string2.h /usr/include/assert.h \
- /usr/include/dlfcn.h /usr/include/x86_64-linux-gnu/bits/dlfcn.h \
- /usr/include/unistd.h /usr/include/x86_64-linux-gnu/bits/posix_opt.h \
- /usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/math.h \
- /usr/include/x86_64-linux-gnu/bits/huge_val.h \
- /usr/include/x86_64-linux-gnu/bits/huge_valf.h \
- /usr/include/x86_64-linux-gnu/bits/huge_vall.h \
- /usr/include/x86_64-linux-gnu/bits/inf.h \
- /usr/include/x86_64-linux-gnu/bits/nan.h \
- /usr/include/x86_64-linux-gnu/bits/mathdef.h \
- /usr/include/x86_64-linux-gnu/bits/mathcalls.h \
- /usr/include/x86_64-linux-gnu/bits/mathinline.h \
- /usr/include/x86_64-linux-gnu/sys/stat.h \
- /usr/include/x86_64-linux-gnu/bits/stat.h \
- /usr/include/x86_64-linux-gnu/sys/time.h \
- /usr/include/x86_64-linux-gnu/sys/wait.h /usr/include/signal.h \
- /usr/include/x86_64-linux-gnu/bits/signum.h \
- /usr/include/x86_64-linux-gnu/bits/sigcontext.h \
- /usr/include/x86_64-linux-gnu/bits/sigstack.h \
- /usr/include/x86_64-linux-gnu/bits/waitflags.h \
- /usr/include/x86_64-linux-gnu/bits/waitstatus.h \
- /usr/include/x86_64-linux-gnu/bits/siginfo.h /usr/include/dirent.h \
- /usr/include/x86_64-linux-gnu/bits/dirent.h \
- /usr/include/x86_64-linux-gnu/bits/posix1_lim.h \
- /usr/include/x86_64-linux-gnu/bits/local_lim.h \
+ /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \
+ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h \
+ /usr/include/bits/types.h /usr/include/bits/typesizes.h \
+ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h \
+ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
+ /usr/include/bits/stdio.h /usr/include/sys/types.h /usr/include/time.h \
+ /usr/include/endian.h /usr/include/bits/endian.h \
+ /usr/include/bits/byteswap.h /usr/include/bits/byteswap-16.h \
+ /usr/include/sys/select.h /usr/include/bits/select.h \
+ /usr/include/bits/sigset.h /usr/include/bits/time.h \
+ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
+ /usr/include/ladspa.h /usr/include/dssi.h /usr/include/alsa/seq_event.h \
+ /usr/include/stdlib.h /usr/include/bits/waitflags.h \
+ /usr/include/bits/waitstatus.h /usr/include/alloca.h \
+ /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \
+ /usr/include/string.h /usr/include/xlocale.h /usr/include/bits/string.h \
+ /usr/include/bits/string2.h /usr/include/assert.h /usr/include/dlfcn.h \
+ /usr/include/bits/dlfcn.h /usr/include/unistd.h \
+ /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \
+ /usr/include/bits/confname.h /usr/include/getopt.h /usr/include/math.h \
+ /usr/include/bits/huge_val.h /usr/include/bits/huge_valf.h \
+ /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \
+ /usr/include/bits/nan.h /usr/include/bits/mathdef.h \
+ /usr/include/bits/mathcalls.h /usr/include/bits/mathinline.h \
+ /usr/include/sys/stat.h /usr/include/bits/stat.h /usr/include/sys/time.h \
+ /usr/include/sys/wait.h /usr/include/signal.h /usr/include/bits/signum.h \
+ /usr/include/bits/siginfo.h /usr/include/bits/sigaction.h \
+ /usr/include/bits/sigcontext.h /usr/include/bits/sigstack.h \
+ /usr/include/sys/ucontext.h /usr/include/bits/sigthread.h \
+ /usr/include/dirent.h /usr/include/bits/dirent.h \
+ /usr/include/bits/posix1_lim.h /usr/include/bits/local_lim.h \
/usr/include/linux/limits.h /usr/include/libgen.h ladspa_run_synth.h \
midi/midi_loader.h midi/fluid_list.h midi/fluidsynth_priv.h \
midi/fluid_midi_custom.h midi/midi_loader.h \
- /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h /usr/include/stdint.h \
- /usr/include/x86_64-linux-gnu/bits/wchar.h midi/fluid_midi.h
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h \
+ /usr/include/stdint.h /usr/include/bits/wchar.h midi/fluid_midi.h
/usr/include/stdc-predef.h:
@@ -67,19 +49,19 @@ dssi-render.h:
/usr/include/features.h:
-/usr/include/x86_64-linux-gnu/sys/cdefs.h:
+/usr/include/sys/cdefs.h:
-/usr/include/x86_64-linux-gnu/bits/wordsize.h:
+/usr/include/bits/wordsize.h:
-/usr/include/x86_64-linux-gnu/gnu/stubs.h:
+/usr/include/gnu/stubs.h:
-/usr/include/x86_64-linux-gnu/gnu/stubs-64.h:
+/usr/include/gnu/stubs-64.h:
-/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h:
-/usr/include/x86_64-linux-gnu/bits/types.h:
+/usr/include/bits/types.h:
-/usr/include/x86_64-linux-gnu/bits/typesizes.h:
+/usr/include/bits/typesizes.h:
/usr/include/libio.h:
@@ -87,35 +69,37 @@ dssi-render.h:
/usr/include/wchar.h:
-/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h:
-/usr/include/x86_64-linux-gnu/bits/stdio_lim.h:
+/usr/include/bits/stdio_lim.h:
-/usr/include/x86_64-linux-gnu/bits/sys_errlist.h:
+/usr/include/bits/sys_errlist.h:
-/usr/include/x86_64-linux-gnu/bits/stdio.h:
+/usr/include/bits/stdio.h:
-/usr/include/x86_64-linux-gnu/sys/types.h:
+/usr/include/sys/types.h:
/usr/include/time.h:
/usr/include/endian.h:
-/usr/include/x86_64-linux-gnu/bits/endian.h:
+/usr/include/bits/endian.h:
-/usr/include/x86_64-linux-gnu/bits/byteswap.h:
+/usr/include/bits/byteswap.h:
-/usr/include/x86_64-linux-gnu/bits/byteswap-16.h:
+/usr/include/bits/byteswap-16.h:
-/usr/include/x86_64-linux-gnu/sys/select.h:
+/usr/include/sys/select.h:
-/usr/include/x86_64-linux-gnu/bits/select.h:
+/usr/include/bits/select.h:
-/usr/include/x86_64-linux-gnu/bits/sigset.h:
+/usr/include/bits/sigset.h:
-/usr/include/x86_64-linux-gnu/bits/time.h:
+/usr/include/bits/time.h:
-/usr/include/x86_64-linux-gnu/sys/sysmacros.h:
+/usr/include/sys/sysmacros.h:
+
+/usr/include/bits/pthreadtypes.h:
/usr/include/ladspa.h:
@@ -125,77 +109,89 @@ dssi-render.h:
/usr/include/stdlib.h:
+/usr/include/bits/waitflags.h:
+
+/usr/include/bits/waitstatus.h:
+
/usr/include/alloca.h:
-/usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h:
+/usr/include/bits/stdlib-bsearch.h:
-/usr/include/x86_64-linux-gnu/bits/stdlib-float.h:
+/usr/include/bits/stdlib-float.h:
/usr/include/string.h:
-/usr/include/x86_64-linux-gnu/bits/string.h:
+/usr/include/xlocale.h:
+
+/usr/include/bits/string.h:
-/usr/include/x86_64-linux-gnu/bits/string2.h:
+/usr/include/bits/string2.h:
/usr/include/assert.h:
/usr/include/dlfcn.h:
-/usr/include/x86_64-linux-gnu/bits/dlfcn.h:
+/usr/include/bits/dlfcn.h:
/usr/include/unistd.h:
-/usr/include/x86_64-linux-gnu/bits/posix_opt.h:
+/usr/include/bits/posix_opt.h:
-/usr/include/x86_64-linux-gnu/bits/confname.h:
+/usr/include/bits/environments.h:
+
+/usr/include/bits/confname.h:
+
+/usr/include/getopt.h:
/usr/include/math.h:
-/usr/include/x86_64-linux-gnu/bits/huge_val.h:
+/usr/include/bits/huge_val.h:
-/usr/include/x86_64-linux-gnu/bits/huge_valf.h:
+/usr/include/bits/huge_valf.h:
-/usr/include/x86_64-linux-gnu/bits/huge_vall.h:
+/usr/include/bits/huge_vall.h:
-/usr/include/x86_64-linux-gnu/bits/inf.h:
+/usr/include/bits/inf.h:
-/usr/include/x86_64-linux-gnu/bits/nan.h:
+/usr/include/bits/nan.h:
-/usr/include/x86_64-linux-gnu/bits/mathdef.h:
+/usr/include/bits/mathdef.h:
-/usr/include/x86_64-linux-gnu/bits/mathcalls.h:
+/usr/include/bits/mathcalls.h:
-/usr/include/x86_64-linux-gnu/bits/mathinline.h:
+/usr/include/bits/mathinline.h:
-/usr/include/x86_64-linux-gnu/sys/stat.h:
+/usr/include/sys/stat.h:
-/usr/include/x86_64-linux-gnu/bits/stat.h:
+/usr/include/bits/stat.h:
-/usr/include/x86_64-linux-gnu/sys/time.h:
+/usr/include/sys/time.h:
-/usr/include/x86_64-linux-gnu/sys/wait.h:
+/usr/include/sys/wait.h:
/usr/include/signal.h:
-/usr/include/x86_64-linux-gnu/bits/signum.h:
+/usr/include/bits/signum.h:
+
+/usr/include/bits/siginfo.h:
-/usr/include/x86_64-linux-gnu/bits/sigcontext.h:
+/usr/include/bits/sigaction.h:
-/usr/include/x86_64-linux-gnu/bits/sigstack.h:
+/usr/include/bits/sigcontext.h:
-/usr/include/x86_64-linux-gnu/bits/waitflags.h:
+/usr/include/bits/sigstack.h:
-/usr/include/x86_64-linux-gnu/bits/waitstatus.h:
+/usr/include/sys/ucontext.h:
-/usr/include/x86_64-linux-gnu/bits/siginfo.h:
+/usr/include/bits/sigthread.h:
/usr/include/dirent.h:
-/usr/include/x86_64-linux-gnu/bits/dirent.h:
+/usr/include/bits/dirent.h:
-/usr/include/x86_64-linux-gnu/bits/posix1_lim.h:
+/usr/include/bits/posix1_lim.h:
-/usr/include/x86_64-linux-gnu/bits/local_lim.h:
+/usr/include/bits/local_lim.h:
/usr/include/linux/limits.h:
@@ -213,10 +209,10 @@ midi/fluid_midi_custom.h:
midi/midi_loader.h:
-/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h:
/usr/include/stdint.h:
-/usr/include/x86_64-linux-gnu/bits/wchar.h:
+/usr/include/bits/wchar.h:
midi/fluid_midi.h:
diff --git a/src/.deps/ladspa_run_synth.Po b/src/.deps/ladspa_run_synth.Po
index cd2de68..6a2cfc1 100644
--- a/src/.deps/ladspa_run_synth.Po
+++ b/src/.deps/ladspa_run_synth.Po
@@ -1,61 +1,44 @@
ladspa_run_synth.o: ladspa_run_synth.c /usr/include/stdc-predef.h \
dssi-render.h /usr/include/sndfile.h /usr/include/stdio.h \
- /usr/include/features.h /usr/include/x86_64-linux-gnu/sys/cdefs.h \
- /usr/include/x86_64-linux-gnu/bits/wordsize.h \
- /usr/include/x86_64-linux-gnu/gnu/stubs.h \
- /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
- /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h \
- /usr/include/x86_64-linux-gnu/bits/types.h \
- /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/wchar.h \
- /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h \
- /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \
- /usr/include/x86_64-linux-gnu/bits/sys_errlist.h \
- /usr/include/x86_64-linux-gnu/bits/stdio.h \
- /usr/include/x86_64-linux-gnu/sys/types.h /usr/include/time.h \
- /usr/include/endian.h /usr/include/x86_64-linux-gnu/bits/endian.h \
- /usr/include/x86_64-linux-gnu/bits/byteswap.h \
- /usr/include/x86_64-linux-gnu/bits/byteswap-16.h \
- /usr/include/x86_64-linux-gnu/sys/select.h \
- /usr/include/x86_64-linux-gnu/bits/select.h \
- /usr/include/x86_64-linux-gnu/bits/sigset.h \
- /usr/include/x86_64-linux-gnu/bits/time.h \
- /usr/include/x86_64-linux-gnu/sys/sysmacros.h /usr/include/ladspa.h \
- /usr/include/dssi.h /usr/include/alsa/seq_event.h /usr/include/stdlib.h \
- /usr/include/alloca.h \
- /usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h \
- /usr/include/x86_64-linux-gnu/bits/stdlib-float.h /usr/include/string.h \
- /usr/include/x86_64-linux-gnu/bits/string.h \
- /usr/include/x86_64-linux-gnu/bits/string2.h /usr/include/assert.h \
- /usr/include/dlfcn.h /usr/include/x86_64-linux-gnu/bits/dlfcn.h \
- /usr/include/unistd.h /usr/include/x86_64-linux-gnu/bits/posix_opt.h \
- /usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/math.h \
- /usr/include/x86_64-linux-gnu/bits/huge_val.h \
- /usr/include/x86_64-linux-gnu/bits/huge_valf.h \
- /usr/include/x86_64-linux-gnu/bits/huge_vall.h \
- /usr/include/x86_64-linux-gnu/bits/inf.h \
- /usr/include/x86_64-linux-gnu/bits/nan.h \
- /usr/include/x86_64-linux-gnu/bits/mathdef.h \
- /usr/include/x86_64-linux-gnu/bits/mathcalls.h \
- /usr/include/x86_64-linux-gnu/bits/mathinline.h \
- /usr/include/x86_64-linux-gnu/sys/stat.h \
- /usr/include/x86_64-linux-gnu/bits/stat.h \
- /usr/include/x86_64-linux-gnu/sys/time.h \
- /usr/include/x86_64-linux-gnu/sys/wait.h /usr/include/signal.h \
- /usr/include/x86_64-linux-gnu/bits/signum.h \
- /usr/include/x86_64-linux-gnu/bits/sigcontext.h \
- /usr/include/x86_64-linux-gnu/bits/sigstack.h \
- /usr/include/x86_64-linux-gnu/bits/waitflags.h \
- /usr/include/x86_64-linux-gnu/bits/waitstatus.h \
- /usr/include/x86_64-linux-gnu/bits/siginfo.h /usr/include/dirent.h \
- /usr/include/x86_64-linux-gnu/bits/dirent.h \
- /usr/include/x86_64-linux-gnu/bits/posix1_lim.h \
- /usr/include/x86_64-linux-gnu/bits/local_lim.h \
+ /usr/include/features.h /usr/include/sys/cdefs.h \
+ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
+ /usr/include/gnu/stubs-64.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h \
+ /usr/include/bits/types.h /usr/include/bits/typesizes.h \
+ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h \
+ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
+ /usr/include/bits/stdio.h /usr/include/sys/types.h /usr/include/time.h \
+ /usr/include/endian.h /usr/include/bits/endian.h \
+ /usr/include/bits/byteswap.h /usr/include/bits/byteswap-16.h \
+ /usr/include/sys/select.h /usr/include/bits/select.h \
+ /usr/include/bits/sigset.h /usr/include/bits/time.h \
+ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
+ /usr/include/ladspa.h /usr/include/dssi.h /usr/include/alsa/seq_event.h \
+ /usr/include/stdlib.h /usr/include/bits/waitflags.h \
+ /usr/include/bits/waitstatus.h /usr/include/alloca.h \
+ /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \
+ /usr/include/string.h /usr/include/xlocale.h /usr/include/bits/string.h \
+ /usr/include/bits/string2.h /usr/include/assert.h /usr/include/dlfcn.h \
+ /usr/include/bits/dlfcn.h /usr/include/unistd.h \
+ /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \
+ /usr/include/bits/confname.h /usr/include/getopt.h /usr/include/math.h \
+ /usr/include/bits/huge_val.h /usr/include/bits/huge_valf.h \
+ /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \
+ /usr/include/bits/nan.h /usr/include/bits/mathdef.h \
+ /usr/include/bits/mathcalls.h /usr/include/bits/mathinline.h \
+ /usr/include/sys/stat.h /usr/include/bits/stat.h /usr/include/sys/time.h \
+ /usr/include/sys/wait.h /usr/include/signal.h /usr/include/bits/signum.h \
+ /usr/include/bits/siginfo.h /usr/include/bits/sigaction.h \
+ /usr/include/bits/sigcontext.h /usr/include/bits/sigstack.h \
+ /usr/include/sys/ucontext.h /usr/include/bits/sigthread.h \
+ /usr/include/dirent.h /usr/include/bits/dirent.h \
+ /usr/include/bits/posix1_lim.h /usr/include/bits/local_lim.h \
/usr/include/linux/limits.h /usr/include/libgen.h midi/midi_loader.h \
midi/fluid_list.h midi/fluidsynth_priv.h midi/fluid_midi_custom.h \
- midi/midi_loader.h /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h \
- /usr/include/stdint.h /usr/include/x86_64-linux-gnu/bits/wchar.h \
- midi/fluid_midi.h
+ midi/midi_loader.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h \
+ /usr/include/stdint.h /usr/include/bits/wchar.h midi/fluid_midi.h
/usr/include/stdc-predef.h:
@@ -67,19 +50,19 @@ dssi-render.h:
/usr/include/features.h:
-/usr/include/x86_64-linux-gnu/sys/cdefs.h:
+/usr/include/sys/cdefs.h:
-/usr/include/x86_64-linux-gnu/bits/wordsize.h:
+/usr/include/bits/wordsize.h:
-/usr/include/x86_64-linux-gnu/gnu/stubs.h:
+/usr/include/gnu/stubs.h:
-/usr/include/x86_64-linux-gnu/gnu/stubs-64.h:
+/usr/include/gnu/stubs-64.h:
-/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h:
-/usr/include/x86_64-linux-gnu/bits/types.h:
+/usr/include/bits/types.h:
-/usr/include/x86_64-linux-gnu/bits/typesizes.h:
+/usr/include/bits/typesizes.h:
/usr/include/libio.h:
@@ -87,35 +70,37 @@ dssi-render.h:
/usr/include/wchar.h:
-/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h:
-/usr/include/x86_64-linux-gnu/bits/stdio_lim.h:
+/usr/include/bits/stdio_lim.h:
-/usr/include/x86_64-linux-gnu/bits/sys_errlist.h:
+/usr/include/bits/sys_errlist.h:
-/usr/include/x86_64-linux-gnu/bits/stdio.h:
+/usr/include/bits/stdio.h:
-/usr/include/x86_64-linux-gnu/sys/types.h:
+/usr/include/sys/types.h:
/usr/include/time.h:
/usr/include/endian.h:
-/usr/include/x86_64-linux-gnu/bits/endian.h:
+/usr/include/bits/endian.h:
-/usr/include/x86_64-linux-gnu/bits/byteswap.h:
+/usr/include/bits/byteswap.h:
-/usr/include/x86_64-linux-gnu/bits/byteswap-16.h:
+/usr/include/bits/byteswap-16.h:
-/usr/include/x86_64-linux-gnu/sys/select.h:
+/usr/include/sys/select.h:
-/usr/include/x86_64-linux-gnu/bits/select.h:
+/usr/include/bits/select.h:
-/usr/include/x86_64-linux-gnu/bits/sigset.h:
+/usr/include/bits/sigset.h:
-/usr/include/x86_64-linux-gnu/bits/time.h:
+/usr/include/bits/time.h:
-/usr/include/x86_64-linux-gnu/sys/sysmacros.h:
+/usr/include/sys/sysmacros.h:
+
+/usr/include/bits/pthreadtypes.h:
/usr/include/ladspa.h:
@@ -125,77 +110,89 @@ dssi-render.h:
/usr/include/stdlib.h:
+/usr/include/bits/waitflags.h:
+
+/usr/include/bits/waitstatus.h:
+
/usr/include/alloca.h:
-/usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h:
+/usr/include/bits/stdlib-bsearch.h:
-/usr/include/x86_64-linux-gnu/bits/stdlib-float.h:
+/usr/include/bits/stdlib-float.h:
/usr/include/string.h:
-/usr/include/x86_64-linux-gnu/bits/string.h:
+/usr/include/xlocale.h:
+
+/usr/include/bits/string.h:
-/usr/include/x86_64-linux-gnu/bits/string2.h:
+/usr/include/bits/string2.h:
/usr/include/assert.h:
/usr/include/dlfcn.h:
-/usr/include/x86_64-linux-gnu/bits/dlfcn.h:
+/usr/include/bits/dlfcn.h:
/usr/include/unistd.h:
-/usr/include/x86_64-linux-gnu/bits/posix_opt.h:
+/usr/include/bits/posix_opt.h:
-/usr/include/x86_64-linux-gnu/bits/confname.h:
+/usr/include/bits/environments.h:
+
+/usr/include/bits/confname.h:
+
+/usr/include/getopt.h:
/usr/include/math.h:
-/usr/include/x86_64-linux-gnu/bits/huge_val.h:
+/usr/include/bits/huge_val.h:
-/usr/include/x86_64-linux-gnu/bits/huge_valf.h:
+/usr/include/bits/huge_valf.h:
-/usr/include/x86_64-linux-gnu/bits/huge_vall.h:
+/usr/include/bits/huge_vall.h:
-/usr/include/x86_64-linux-gnu/bits/inf.h:
+/usr/include/bits/inf.h:
-/usr/include/x86_64-linux-gnu/bits/nan.h:
+/usr/include/bits/nan.h:
-/usr/include/x86_64-linux-gnu/bits/mathdef.h:
+/usr/include/bits/mathdef.h:
-/usr/include/x86_64-linux-gnu/bits/mathcalls.h:
+/usr/include/bits/mathcalls.h:
-/usr/include/x86_64-linux-gnu/bits/mathinline.h:
+/usr/include/bits/mathinline.h:
-/usr/include/x86_64-linux-gnu/sys/stat.h:
+/usr/include/sys/stat.h:
-/usr/include/x86_64-linux-gnu/bits/stat.h:
+/usr/include/bits/stat.h:
-/usr/include/x86_64-linux-gnu/sys/time.h:
+/usr/include/sys/time.h:
-/usr/include/x86_64-linux-gnu/sys/wait.h:
+/usr/include/sys/wait.h:
/usr/include/signal.h:
-/usr/include/x86_64-linux-gnu/bits/signum.h:
+/usr/include/bits/signum.h:
+
+/usr/include/bits/siginfo.h:
-/usr/include/x86_64-linux-gnu/bits/sigcontext.h:
+/usr/include/bits/sigaction.h:
-/usr/include/x86_64-linux-gnu/bits/sigstack.h:
+/usr/include/bits/sigcontext.h:
-/usr/include/x86_64-linux-gnu/bits/waitflags.h:
+/usr/include/bits/sigstack.h:
-/usr/include/x86_64-linux-gnu/bits/waitstatus.h:
+/usr/include/sys/ucontext.h:
-/usr/include/x86_64-linux-gnu/bits/siginfo.h:
+/usr/include/bits/sigthread.h:
/usr/include/dirent.h:
-/usr/include/x86_64-linux-gnu/bits/dirent.h:
+/usr/include/bits/dirent.h:
-/usr/include/x86_64-linux-gnu/bits/posix1_lim.h:
+/usr/include/bits/posix1_lim.h:
-/usr/include/x86_64-linux-gnu/bits/local_lim.h:
+/usr/include/bits/local_lim.h:
/usr/include/linux/limits.h:
@@ -211,10 +208,10 @@ midi/fluid_midi_custom.h:
midi/midi_loader.h:
-/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h:
/usr/include/stdint.h:
-/usr/include/x86_64-linux-gnu/bits/wchar.h:
+/usr/include/bits/wchar.h:
midi/fluid_midi.h:
diff --git a/src/.ladspa_run_synth.c.swp b/src/.ladspa_run_synth.c.swp
index 196caf1..416d76b 100644
--- a/src/.ladspa_run_synth.c.swp
+++ b/src/.ladspa_run_synth.c.swp
Binary files differ
diff --git a/src/Makefile b/src/Makefile
index 45dd42a..f4ee7b6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -81,7 +81,7 @@ host_triplet = x86_64-unknown-linux-gnu
bin_PROGRAMS = dssi-render$(EXEEXT)
subdir = src
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp TODO
+ $(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -231,10 +231,10 @@ DUMPBIN =
ECHO_C =
ECHO_N = -n
ECHO_T =
-EGREP = /bin/grep -E
+EGREP = /usr/bin/grep -E
EXEEXT =
-FGREP = /bin/grep -F
-GREP = /bin/grep
+FGREP = /usr/bin/grep -F
+GREP = /usr/bin/grep
INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
@@ -250,7 +250,7 @@ LN_S = ln -s
LTLIBOBJS =
MAKEINFO = ${SHELL} /home/pepper/dssi-render/missing makeinfo
MANIFEST_TOOL = :
-MKDIR_P = /bin/mkdir -p
+MKDIR_P = /usr/bin/mkdir -p
NM = /usr/bin/nm -B
NMEDIT =
OBJDUMP = objdump
@@ -269,9 +269,9 @@ PKG_CONFIG = /usr/bin/pkg-config
PKG_CONFIG_LIBDIR =
PKG_CONFIG_PATH =
RANLIB = ranlib
-SED = /bin/sed
+SED = /usr/bin/sed
SET_MAKE =
-SHELL = /bin/bash
+SHELL = /bin/sh
SNDFILE_CFLAGS =
SNDFILE_LIBS = -lsndfile
STRIP = strip
diff --git a/src/Makefile.in b/src/Makefile.in
index 69d6c74..99d1fad 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -81,7 +81,7 @@ host_triplet = @host@
bin_PROGRAMS = dssi-render$(EXEEXT)
subdir = src
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp TODO
+ $(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/src/VALOUT b/src/VALOUT
index bbb2683..4907c63 100644
--- a/src/VALOUT
+++ b/src/VALOUT
@@ -3,6 +3,9 @@
==19216== Using Valgrind-3.10.1 and LibVEX; rerun with -h for copyright info
==19216== Command: ./dssi-render /usr/local/lib/dssi/amsynth_dssi.so -p 1
==19216==
+//so I've got a memory leak here, at least I'm pretty sure that's what this is...basically if a midi file is too long, it segfaults.
+
+this is the output from valgrind... is this helpful? or do I need to recompile with -g?
==19216== Conditional jump or move depends on uninitialised value(s)
==19216== at 0x6DBEC62: revmodel::update() (in /usr/local/lib/dssi/amsynth_dssi.so)
==19216== by 0x6DBEE88: revmodel::setwet(float) (in /usr/local/lib/dssi/amsynth_dssi.so)
@@ -281156,8 +281159,9 @@ dssi-render: Wrote 255 frames to output.wav
event table last nframe: 8904056
run_synth(instancehandle, 255,
- 1: event_type: NOTE_ONchannel: 0 note: 68 veloci==19216== Argument 'size' of function realloc has a fishy (possibly negative) value: -173348
+so it's invalid size calulcation, need to check those functions
==19216== at 0x4C2C29E: realloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
-==19216== by 0x4027AE: ladspa_run_sample_callback (ladspa_run_synth.c:15)
+==19216== by 0x4027AE: ladspa_run_sample_callback (ladspa_run_synth.c:15) //here? yes:
==19216== by 0x4030FA: get_events (midi_loader.c:228)
==19216== by 0x4047BC: fluid_track_send_events (fluid_midi.c:1212)
==19216== by 0x40326B: load_midi_file (midi_loader.c:297)
diff --git a/src/dssi-render b/src/dssi-render
index 14a5b9a..a5f946a 100755
--- a/src/dssi-render
+++ b/src/dssi-render
Binary files differ
diff --git a/src/dssi-render.c b/src/dssi-render.c
index c4b560f..03a9b98 100644
--- a/src/dssi-render.c
+++ b/src/dssi-render.c
@@ -4,6 +4,7 @@
#include "ladspa_run_synth.h"
#include "midi/midi_loader.h"
+#define SAMPLE_RATE 44100
#define DEBUG 1
void
@@ -63,7 +64,7 @@ DSSI_Descriptor_Function descfn;
size_t length = SAMPLE_RATE;
size_t release_tail = -1;
- size_t nframes = 256;
+ size_t nframes = 256; //here I guess? yeah ok
size_t items_written = 0;
float **pluginInputBuffers, **pluginOutputBuffers;
diff --git a/src/dssi-render.h b/src/dssi-render.h
index 136ef34..6870f0e 100644
--- a/src/dssi-render.h
+++ b/src/dssi-render.h
@@ -1,5 +1,3 @@
-//it's most likely defined in one of alsa libs, just copy headers include from here to get it. right but it's
-//a pointer right? it's a structure. do we need to know what's in it? yes we need to fill it porperly for run_synth
/* cli-dssi-host.h
* Copyright (C) 2005 James McDermott
* jamesmichaelmcdermott@gmail.com
@@ -32,7 +30,6 @@
#define MAX_LENGTH (15.0f)
-#define SAMPLE_RATE 44100
/* character used to separate SO names from plugin labels on command line */
#define LABEL_SEP ':'
#define KEYVAL_SEP '='
@@ -65,6 +62,8 @@
+
+extern float sample_rate;
extern char *midi_filename;
extern const DSSI_Descriptor *descriptor;
extern LADSPA_Handle instanceHandle;
@@ -102,8 +101,8 @@ extern float *pluginControlOuts;
//awesome, worked, right? yeah
//so what is extern doing? basically it says that there is a variable, but doesn't allocate it by itself, so same varable can be shared between two code from different object files. and are extern definitions like this usually kept in the header files? yes ok
char *my_name;
-#ifdef CLI_FUNCS
-static float sample_rate;
+#ifdef CLI_FUNCS
+float sample_rate;
static int verbose = 0;
LADSPA_Data get_port_random(const LADSPA_Descriptor *plugin, int port)
diff --git a/src/dssi-render.o b/src/dssi-render.o
index 71599b4..ca09674 100644
--- a/src/dssi-render.o
+++ b/src/dssi-render.o
Binary files differ
diff --git a/src/ladspa_run_synth.c b/src/ladspa_run_synth.c
index 84f944e..92f0782 100644
--- a/src/ladspa_run_synth.c
+++ b/src/ladspa_run_synth.c
@@ -7,12 +7,17 @@ inline int
min(int x, int y) {
return (x < y) ? x : y;
}
+// where is nframes defined?
void ladspa_run_sample_callback(event_table_t *event_table, void *userdata){
nframes = event_table->nframes_since_last;
nframes = nframes > 0 ? nframes : 1;
+//is it nframes that has the negative value? or event_table length? well they are both size_t, can't be negative. i guess need to add prints to see what's going on
+ printf("nframes: 0x%x\n", nframes);
+ printf("outs: 0x%x\n", outs);
for (int i = 0; i < outs; i++) {
pluginOutputBuffers[i] = (float *)realloc(pluginOutputBuffers[i], nframes * sizeof(float));
+ printf("i: 0x%x buff: 0x%x\n", i, pluginOutputBuffers[i]);
memset(pluginOutputBuffers[i], 0, nframes * sizeof(float));
}
connect_ports();
@@ -47,7 +52,6 @@ void ladspa_run_sample_callback(event_table_t *event_table, void *userdata){
sf_output[i * nchannels + j] = pluginOutputBuffers[outs - 1][i];
}
}
-//clip = 1; // FIXME
if (clip) {
for (int i = 0; i < nframes * nchannels; i++) {
if (!finite(sf_output[i])) {
@@ -112,7 +116,8 @@ void ladspa_run_sample_callback(event_table_t *event_table, void *userdata){
}
+
void ladspa_run_synth(void){
- load_midi_file(midi_filename, ladspa_run_sample_callback, NULL);
+ load_midi_file(midi_filename, sample_rate, ladspa_run_sample_callback, NULL);
}
diff --git a/src/ladspa_run_synth.o b/src/ladspa_run_synth.o
index 3014a49..2722b0d 100644
--- a/src/ladspa_run_synth.o
+++ b/src/ladspa_run_synth.o
Binary files differ
diff --git a/src/midi/.deps/fluid_list.Plo b/src/midi/.deps/fluid_list.Plo
index 1166ac5..5b5edf9 100644
--- a/src/midi/.deps/fluid_list.Plo
+++ b/src/midi/.deps/fluid_list.Plo
@@ -1,43 +1,31 @@
fluid_list.lo: fluid_list.c /usr/include/stdc-predef.h fluid_list.h \
fluidsynth_priv.h fluid_midi_custom.h midi_loader.h fluid_midi.h \
- /usr/include/stdlib.h /usr/include/features.h \
- /usr/include/x86_64-linux-gnu/sys/cdefs.h \
- /usr/include/x86_64-linux-gnu/bits/wordsize.h \
- /usr/include/x86_64-linux-gnu/gnu/stubs.h \
- /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
- /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h \
- /usr/include/x86_64-linux-gnu/bits/waitflags.h \
- /usr/include/x86_64-linux-gnu/bits/waitstatus.h /usr/include/endian.h \
- /usr/include/x86_64-linux-gnu/bits/endian.h \
- /usr/include/x86_64-linux-gnu/bits/byteswap.h \
- /usr/include/x86_64-linux-gnu/bits/types.h \
- /usr/include/x86_64-linux-gnu/bits/typesizes.h \
- /usr/include/x86_64-linux-gnu/bits/byteswap-16.h \
- /usr/include/x86_64-linux-gnu/sys/types.h /usr/include/time.h \
- /usr/include/x86_64-linux-gnu/sys/select.h \
- /usr/include/x86_64-linux-gnu/bits/select.h \
- /usr/include/x86_64-linux-gnu/bits/sigset.h \
- /usr/include/x86_64-linux-gnu/bits/time.h \
- /usr/include/x86_64-linux-gnu/sys/sysmacros.h \
- /usr/include/x86_64-linux-gnu/bits/pthreadtypes.h /usr/include/alloca.h \
- /usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h \
- /usr/include/x86_64-linux-gnu/bits/stdlib-float.h /usr/include/stdio.h \
- /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
- /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h \
- /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \
- /usr/include/x86_64-linux-gnu/bits/sys_errlist.h \
- /usr/include/x86_64-linux-gnu/bits/stdio.h \
- /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h /usr/include/stdint.h \
- /usr/include/x86_64-linux-gnu/bits/wchar.h /usr/include/sndfile.h \
- /usr/include/string.h /usr/include/xlocale.h \
- /usr/include/x86_64-linux-gnu/bits/string.h \
- /usr/include/x86_64-linux-gnu/bits/string2.h /usr/include/ladspa.h \
- /usr/include/dssi.h /usr/include/alsa/seq_event.h /usr/include/unistd.h \
- /usr/include/x86_64-linux-gnu/bits/posix_opt.h \
- /usr/include/x86_64-linux-gnu/bits/environments.h \
- /usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/getopt.h \
- /usr/include/x86_64-linux-gnu/sys/stat.h \
- /usr/include/x86_64-linux-gnu/bits/stat.h
+ /usr/include/stdlib.h /usr/include/features.h /usr/include/sys/cdefs.h \
+ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
+ /usr/include/gnu/stubs-64.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h \
+ /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \
+ /usr/include/endian.h /usr/include/bits/endian.h \
+ /usr/include/bits/byteswap.h /usr/include/bits/types.h \
+ /usr/include/bits/typesizes.h /usr/include/bits/byteswap-16.h \
+ /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
+ /usr/include/bits/select.h /usr/include/bits/sigset.h \
+ /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
+ /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
+ /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \
+ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \
+ /usr/include/wchar.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h \
+ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
+ /usr/include/bits/stdio.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h \
+ /usr/include/stdint.h /usr/include/bits/wchar.h /usr/include/sndfile.h \
+ /usr/include/string.h /usr/include/xlocale.h /usr/include/bits/string.h \
+ /usr/include/bits/string2.h /usr/include/ladspa.h /usr/include/dssi.h \
+ /usr/include/alsa/seq_event.h /usr/include/unistd.h \
+ /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \
+ /usr/include/bits/confname.h /usr/include/getopt.h \
+ /usr/include/sys/stat.h /usr/include/bits/stat.h
/usr/include/stdc-predef.h:
@@ -55,53 +43,53 @@ fluid_midi.h:
/usr/include/features.h:
-/usr/include/x86_64-linux-gnu/sys/cdefs.h:
+/usr/include/sys/cdefs.h:
-/usr/include/x86_64-linux-gnu/bits/wordsize.h:
+/usr/include/bits/wordsize.h:
-/usr/include/x86_64-linux-gnu/gnu/stubs.h:
+/usr/include/gnu/stubs.h:
-/usr/include/x86_64-linux-gnu/gnu/stubs-64.h:
+/usr/include/gnu/stubs-64.h:
-/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h:
-/usr/include/x86_64-linux-gnu/bits/waitflags.h:
+/usr/include/bits/waitflags.h:
-/usr/include/x86_64-linux-gnu/bits/waitstatus.h:
+/usr/include/bits/waitstatus.h:
/usr/include/endian.h:
-/usr/include/x86_64-linux-gnu/bits/endian.h:
+/usr/include/bits/endian.h:
-/usr/include/x86_64-linux-gnu/bits/byteswap.h:
+/usr/include/bits/byteswap.h:
-/usr/include/x86_64-linux-gnu/bits/types.h:
+/usr/include/bits/types.h:
-/usr/include/x86_64-linux-gnu/bits/typesizes.h:
+/usr/include/bits/typesizes.h:
-/usr/include/x86_64-linux-gnu/bits/byteswap-16.h:
+/usr/include/bits/byteswap-16.h:
-/usr/include/x86_64-linux-gnu/sys/types.h:
+/usr/include/sys/types.h:
/usr/include/time.h:
-/usr/include/x86_64-linux-gnu/sys/select.h:
+/usr/include/sys/select.h:
-/usr/include/x86_64-linux-gnu/bits/select.h:
+/usr/include/bits/select.h:
-/usr/include/x86_64-linux-gnu/bits/sigset.h:
+/usr/include/bits/sigset.h:
-/usr/include/x86_64-linux-gnu/bits/time.h:
+/usr/include/bits/time.h:
-/usr/include/x86_64-linux-gnu/sys/sysmacros.h:
+/usr/include/sys/sysmacros.h:
-/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h:
+/usr/include/bits/pthreadtypes.h:
/usr/include/alloca.h:
-/usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h:
+/usr/include/bits/stdlib-bsearch.h:
-/usr/include/x86_64-linux-gnu/bits/stdlib-float.h:
+/usr/include/bits/stdlib-float.h:
/usr/include/stdio.h:
@@ -111,19 +99,19 @@ fluid_midi.h:
/usr/include/wchar.h:
-/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h:
-/usr/include/x86_64-linux-gnu/bits/stdio_lim.h:
+/usr/include/bits/stdio_lim.h:
-/usr/include/x86_64-linux-gnu/bits/sys_errlist.h:
+/usr/include/bits/sys_errlist.h:
-/usr/include/x86_64-linux-gnu/bits/stdio.h:
+/usr/include/bits/stdio.h:
-/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h:
/usr/include/stdint.h:
-/usr/include/x86_64-linux-gnu/bits/wchar.h:
+/usr/include/bits/wchar.h:
/usr/include/sndfile.h:
@@ -131,9 +119,9 @@ fluid_midi.h:
/usr/include/xlocale.h:
-/usr/include/x86_64-linux-gnu/bits/string.h:
+/usr/include/bits/string.h:
-/usr/include/x86_64-linux-gnu/bits/string2.h:
+/usr/include/bits/string2.h:
/usr/include/ladspa.h:
@@ -143,14 +131,14 @@ fluid_midi.h:
/usr/include/unistd.h:
-/usr/include/x86_64-linux-gnu/bits/posix_opt.h:
+/usr/include/bits/posix_opt.h:
-/usr/include/x86_64-linux-gnu/bits/environments.h:
+/usr/include/bits/environments.h:
-/usr/include/x86_64-linux-gnu/bits/confname.h:
+/usr/include/bits/confname.h:
/usr/include/getopt.h:
-/usr/include/x86_64-linux-gnu/sys/stat.h:
+/usr/include/sys/stat.h:
-/usr/include/x86_64-linux-gnu/bits/stat.h:
+/usr/include/bits/stat.h:
diff --git a/src/midi/.deps/fluid_midi.Plo b/src/midi/.deps/fluid_midi.Plo
index d829e21..3de2838 100644
--- a/src/midi/.deps/fluid_midi.Plo
+++ b/src/midi/.deps/fluid_midi.Plo
@@ -1,50 +1,34 @@
fluid_midi.lo: fluid_midi.c /usr/include/stdc-predef.h fluid_midi.h \
fluidsynth_priv.h fluid_midi_custom.h midi_loader.h fluid_list.h \
/usr/include/sndfile.h /usr/include/stdio.h /usr/include/features.h \
- /usr/include/x86_64-linux-gnu/sys/cdefs.h \
- /usr/include/x86_64-linux-gnu/bits/wordsize.h \
- /usr/include/x86_64-linux-gnu/gnu/stubs.h \
- /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
- /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h \
- /usr/include/x86_64-linux-gnu/bits/types.h \
- /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/wchar.h \
- /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h \
- /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \
- /usr/include/x86_64-linux-gnu/bits/sys_errlist.h \
- /usr/include/x86_64-linux-gnu/bits/stdio.h \
- /usr/include/x86_64-linux-gnu/sys/types.h /usr/include/time.h \
- /usr/include/endian.h /usr/include/x86_64-linux-gnu/bits/endian.h \
- /usr/include/x86_64-linux-gnu/bits/byteswap.h \
- /usr/include/x86_64-linux-gnu/bits/byteswap-16.h \
- /usr/include/x86_64-linux-gnu/sys/select.h \
- /usr/include/x86_64-linux-gnu/bits/select.h \
- /usr/include/x86_64-linux-gnu/bits/sigset.h \
- /usr/include/x86_64-linux-gnu/bits/time.h \
- /usr/include/x86_64-linux-gnu/sys/sysmacros.h \
- /usr/include/x86_64-linux-gnu/bits/pthreadtypes.h /usr/include/string.h \
- /usr/include/xlocale.h /usr/include/x86_64-linux-gnu/bits/string.h \
- /usr/include/x86_64-linux-gnu/bits/string2.h /usr/include/stdlib.h \
- /usr/include/ladspa.h /usr/include/dssi.h /usr/include/alsa/seq_event.h \
- /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h /usr/include/stdint.h \
- /usr/include/x86_64-linux-gnu/bits/wchar.h \
- /usr/include/x86_64-linux-gnu/bits/waitflags.h \
- /usr/include/x86_64-linux-gnu/bits/waitstatus.h /usr/include/alloca.h \
- /usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h \
- /usr/include/x86_64-linux-gnu/bits/stdlib-float.h /usr/include/unistd.h \
- /usr/include/x86_64-linux-gnu/bits/posix_opt.h \
- /usr/include/x86_64-linux-gnu/bits/environments.h \
- /usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/getopt.h \
- /usr/include/x86_64-linux-gnu/sys/stat.h \
- /usr/include/x86_64-linux-gnu/bits/stat.h /usr/include/math.h \
- /usr/include/x86_64-linux-gnu/bits/huge_val.h \
- /usr/include/x86_64-linux-gnu/bits/huge_valf.h \
- /usr/include/x86_64-linux-gnu/bits/huge_vall.h \
- /usr/include/x86_64-linux-gnu/bits/inf.h \
- /usr/include/x86_64-linux-gnu/bits/nan.h \
- /usr/include/x86_64-linux-gnu/bits/mathdef.h \
- /usr/include/x86_64-linux-gnu/bits/mathcalls.h \
- /usr/include/x86_64-linux-gnu/bits/mathinline.h
+ /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \
+ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h \
+ /usr/include/bits/types.h /usr/include/bits/typesizes.h \
+ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h \
+ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
+ /usr/include/bits/stdio.h /usr/include/sys/types.h /usr/include/time.h \
+ /usr/include/endian.h /usr/include/bits/endian.h \
+ /usr/include/bits/byteswap.h /usr/include/bits/byteswap-16.h \
+ /usr/include/sys/select.h /usr/include/bits/select.h \
+ /usr/include/bits/sigset.h /usr/include/bits/time.h \
+ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
+ /usr/include/string.h /usr/include/xlocale.h /usr/include/bits/string.h \
+ /usr/include/bits/string2.h /usr/include/stdlib.h /usr/include/ladspa.h \
+ /usr/include/dssi.h /usr/include/alsa/seq_event.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h \
+ /usr/include/stdint.h /usr/include/bits/wchar.h \
+ /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \
+ /usr/include/alloca.h /usr/include/bits/stdlib-bsearch.h \
+ /usr/include/bits/stdlib-float.h /usr/include/unistd.h \
+ /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \
+ /usr/include/bits/confname.h /usr/include/getopt.h \
+ /usr/include/sys/stat.h /usr/include/bits/stat.h /usr/include/math.h \
+ /usr/include/bits/huge_val.h /usr/include/bits/huge_valf.h \
+ /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \
+ /usr/include/bits/nan.h /usr/include/bits/mathdef.h \
+ /usr/include/bits/mathcalls.h /usr/include/bits/mathinline.h
/usr/include/stdc-predef.h:
@@ -64,19 +48,19 @@ fluid_list.h:
/usr/include/features.h:
-/usr/include/x86_64-linux-gnu/sys/cdefs.h:
+/usr/include/sys/cdefs.h:
-/usr/include/x86_64-linux-gnu/bits/wordsize.h:
+/usr/include/bits/wordsize.h:
-/usr/include/x86_64-linux-gnu/gnu/stubs.h:
+/usr/include/gnu/stubs.h:
-/usr/include/x86_64-linux-gnu/gnu/stubs-64.h:
+/usr/include/gnu/stubs-64.h:
-/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h:
-/usr/include/x86_64-linux-gnu/bits/types.h:
+/usr/include/bits/types.h:
-/usr/include/x86_64-linux-gnu/bits/typesizes.h:
+/usr/include/bits/typesizes.h:
/usr/include/libio.h:
@@ -84,45 +68,45 @@ fluid_list.h:
/usr/include/wchar.h:
-/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h:
-/usr/include/x86_64-linux-gnu/bits/stdio_lim.h:
+/usr/include/bits/stdio_lim.h:
-/usr/include/x86_64-linux-gnu/bits/sys_errlist.h:
+/usr/include/bits/sys_errlist.h:
-/usr/include/x86_64-linux-gnu/bits/stdio.h:
+/usr/include/bits/stdio.h:
-/usr/include/x86_64-linux-gnu/sys/types.h:
+/usr/include/sys/types.h:
/usr/include/time.h:
/usr/include/endian.h:
-/usr/include/x86_64-linux-gnu/bits/endian.h:
+/usr/include/bits/endian.h:
-/usr/include/x86_64-linux-gnu/bits/byteswap.h:
+/usr/include/bits/byteswap.h:
-/usr/include/x86_64-linux-gnu/bits/byteswap-16.h:
+/usr/include/bits/byteswap-16.h:
-/usr/include/x86_64-linux-gnu/sys/select.h:
+/usr/include/sys/select.h:
-/usr/include/x86_64-linux-gnu/bits/select.h:
+/usr/include/bits/select.h:
-/usr/include/x86_64-linux-gnu/bits/sigset.h:
+/usr/include/bits/sigset.h:
-/usr/include/x86_64-linux-gnu/bits/time.h:
+/usr/include/bits/time.h:
-/usr/include/x86_64-linux-gnu/sys/sysmacros.h:
+/usr/include/sys/sysmacros.h:
-/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h:
+/usr/include/bits/pthreadtypes.h:
/usr/include/string.h:
/usr/include/xlocale.h:
-/usr/include/x86_64-linux-gnu/bits/string.h:
+/usr/include/bits/string.h:
-/usr/include/x86_64-linux-gnu/bits/string2.h:
+/usr/include/bits/string2.h:
/usr/include/stdlib.h:
@@ -132,50 +116,50 @@ fluid_list.h:
/usr/include/alsa/seq_event.h:
-/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h:
/usr/include/stdint.h:
-/usr/include/x86_64-linux-gnu/bits/wchar.h:
+/usr/include/bits/wchar.h:
-/usr/include/x86_64-linux-gnu/bits/waitflags.h:
+/usr/include/bits/waitflags.h:
-/usr/include/x86_64-linux-gnu/bits/waitstatus.h:
+/usr/include/bits/waitstatus.h:
/usr/include/alloca.h:
-/usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h:
+/usr/include/bits/stdlib-bsearch.h:
-/usr/include/x86_64-linux-gnu/bits/stdlib-float.h:
+/usr/include/bits/stdlib-float.h:
/usr/include/unistd.h:
-/usr/include/x86_64-linux-gnu/bits/posix_opt.h:
+/usr/include/bits/posix_opt.h:
-/usr/include/x86_64-linux-gnu/bits/environments.h:
+/usr/include/bits/environments.h:
-/usr/include/x86_64-linux-gnu/bits/confname.h:
+/usr/include/bits/confname.h:
/usr/include/getopt.h:
-/usr/include/x86_64-linux-gnu/sys/stat.h:
+/usr/include/sys/stat.h:
-/usr/include/x86_64-linux-gnu/bits/stat.h:
+/usr/include/bits/stat.h:
/usr/include/math.h:
-/usr/include/x86_64-linux-gnu/bits/huge_val.h:
+/usr/include/bits/huge_val.h:
-/usr/include/x86_64-linux-gnu/bits/huge_valf.h:
+/usr/include/bits/huge_valf.h:
-/usr/include/x86_64-linux-gnu/bits/huge_vall.h:
+/usr/include/bits/huge_vall.h:
-/usr/include/x86_64-linux-gnu/bits/inf.h:
+/usr/include/bits/inf.h:
-/usr/include/x86_64-linux-gnu/bits/nan.h:
+/usr/include/bits/nan.h:
-/usr/include/x86_64-linux-gnu/bits/mathdef.h:
+/usr/include/bits/mathdef.h:
-/usr/include/x86_64-linux-gnu/bits/mathcalls.h:
+/usr/include/bits/mathcalls.h:
-/usr/include/x86_64-linux-gnu/bits/mathinline.h:
+/usr/include/bits/mathinline.h:
diff --git a/src/midi/.deps/midi_loader.Plo b/src/midi/.deps/midi_loader.Plo
index 9a76aa8..f6b91a3 100644
--- a/src/midi/.deps/midi_loader.Plo
+++ b/src/midi/.deps/midi_loader.Plo
@@ -1,40 +1,29 @@
midi_loader.lo: midi_loader.c /usr/include/stdc-predef.h midi_loader.h \
fluid_list.h fluidsynth_priv.h fluid_midi_custom.h \
- /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h /usr/include/stdint.h \
- /usr/include/features.h /usr/include/x86_64-linux-gnu/sys/cdefs.h \
- /usr/include/x86_64-linux-gnu/bits/wordsize.h \
- /usr/include/x86_64-linux-gnu/gnu/stubs.h \
- /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
- /usr/include/x86_64-linux-gnu/bits/wchar.h /usr/include/stdio.h \
- /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h \
- /usr/include/x86_64-linux-gnu/bits/types.h \
- /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/wchar.h \
- /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h \
- /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \
- /usr/include/x86_64-linux-gnu/bits/sys_errlist.h \
- /usr/include/x86_64-linux-gnu/bits/stdio.h /usr/include/stdlib.h \
- /usr/include/x86_64-linux-gnu/bits/waitflags.h \
- /usr/include/x86_64-linux-gnu/bits/waitstatus.h /usr/include/endian.h \
- /usr/include/x86_64-linux-gnu/bits/endian.h \
- /usr/include/x86_64-linux-gnu/bits/byteswap.h \
- /usr/include/x86_64-linux-gnu/bits/byteswap-16.h \
- /usr/include/x86_64-linux-gnu/sys/types.h /usr/include/time.h \
- /usr/include/x86_64-linux-gnu/sys/select.h \
- /usr/include/x86_64-linux-gnu/bits/select.h \
- /usr/include/x86_64-linux-gnu/bits/sigset.h \
- /usr/include/x86_64-linux-gnu/bits/time.h \
- /usr/include/x86_64-linux-gnu/sys/sysmacros.h \
- /usr/include/x86_64-linux-gnu/bits/pthreadtypes.h /usr/include/alloca.h \
- /usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h \
- /usr/include/x86_64-linux-gnu/bits/stdlib-float.h /usr/include/string.h \
- /usr/include/xlocale.h /usr/include/x86_64-linux-gnu/bits/string.h \
- /usr/include/x86_64-linux-gnu/bits/string2.h /usr/include/unistd.h \
- /usr/include/x86_64-linux-gnu/bits/posix_opt.h \
- /usr/include/x86_64-linux-gnu/bits/environments.h \
- /usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/getopt.h \
- /usr/include/x86_64-linux-gnu/sys/stat.h \
- /usr/include/x86_64-linux-gnu/bits/stat.h fluid_midi.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h \
+ /usr/include/stdint.h /usr/include/features.h /usr/include/sys/cdefs.h \
+ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
+ /usr/include/gnu/stubs-64.h /usr/include/bits/wchar.h \
+ /usr/include/stdio.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h \
+ /usr/include/bits/types.h /usr/include/bits/typesizes.h \
+ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h \
+ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
+ /usr/include/bits/stdio.h /usr/include/stdlib.h \
+ /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \
+ /usr/include/endian.h /usr/include/bits/endian.h \
+ /usr/include/bits/byteswap.h /usr/include/bits/byteswap-16.h \
+ /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
+ /usr/include/bits/select.h /usr/include/bits/sigset.h \
+ /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
+ /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
+ /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \
+ /usr/include/string.h /usr/include/xlocale.h /usr/include/bits/string.h \
+ /usr/include/bits/string2.h /usr/include/unistd.h \
+ /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \
+ /usr/include/bits/confname.h /usr/include/getopt.h \
+ /usr/include/sys/stat.h /usr/include/bits/stat.h fluid_midi.h \
/usr/include/sndfile.h /usr/include/ladspa.h /usr/include/dssi.h \
/usr/include/alsa/seq_event.h
@@ -48,29 +37,29 @@ fluidsynth_priv.h:
fluid_midi_custom.h:
-/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h:
/usr/include/stdint.h:
/usr/include/features.h:
-/usr/include/x86_64-linux-gnu/sys/cdefs.h:
+/usr/include/sys/cdefs.h:
-/usr/include/x86_64-linux-gnu/bits/wordsize.h:
+/usr/include/bits/wordsize.h:
-/usr/include/x86_64-linux-gnu/gnu/stubs.h:
+/usr/include/gnu/stubs.h:
-/usr/include/x86_64-linux-gnu/gnu/stubs-64.h:
+/usr/include/gnu/stubs-64.h:
-/usr/include/x86_64-linux-gnu/bits/wchar.h:
+/usr/include/bits/wchar.h:
/usr/include/stdio.h:
-/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h:
-/usr/include/x86_64-linux-gnu/bits/types.h:
+/usr/include/bits/types.h:
-/usr/include/x86_64-linux-gnu/bits/typesizes.h:
+/usr/include/bits/typesizes.h:
/usr/include/libio.h:
@@ -78,71 +67,71 @@ fluid_midi_custom.h:
/usr/include/wchar.h:
-/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h:
-/usr/include/x86_64-linux-gnu/bits/stdio_lim.h:
+/usr/include/bits/stdio_lim.h:
-/usr/include/x86_64-linux-gnu/bits/sys_errlist.h:
+/usr/include/bits/sys_errlist.h:
-/usr/include/x86_64-linux-gnu/bits/stdio.h:
+/usr/include/bits/stdio.h:
/usr/include/stdlib.h:
-/usr/include/x86_64-linux-gnu/bits/waitflags.h:
+/usr/include/bits/waitflags.h:
-/usr/include/x86_64-linux-gnu/bits/waitstatus.h:
+/usr/include/bits/waitstatus.h:
/usr/include/endian.h:
-/usr/include/x86_64-linux-gnu/bits/endian.h:
+/usr/include/bits/endian.h:
-/usr/include/x86_64-linux-gnu/bits/byteswap.h:
+/usr/include/bits/byteswap.h:
-/usr/include/x86_64-linux-gnu/bits/byteswap-16.h:
+/usr/include/bits/byteswap-16.h:
-/usr/include/x86_64-linux-gnu/sys/types.h:
+/usr/include/sys/types.h:
/usr/include/time.h:
-/usr/include/x86_64-linux-gnu/sys/select.h:
+/usr/include/sys/select.h:
-/usr/include/x86_64-linux-gnu/bits/select.h:
+/usr/include/bits/select.h:
-/usr/include/x86_64-linux-gnu/bits/sigset.h:
+/usr/include/bits/sigset.h:
-/usr/include/x86_64-linux-gnu/bits/time.h:
+/usr/include/bits/time.h:
-/usr/include/x86_64-linux-gnu/sys/sysmacros.h:
+/usr/include/sys/sysmacros.h:
-/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h:
+/usr/include/bits/pthreadtypes.h:
/usr/include/alloca.h:
-/usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h:
+/usr/include/bits/stdlib-bsearch.h:
-/usr/include/x86_64-linux-gnu/bits/stdlib-float.h:
+/usr/include/bits/stdlib-float.h:
/usr/include/string.h:
/usr/include/xlocale.h:
-/usr/include/x86_64-linux-gnu/bits/string.h:
+/usr/include/bits/string.h:
-/usr/include/x86_64-linux-gnu/bits/string2.h:
+/usr/include/bits/string2.h:
/usr/include/unistd.h:
-/usr/include/x86_64-linux-gnu/bits/posix_opt.h:
+/usr/include/bits/posix_opt.h:
-/usr/include/x86_64-linux-gnu/bits/environments.h:
+/usr/include/bits/environments.h:
-/usr/include/x86_64-linux-gnu/bits/confname.h:
+/usr/include/bits/confname.h:
/usr/include/getopt.h:
-/usr/include/x86_64-linux-gnu/sys/stat.h:
+/usr/include/sys/stat.h:
-/usr/include/x86_64-linux-gnu/bits/stat.h:
+/usr/include/bits/stat.h:
fluid_midi.h:
diff --git a/src/midi/.deps/test_midi_loader.Po b/src/midi/.deps/test_midi_loader.Po
index 8b14bf4..46719e6 100644
--- a/src/midi/.deps/test_midi_loader.Po
+++ b/src/midi/.deps/test_midi_loader.Po
@@ -1,40 +1,29 @@
test_midi_loader.o: test_midi_loader.c /usr/include/stdc-predef.h \
midi_loader.h fluid_list.h fluidsynth_priv.h fluid_midi_custom.h \
- /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h /usr/include/stdint.h \
- /usr/include/features.h /usr/include/x86_64-linux-gnu/sys/cdefs.h \
- /usr/include/x86_64-linux-gnu/bits/wordsize.h \
- /usr/include/x86_64-linux-gnu/gnu/stubs.h \
- /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
- /usr/include/x86_64-linux-gnu/bits/wchar.h /usr/include/stdio.h \
- /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h \
- /usr/include/x86_64-linux-gnu/bits/types.h \
- /usr/include/x86_64-linux-gnu/bits/typesizes.h /usr/include/libio.h \
- /usr/include/_G_config.h /usr/include/wchar.h \
- /usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h \
- /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \
- /usr/include/x86_64-linux-gnu/bits/sys_errlist.h \
- /usr/include/x86_64-linux-gnu/bits/stdio.h /usr/include/stdlib.h \
- /usr/include/x86_64-linux-gnu/bits/waitflags.h \
- /usr/include/x86_64-linux-gnu/bits/waitstatus.h /usr/include/endian.h \
- /usr/include/x86_64-linux-gnu/bits/endian.h \
- /usr/include/x86_64-linux-gnu/bits/byteswap.h \
- /usr/include/x86_64-linux-gnu/bits/byteswap-16.h \
- /usr/include/x86_64-linux-gnu/sys/types.h /usr/include/time.h \
- /usr/include/x86_64-linux-gnu/sys/select.h \
- /usr/include/x86_64-linux-gnu/bits/select.h \
- /usr/include/x86_64-linux-gnu/bits/sigset.h \
- /usr/include/x86_64-linux-gnu/bits/time.h \
- /usr/include/x86_64-linux-gnu/sys/sysmacros.h \
- /usr/include/x86_64-linux-gnu/bits/pthreadtypes.h /usr/include/alloca.h \
- /usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h \
- /usr/include/x86_64-linux-gnu/bits/stdlib-float.h /usr/include/string.h \
- /usr/include/xlocale.h /usr/include/x86_64-linux-gnu/bits/string.h \
- /usr/include/x86_64-linux-gnu/bits/string2.h /usr/include/unistd.h \
- /usr/include/x86_64-linux-gnu/bits/posix_opt.h \
- /usr/include/x86_64-linux-gnu/bits/environments.h \
- /usr/include/x86_64-linux-gnu/bits/confname.h /usr/include/getopt.h \
- /usr/include/x86_64-linux-gnu/sys/stat.h \
- /usr/include/x86_64-linux-gnu/bits/stat.h fluid_midi.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h \
+ /usr/include/stdint.h /usr/include/features.h /usr/include/sys/cdefs.h \
+ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
+ /usr/include/gnu/stubs-64.h /usr/include/bits/wchar.h \
+ /usr/include/stdio.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h \
+ /usr/include/bits/types.h /usr/include/bits/typesizes.h \
+ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
+ /usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h \
+ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
+ /usr/include/bits/stdio.h /usr/include/stdlib.h \
+ /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \
+ /usr/include/endian.h /usr/include/bits/endian.h \
+ /usr/include/bits/byteswap.h /usr/include/bits/byteswap-16.h \
+ /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
+ /usr/include/bits/select.h /usr/include/bits/sigset.h \
+ /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
+ /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
+ /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \
+ /usr/include/string.h /usr/include/xlocale.h /usr/include/bits/string.h \
+ /usr/include/bits/string2.h /usr/include/unistd.h \
+ /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \
+ /usr/include/bits/confname.h /usr/include/getopt.h \
+ /usr/include/sys/stat.h /usr/include/bits/stat.h fluid_midi.h \
/usr/include/sndfile.h /usr/include/ladspa.h /usr/include/dssi.h \
/usr/include/alsa/seq_event.h
@@ -48,29 +37,29 @@ fluidsynth_priv.h:
fluid_midi_custom.h:
-/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdint.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdint.h:
/usr/include/stdint.h:
/usr/include/features.h:
-/usr/include/x86_64-linux-gnu/sys/cdefs.h:
+/usr/include/sys/cdefs.h:
-/usr/include/x86_64-linux-gnu/bits/wordsize.h:
+/usr/include/bits/wordsize.h:
-/usr/include/x86_64-linux-gnu/gnu/stubs.h:
+/usr/include/gnu/stubs.h:
-/usr/include/x86_64-linux-gnu/gnu/stubs-64.h:
+/usr/include/gnu/stubs-64.h:
-/usr/include/x86_64-linux-gnu/bits/wchar.h:
+/usr/include/bits/wchar.h:
/usr/include/stdio.h:
-/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stddef.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stddef.h:
-/usr/include/x86_64-linux-gnu/bits/types.h:
+/usr/include/bits/types.h:
-/usr/include/x86_64-linux-gnu/bits/typesizes.h:
+/usr/include/bits/typesizes.h:
/usr/include/libio.h:
@@ -78,71 +67,71 @@ fluid_midi_custom.h:
/usr/include/wchar.h:
-/usr/lib/gcc/x86_64-linux-gnu/4.9/include/stdarg.h:
+/usr/lib/gcc/x86_64-unknown-linux-gnu/4.9.0/include/stdarg.h:
-/usr/include/x86_64-linux-gnu/bits/stdio_lim.h:
+/usr/include/bits/stdio_lim.h:
-/usr/include/x86_64-linux-gnu/bits/sys_errlist.h:
+/usr/include/bits/sys_errlist.h:
-/usr/include/x86_64-linux-gnu/bits/stdio.h:
+/usr/include/bits/stdio.h:
/usr/include/stdlib.h:
-/usr/include/x86_64-linux-gnu/bits/waitflags.h:
+/usr/include/bits/waitflags.h:
-/usr/include/x86_64-linux-gnu/bits/waitstatus.h:
+/usr/include/bits/waitstatus.h:
/usr/include/endian.h:
-/usr/include/x86_64-linux-gnu/bits/endian.h:
+/usr/include/bits/endian.h:
-/usr/include/x86_64-linux-gnu/bits/byteswap.h:
+/usr/include/bits/byteswap.h:
-/usr/include/x86_64-linux-gnu/bits/byteswap-16.h:
+/usr/include/bits/byteswap-16.h:
-/usr/include/x86_64-linux-gnu/sys/types.h:
+/usr/include/sys/types.h:
/usr/include/time.h:
-/usr/include/x86_64-linux-gnu/sys/select.h:
+/usr/include/sys/select.h:
-/usr/include/x86_64-linux-gnu/bits/select.h:
+/usr/include/bits/select.h:
-/usr/include/x86_64-linux-gnu/bits/sigset.h:
+/usr/include/bits/sigset.h:
-/usr/include/x86_64-linux-gnu/bits/time.h:
+/usr/include/bits/time.h:
-/usr/include/x86_64-linux-gnu/sys/sysmacros.h:
+/usr/include/sys/sysmacros.h:
-/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h:
+/usr/include/bits/pthreadtypes.h:
/usr/include/alloca.h:
-/usr/include/x86_64-linux-gnu/bits/stdlib-bsearch.h:
+/usr/include/bits/stdlib-bsearch.h:
-/usr/include/x86_64-linux-gnu/bits/stdlib-float.h:
+/usr/include/bits/stdlib-float.h:
/usr/include/string.h:
/usr/include/xlocale.h:
-/usr/include/x86_64-linux-gnu/bits/string.h:
+/usr/include/bits/string.h:
-/usr/include/x86_64-linux-gnu/bits/string2.h:
+/usr/include/bits/string2.h:
/usr/include/unistd.h:
-/usr/include/x86_64-linux-gnu/bits/posix_opt.h:
+/usr/include/bits/posix_opt.h:
-/usr/include/x86_64-linux-gnu/bits/environments.h:
+/usr/include/bits/environments.h:
-/usr/include/x86_64-linux-gnu/bits/confname.h:
+/usr/include/bits/confname.h:
/usr/include/getopt.h:
-/usr/include/x86_64-linux-gnu/sys/stat.h:
+/usr/include/sys/stat.h:
-/usr/include/x86_64-linux-gnu/bits/stat.h:
+/usr/include/bits/stat.h:
fluid_midi.h:
diff --git a/src/midi/.libs/fluid_list.o b/src/midi/.libs/fluid_list.o
index 2df0fa8..086ddda 100644
--- a/src/midi/.libs/fluid_list.o
+++ b/src/midi/.libs/fluid_list.o
Binary files differ
diff --git a/src/midi/.libs/fluid_midi.o b/src/midi/.libs/fluid_midi.o
index e761d24..a760d5c 100644
--- a/src/midi/.libs/fluid_midi.o
+++ b/src/midi/.libs/fluid_midi.o
Binary files differ
diff --git a/src/midi/.libs/libfluidmidi.a b/src/midi/.libs/libfluidmidi.a
index 2590580..d8612b1 100644
--- a/src/midi/.libs/libfluidmidi.a
+++ b/src/midi/.libs/libfluidmidi.a
Binary files differ
diff --git a/src/midi/.libs/midi_loader.o b/src/midi/.libs/midi_loader.o
index 46a82c9..63edb32 100644
--- a/src/midi/.libs/midi_loader.o
+++ b/src/midi/.libs/midi_loader.o
Binary files differ
diff --git a/src/midi/Makefile b/src/midi/Makefile
index 3025341..8a35d60 100644
--- a/src/midi/Makefile
+++ b/src/midi/Makefile
@@ -191,10 +191,10 @@ DUMPBIN =
ECHO_C =
ECHO_N = -n
ECHO_T =
-EGREP = /bin/grep -E
+EGREP = /usr/bin/grep -E
EXEEXT =
-FGREP = /bin/grep -F
-GREP = /bin/grep
+FGREP = /usr/bin/grep -F
+GREP = /usr/bin/grep
INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
@@ -210,7 +210,7 @@ LN_S = ln -s
LTLIBOBJS =
MAKEINFO = ${SHELL} /home/pepper/dssi-render/missing makeinfo
MANIFEST_TOOL = :
-MKDIR_P = /bin/mkdir -p
+MKDIR_P = /usr/bin/mkdir -p
NM = /usr/bin/nm -B
NMEDIT =
OBJDUMP = objdump
@@ -229,9 +229,9 @@ PKG_CONFIG = /usr/bin/pkg-config
PKG_CONFIG_LIBDIR =
PKG_CONFIG_PATH =
RANLIB = ranlib
-SED = /bin/sed
+SED = /usr/bin/sed
SET_MAKE =
-SHELL = /bin/bash
+SHELL = /bin/sh
SNDFILE_CFLAGS =
SNDFILE_LIBS = -lsndfile
STRIP = strip
diff --git a/src/midi/fluid_list.lo b/src/midi/fluid_list.lo
index 9eb16d0..bbc909d 100644
--- a/src/midi/fluid_list.lo
+++ b/src/midi/fluid_list.lo
@@ -1,5 +1,5 @@
# fluid_list.lo - a libtool object file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.11
+# Generated by libtool (GNU libtool) 2.4.2
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
diff --git a/src/midi/fluid_list.o b/src/midi/fluid_list.o
index 853ca93..d754d92 100644
--- a/src/midi/fluid_list.o
+++ b/src/midi/fluid_list.o
Binary files differ
diff --git a/src/midi/fluid_midi.lo b/src/midi/fluid_midi.lo
index 3781e7b..09c84c0 100644
--- a/src/midi/fluid_midi.lo
+++ b/src/midi/fluid_midi.lo
@@ -1,5 +1,5 @@
# fluid_midi.lo - a libtool object file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.11
+# Generated by libtool (GNU libtool) 2.4.2
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
diff --git a/src/midi/fluid_midi.o b/src/midi/fluid_midi.o
index ac2c3d1..eadbdd4 100644
--- a/src/midi/fluid_midi.o
+++ b/src/midi/fluid_midi.o
Binary files differ
diff --git a/src/midi/libfluidmidi.la b/src/midi/libfluidmidi.la
index 52b7120..8da7fe7 100644
--- a/src/midi/libfluidmidi.la
+++ b/src/midi/libfluidmidi.la
@@ -1,5 +1,5 @@
# libfluidmidi.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.11
+# Generated by libtool (GNU libtool) 2.4.2
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
diff --git a/src/midi/midi_loader.c b/src/midi/midi_loader.c
index a3173ad..a0553ac 100644
--- a/src/midi/midi_loader.c
+++ b/src/midi/midi_loader.c
@@ -1,5 +1,5 @@
#include "midi_loader.h"
-#define DEBUG 0
+#define DEBUG 1
event_table_t *event_table;
int
@@ -186,22 +186,25 @@ int get_events(void *data, fluid_midi_event_t *event){
fluid_track_t *track = ctx->track;
snd_seq_event_t seq_event;
- size_t last_nframe = event_table->last_nframe;
- event_table->last_nframe = (player->deltatime * track->ticks) * 44100 / 1000; // FIXME 44100 to ctx->samplerate
- event_table->nframes_since_last = event_table->last_nframe - last_nframe;
+ size_t last_tick = event_table->last_tick;
+ size_t tick_current = track->ticks; // (player->deltatime * track->ticks) / 1000 * 44100;
+ if (last_tick > tick_current){
+ if (DEBUG){
+ printf("SKIPPING EVENT, event out of order in midi file. Last: %d, current tick: %d\n", last_tick, track->ticks);
+ }// nope, doesn't trigger if ticks is same any way we can print that tick number and compare it with the file? sure
+ return 0;
+ }
+ event_table->last_tick = tick_current;// FIXME 44100 to ctx->samplerate oh yeah this needs to be passed in
+ event_table->ticks_since_last = event_table->last_tick - last_tick;
+ event_table->nframes_since_last = event_table->ticks_since_last * player->deltatime * ctx->sample_rate / 1000;
convert_event_format(event, &seq_event);
- //print_snd_seq_event(&seq_event);
read_midi_callback cb = ctx->callback;
if(cb){
- //size_t i;
- // for(i = 0; i < event_table->nframes_since_last / 256; i++){ // FIXME //it could be something weird somewhere in this script though, right?
-//some part that we haven't been looking at at all... well yeah, i think of setting this to run whole nframes, and compiling hexter with debug symbols to check it again in valgrind. what is segfaulting...we don't know which part, right? yeah could it be something like an old printf statement somewhere in the code from cli-dssi-host? hm it actually can be code from cli-dssi which is initalizing plugin for only 256 frames and we are trying to run more inside.. yeah that seems right it saves it in "descriptor" right? yeah some buffer there
cb(event_table, ctx->callback_userdata);
//}
}
- // so i fixed logic a bit, should work now oh ok I have the new file
delete_note_off_events(event_table);
switch(event->type){
@@ -226,7 +229,7 @@ int get_events(void *data, fluid_midi_event_t *event){
-void load_midi_file(char *filename, read_midi_callback callback, void *callback_userdata){ //like that?
+void load_midi_file(char *filename, float sample_rate, read_midi_callback callback, void *callback_userdata){ //like that?
int i;
fluid_player_t *player;
fluid_playlist_item playlist_item;
@@ -237,129 +240,24 @@ void load_midi_file(char *filename, read_midi_callback callback, void *callback_
event_table->length = 0;
event_table->last_nframe = 0;
event_table->nframes_since_last = 0;
-//where is this calculated?
+ event_table->last_tick = 0;
+ event_table->ticks_since_last = 0;
playlist_item.filename = filename;
- //
- // so the only arg to the callback is ctx, right? yes
- // player = (fluid_player_t *)new_fluid_player();
+
player = (fluid_player_t *)new_fluid_player();
- player->playback_callback = &get_events; //how do I pass it to the callback? no way to do that, we can only pass one variable as "data"
- player->playback_userdata = (void *)&ctx; // here. so i guess need to make a structure and put player, track pointers into it.
+ player->playback_callback = &get_events;
+
+ player->playback_userdata = (void *)&ctx;
ctx.player = player;
ctx.callback = callback;
ctx.callback_userdata = callback_userdata;
+ ctx.sample_rate = sample_rate;
fluid_player_load(player, &playlist_item);
-//
-//
for(i = 0; i < player->ntracks; i++){
- ctx.track = player->track[i];// here. so i guess need to make a structure and put player, track pointers into it.
+ ctx.track = player->track[i];
fluid_track_send_events(player->track[i], player->synth, player, (unsigned int)-1);
}
delete_fluid_player(player);
}
-//
-//should I grab the run_synth call from the other program just so that we know what it requires? yep
-//
-// something like this, need to fix it a bit ok I'll load example.mid, should we try it before taking a break from this? well it won't compile i think, get_events should be consistent with callback prototype
-//
-//EXPLANATION:
-//LADSPA_Handle instanceHandle;
-//instanceHandle = descriptor->LADSPA_Plugin->instantiate
-//
-//
-//
-//int nframes (number of frames)
-
-// current_event is pointer to on/off event
-// snd_seq_event_t on_event, off_event, *current_event;
-// on_event.type = SND_SEQ_EVENT_NOTEON;
-// on_event.data.note.channel = 0; // this one oh ok, so we save this data, and don't worry about it until we get to run_synth? looks so ok perfect
-// on_event.data.note.note = midi_note;
-// on_event.data.note.velocity = midi_velocity;
-// on_event.time.tick = 0;
-//
-// off_event.type = SND_SEQ_EVENT_NOTEOFF;
-// off_event.data.note.channel = 0;
-// off_event.data.note.note = midi_note;
-// off_event.data.note.off_velocity = midi_velocity; // yeah off_velocity instead
-// off_event.time.tick = 0;
-
-
-//weird, negative numbers type problem...is it because we need to print as %u? or something similar? might be
-//ok so it's the event table that we pass in, right? yes
-// descriptor->run_synth(instanceHandle, //instance handle is taken care of for us, current_event is our event_table, right? event_table->events
-// player->msec, //like this? not really
-// event_table->events,
-// event_table->length);
-//
-// so with nfraes, we need to track how many samples we should generate from last get_events call. so it should be something like:
-// ok something like this wow, ok, do we need print this now too, or should we try hooking it up? let's print it first
-
-//only thing is, I'm not sure what they mean by start of the block, do they mean start of the track? not sure, i guess to start of events we send to plugin one more time to check this note_on\off
-// * The Events pointer points to a block of EventCount ALSA
-// * sequencer events, which is used to communicate MIDI and related
-// * events to the synth. Each event is timestamped relative to the
-// * start of the block, (mis)using the ALSA "tick time" field as a
-// * frame count. The host is responsible for ensuring that events
-// * with differing timestamps are already ordered by time.
- //FIXME msec
- /*printf("track=%02d msec=%05d ticks=%05u dtime=%05u next=%05u type=Ox%x\n",
- track->num,
- track->ticks * player->deltatime,
- track->ticks,
- event->dtime,
- track->ticks + event->dtime,
-//ok so do we still have an issue with the ticks calculation? yeah but anyway there is something weird with note generation, if i put event on_event from original code, there is something in output file, if i put our events it's silence
- event->type); */
-//{{{ mrswatson time calculation
-// case TIME_DIVISION_TYPE_TICKS_PER_BEAT: {
-// double ticksPerSecond = (double)timeDivision * getTempo() / 60.0;
-// double sampleFramesPerTick = getSampleRate() / ticksPerSecond;
-// currentTimeInSampleFrames += (long)(unpackedVariableLength * sampleFramesPerTick); //so do we need the same calculation, currentTimeinFrames? or do we need deltaframes? what are the units we need exactly? basically need timestamp in msec for each event
-// }
-//}}}
-
-/*
-
-get_events original
-int get_events(void *data, fluid_midi_event_t *event){
- read_midi_ctx_t *ctx = (read_midi_ctx_t *)data;
- fluid_player_t *player = ctx->player;
- fluid_track_t *track = ctx->track;
- snd_seq_event_t seq_event;
-
- size_t last_nframe = event_table->last_nframe;
- event_table->last_nframe = (player->deltatime * track->ticks) * 44100 / 1000; // FIXME 44100 to ctx->samplerate
- event_table->nframes_since_last = event_table->last_nframe - last_nframe;
-
-
- convert_event_format(event, &seq_event);
- print_snd_seq_event(&seq_event);
-
- read_midi_callback cb = ctx->callback;
- if(cb){
- size_t i;
- for(i = 0; i < event_table->nframes_since_last; i++){
- cb(event_table, ctx->callback_userdata);
- }
- }
-
- switch(event->type){
- case NOTE_ON:
- insert_event(event_table, &seq_event);
- break;
- case NOTE_OFF:
- delete_event(event_table, &seq_event);
- break;
- default:
- break;
- }
- printf("event table last nframe: %u\n", event_table->last_nframe);
- printf("run_synth(instancehandle, %u,\n", event_table->nframes_since_last);
- print_event_table(event_table);
- printf(", %u)\n", event_table->length);
-
-}
-*/
diff --git a/src/midi/midi_loader.h b/src/midi/midi_loader.h
index bf249aa..6793099 100644
--- a/src/midi/midi_loader.h
+++ b/src/midi/midi_loader.h
@@ -16,6 +16,8 @@ typedef struct event_table_t{
size_t length;
size_t last_nframe;
size_t nframes_since_last;
+ size_t last_tick;
+ size_t ticks_since_last;
} event_table_t;
typedef void(*read_midi_callback)(event_table_t *event_table, void *userdata);
@@ -27,6 +29,7 @@ typedef struct read_midi_ctx_t {
fluid_track_t *track;
read_midi_callback callback;
void *callback_userdata;
+ size_t sample_rate;
} read_midi_ctx_t;
@@ -41,5 +44,5 @@ typedef struct read_midi_ctx_t {
//int get_events(void *data, fluid_midi_event_t *event);
void print_snd_seq_event(snd_seq_event_t *event);
-void load_midi_file(char *filename, read_midi_callback callback, void *callback_userdata);
+void load_midi_file(char *filename, float sample_rate, read_midi_callback callback, void *callback_userdata);
#endif
diff --git a/src/midi/midi_loader.lo b/src/midi/midi_loader.lo
index f08d581..a259e49 100644
--- a/src/midi/midi_loader.lo
+++ b/src/midi/midi_loader.lo
@@ -1,5 +1,5 @@
# midi_loader.lo - a libtool object file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.11
+# Generated by libtool (GNU libtool) 2.4.2
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
diff --git a/src/midi/midi_loader.o b/src/midi/midi_loader.o
index 3f733e7..2215836 100644
--- a/src/midi/midi_loader.o
+++ b/src/midi/midi_loader.o
Binary files differ
diff --git a/src/midi/test_midi_loader b/src/midi/test_midi_loader
index 7d262cf..3d191ad 100755
--- a/src/midi/test_midi_loader
+++ b/src/midi/test_midi_loader
Binary files differ
diff --git a/src/midi/test_midi_loader.c b/src/midi/test_midi_loader.c
index 9482a19..4c39b58 100644
--- a/src/midi/test_midi_loader.c
+++ b/src/midi/test_midi_loader.c
@@ -1,5 +1,5 @@
#include "midi_loader.h"
int main(void){
char *filename = "example.mid";
- load_midi_file(filename, NULL, NULL); //do you think this will all compile? hope so
+ load_midi_file(filename, 44100, NULL, NULL); //do you think this will all compile? hope so
}
diff --git a/src/midi/test_midi_loader.o b/src/midi/test_midi_loader.o
index 72ccde7..35a11a4 100644
--- a/src/midi/test_midi_loader.o
+++ b/src/midi/test_midi_loader.o
Binary files differ