diff -Nru /tmp/jack-rack-1.4.4/configure ./configure --- /tmp/jack-rack-1.4.4/configure 2005-06-06 20:54:44.000000000 +0200 +++ ./configure 2006-06-06 17:34:53.000000000 +0200 @@ -463,7 +463,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG JACK_CFLAGS JACK_LIBS ALSA_CFLAGS ALSA_LIBS HAVE_ALSA_TRUE HAVE_ALSA_FALSE GTK_CFLAGS GTK_LIBS GNOMEUI_CFLAGS GNOMEUI_LIBS HAVE_GNOME_TRUE HAVE_GNOME_FALSE XML_CFLAGS XML_LIBS HAVE_XML_TRUE HAVE_XML_FALSE LADCCA_CFLAGS LADCCA_LIBS HAVE_LADCCA_TRUE HAVE_LADCCA_FALSE LRDF_CFLAGS LRDF_LIBS HAVE_LRDF_TRUE HAVE_LRDF_FALSE MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB JR_DESKTOP_PREFIX LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG JACK_CFLAGS JACK_LIBS ALSA_CFLAGS ALSA_LIBS HAVE_ALSA_TRUE HAVE_ALSA_FALSE GTK_CFLAGS GTK_LIBS GNOMEUI_CFLAGS GNOMEUI_LIBS HAVE_GNOME_TRUE HAVE_GNOME_FALSE XML_CFLAGS XML_LIBS HAVE_XML_TRUE HAVE_XML_FALSE LASH_CFLAGS LASH_LIBS HAVE_LASH_TRUE HAVE_LASH_FALSE LRDF_CFLAGS LRDF_LIBS HAVE_LRDF_TRUE HAVE_LRDF_FALSE MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB JR_DESKTOP_PREFIX LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -988,14 +988,14 @@ ac_env_XML_LIBS_value=$XML_LIBS ac_cv_env_XML_LIBS_set=${XML_LIBS+set} ac_cv_env_XML_LIBS_value=$XML_LIBS -ac_env_LADCCA_CFLAGS_set=${LADCCA_CFLAGS+set} -ac_env_LADCCA_CFLAGS_value=$LADCCA_CFLAGS -ac_cv_env_LADCCA_CFLAGS_set=${LADCCA_CFLAGS+set} -ac_cv_env_LADCCA_CFLAGS_value=$LADCCA_CFLAGS -ac_env_LADCCA_LIBS_set=${LADCCA_LIBS+set} -ac_env_LADCCA_LIBS_value=$LADCCA_LIBS -ac_cv_env_LADCCA_LIBS_set=${LADCCA_LIBS+set} -ac_cv_env_LADCCA_LIBS_value=$LADCCA_LIBS +ac_env_LASH_CFLAGS_set=${LASH_CFLAGS+set} +ac_env_LASH_CFLAGS_value=$LASH_CFLAGS +ac_cv_env_LASH_CFLAGS_set=${LASH_CFLAGS+set} +ac_cv_env_LASH_CFLAGS_value=$LASH_CFLAGS +ac_env_LASH_LIBS_set=${LASH_LIBS+set} +ac_env_LASH_LIBS_value=$LASH_LIBS +ac_cv_env_LASH_LIBS_set=${LASH_LIBS+set} +ac_cv_env_LASH_LIBS_value=$LASH_LIBS # # Report the --help message. @@ -1091,7 +1091,7 @@ --disable-aseq disable ALSA sequencer support --disable-gnome disable GNOME 2 support --disable-xml disable libxml2 support (this is required for saving/loading files) - --disable-ladcca disable LADCCA support + --disable-lash disable LASH support --disable-lrdf disable lrdf (XML LADSPA description) support --disable-nls do not use Native Language Support --disable-rpath do not hardcode runtime library paths @@ -1137,9 +1137,9 @@ linker flags for GNOMEUI, overriding pkg-config XML_CFLAGS C compiler flags for XML, overriding pkg-config XML_LIBS linker flags for XML, overriding pkg-config - LADCCA_CFLAGS - C compiler flags for LADCCA, overriding pkg-config - LADCCA_LIBS linker flags for LADCCA, overriding pkg-config + LASH_CFLAGS + C compiler flags for LASH, overriding pkg-config + LASH_LIBS linker flags for LASH, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -6142,7 +6142,7 @@ for cc_temp in $compiler""; do case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + compile | *[\\/]compile | lashche | *[\\/]lashche ) ;; distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; \-*) ;; *) break;; @@ -6859,7 +6859,7 @@ # Just being paranoid about ensuring that cc_basename is set. for cc_temp in $compiler""; do case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + compile | *[\\/]compile | lashche | *[\\/]lashche ) ;; distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; \-*) ;; *) break;; @@ -9880,7 +9880,7 @@ compiler_CXX=$CC for cc_temp in $compiler""; do case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + compile | *[\\/]compile | lashche | *[\\/]lashche ) ;; distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; \-*) ;; *) break;; @@ -13482,7 +13482,7 @@ compiler_F77=$CC for cc_temp in $compiler""; do case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + compile | *[\\/]compile | lashche | *[\\/]lashche ) ;; distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; \-*) ;; *) break;; @@ -13921,7 +13921,7 @@ # Just being paranoid about ensuring that cc_basename is set. for cc_temp in $compiler""; do case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + compile | *[\\/]compile | lashche | *[\\/]lashche ) ;; distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; \-*) ;; *) break;; @@ -15910,7 +15910,7 @@ compiler_GCJ=$CC for cc_temp in $compiler""; do case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + compile | *[\\/]compile | lashche | *[\\/]lashche ) ;; distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; \-*) ;; *) break;; @@ -16367,7 +16367,7 @@ # Just being paranoid about ensuring that cc_basename is set. for cc_temp in $compiler""; do case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + compile | *[\\/]compile | lashche | *[\\/]lashche ) ;; distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; \-*) ;; *) break;; @@ -19180,7 +19180,7 @@ compiler_RC=$CC for cc_temp in $compiler""; do case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + compile | *[\\/]compile | lashche | *[\\/]lashche ) ;; distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; \-*) ;; *) break;; @@ -20418,46 +20418,46 @@ ############## -### LADCCA ### +### LASH ### ############## if test x$XML_FOUND = xyes; then - jr_enable_ladcca="yes" - # Check whether --enable-ladcca or --disable-ladcca was given. -if test "${enable_ladcca+set}" = set; then - enableval="$enable_ladcca" + jr_enable_lash="yes" + # Check whether --enable-lash or --disable-lash was given. +if test "${enable_lash+set}" = set; then + enableval="$enable_lash" case "$enableval" in "yes") ;; "no") - jr_enable_ladcca="no" + jr_enable_lash="no" ;; *) - { { echo "$as_me:$LINENO: error: must use --enable-ladcca(=yes/no) or --disable-ladcca" >&5 -echo "$as_me: error: must use --enable-ladcca(=yes/no) or --disable-ladcca" >&2;} + { { echo "$as_me:$LINENO: error: must use --enable-lash(=yes/no) or --disable-lash" >&5 +echo "$as_me: error: must use --enable-lash(=yes/no) or --disable-lash" >&2;} { (exit 1); exit 1; }; } ;; esac fi; - if test "$jr_enable_ladcca" = "yes"; then + if test "$jr_enable_lash" = "yes"; then pkg_failed=no -echo "$as_me:$LINENO: checking for LADCCA_CFLAGS" >&5 -echo $ECHO_N "checking for LADCCA_CFLAGS... $ECHO_C" >&6 -if test "${pkg_cv_LADCCA_CFLAGS+set}" = set; then +echo "$as_me:$LINENO: checking for LASH_CFLAGS" >&5 +echo $ECHO_N "checking for LASH_CFLAGS... $ECHO_C" >&6 +if test "${pkg_cv_LASH_CFLAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "x$ac_cv_env_LADCCA_CFLAGS_set" = "xset"; then - pkg_cv_LADCCA_CFLAGS=$ac_cv_env_LADCCA_CFLAGS_value + if test "x$ac_cv_env_LASH_CFLAGS_set" = "xset"; then + pkg_cv_LASH_CFLAGS=$ac_cv_env_LASH_CFLAGS_value elif test -n "$PKG_CONFIG"; then - if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"ladcca-1.0 >= 0.4.0\" >/dev/null 2>&1") >&5 - ($PKG_CONFIG --exists "ladcca-1.0 >= 0.4.0" >/dev/null 2>&1) 2>&5 + if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"lash-1.0 >= 0.4.0\" >/dev/null 2>&1") >&5 + ($PKG_CONFIG --exists "lash-1.0 >= 0.4.0" >/dev/null 2>&1) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_LADCCA_CFLAGS=`$PKG_CONFIG --cflags "ladcca-1.0 >= 0.4.0" 2>/dev/null` + pkg_cv_LASH_CFLAGS=`$PKG_CONFIG --cflags "lash-1.0 >= 0.4.0" 2>/dev/null` else pkg_failed=yes fi @@ -20465,22 +20465,22 @@ pkg_failed=untried fi fi -echo "$as_me:$LINENO: result: $pkg_cv_LADCCA_CFLAGS" >&5 -echo "${ECHO_T}$pkg_cv_LADCCA_CFLAGS" >&6 -echo "$as_me:$LINENO: checking for LADCCA_LIBS" >&5 -echo $ECHO_N "checking for LADCCA_LIBS... $ECHO_C" >&6 -if test "${pkg_cv_LADCCA_LIBS+set}" = set; then +echo "$as_me:$LINENO: result: $pkg_cv_LASH_CFLAGS" >&5 +echo "${ECHO_T}$pkg_cv_LASH_CFLAGS" >&6 +echo "$as_me:$LINENO: checking for LASH_LIBS" >&5 +echo $ECHO_N "checking for LASH_LIBS... $ECHO_C" >&6 +if test "${pkg_cv_LASH_LIBS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "x$ac_cv_env_LADCCA_LIBS_set" = "xset"; then - pkg_cv_LADCCA_LIBS=$ac_cv_env_LADCCA_LIBS_value + if test "x$ac_cv_env_LASH_LIBS_set" = "xset"; then + pkg_cv_LASH_LIBS=$ac_cv_env_LASH_LIBS_value elif test -n "$PKG_CONFIG"; then - if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"ladcca-1.0 >= 0.4.0\" >/dev/null 2>&1") >&5 - ($PKG_CONFIG --exists "ladcca-1.0 >= 0.4.0" >/dev/null 2>&1) 2>&5 + if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"lash-1.0 >= 0.4.0\" >/dev/null 2>&1") >&5 + ($PKG_CONFIG --exists "lash-1.0 >= 0.4.0" >/dev/null 2>&1) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_LADCCA_LIBS=`$PKG_CONFIG --libs "ladcca-1.0 >= 0.4.0" 2>/dev/null` + pkg_cv_LASH_LIBS=`$PKG_CONFIG --libs "lash-1.0 >= 0.4.0" 2>/dev/null` else pkg_failed=yes fi @@ -20488,54 +20488,54 @@ pkg_failed=untried fi fi -echo "$as_me:$LINENO: result: $pkg_cv_LADCCA_LIBS" >&5 -echo "${ECHO_T}$pkg_cv_LADCCA_LIBS" >&6 +echo "$as_me:$LINENO: result: $pkg_cv_LASH_LIBS" >&5 +echo "${ECHO_T}$pkg_cv_LASH_LIBS" >&6 if test $pkg_failed = yes; then - LADCCA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ladcca-1.0 >= 0.4.0"` + LASH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lash-1.0 >= 0.4.0"` # Put the nasty error message in config.log where it belongs - echo "$LADCCA_PKG_ERRORS" 1>&5 + echo "$LASH_PKG_ERRORS" 1>&5 - LADCCA_FOUND="no" + LASH_FOUND="no" elif test $pkg_failed = untried; then - LADCCA_FOUND="no" + LASH_FOUND="no" else - LADCCA_CFLAGS=$pkg_cv_LADCCA_CFLAGS - LADCCA_LIBS=$pkg_cv_LADCCA_LIBS - LADCCA_FOUND="yes" + LASH_CFLAGS=$pkg_cv_LASH_CFLAGS + LASH_LIBS=$pkg_cv_LASH_LIBS + LASH_FOUND="yes" fi - if test "$LADCCA_FOUND" = "yes"; then + if test "$LASH_FOUND" = "yes"; then cat >>confdefs.h <<\_ACEOF -#define HAVE_LADCCA 1 +#define HAVE_LASH 1 _ACEOF - LADCCA_VERSION=$( pkg-config --modversion ladcca-1.0 ) + LASH_VERSION=$( pkg-config --modversion lash-1.0 ) cat >>confdefs.h <<_ACEOF -#define LADCCA_VERSION "$LADCCA_VERSION" +#define LASH_VERSION "$LASH_VERSION" _ACEOF fi else - { echo "$as_me:$LINENO: WARNING: LADCCA support is disabled" >&5 -echo "$as_me: WARNING: LADCCA support is disabled" >&2;} - LADCCA_FOUND="no" + { echo "$as_me:$LINENO: WARNING: LASH support is disabled" >&5 +echo "$as_me: WARNING: LASH support is disabled" >&2;} + LASH_FOUND="no" fi else - LADCCA_FOUND="no" + LASH_FOUND="no" fi -if test "$LADCCA_FOUND" = "yes"; then - HAVE_LADCCA_TRUE= - HAVE_LADCCA_FALSE='#' +if test "$LASH_FOUND" = "yes"; then + HAVE_LASH_TRUE= + HAVE_LASH_FALSE='#' else - HAVE_LADCCA_TRUE='#' - HAVE_LADCCA_FALSE= + HAVE_LASH_TRUE='#' + HAVE_LASH_FALSE= fi @@ -22872,10 +22872,10 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${HAVE_LADCCA_TRUE}" && test -z "${HAVE_LADCCA_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_LADCCA\" was never defined. +if test -z "${HAVE_LASH_TRUE}" && test -z "${HAVE_LASH_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_LASH\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_LADCCA\" was never defined. +echo "$as_me: error: conditional \"HAVE_LASH\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -23515,10 +23515,10 @@ s,@XML_LIBS@,$XML_LIBS,;t t s,@HAVE_XML_TRUE@,$HAVE_XML_TRUE,;t t s,@HAVE_XML_FALSE@,$HAVE_XML_FALSE,;t t -s,@LADCCA_CFLAGS@,$LADCCA_CFLAGS,;t t -s,@LADCCA_LIBS@,$LADCCA_LIBS,;t t -s,@HAVE_LADCCA_TRUE@,$HAVE_LADCCA_TRUE,;t t -s,@HAVE_LADCCA_FALSE@,$HAVE_LADCCA_FALSE,;t t +s,@LASH_CFLAGS@,$LASH_CFLAGS,;t t +s,@LASH_LIBS@,$LASH_LIBS,;t t +s,@HAVE_LASH_TRUE@,$HAVE_LASH_TRUE,;t t +s,@HAVE_LASH_FALSE@,$HAVE_LASH_FALSE,;t t s,@LRDF_CFLAGS@,$LRDF_CFLAGS,;t t s,@LRDF_LIBS@,$LRDF_LIBS,;t t s,@HAVE_LRDF_TRUE@,$HAVE_LRDF_TRUE,;t t @@ -24374,7 +24374,7 @@ ALSA support: $ALSA_FOUND XML support: $XML_FOUND LRDF support: $LRDF_FOUND - LADCCA support: $LADCCA_FOUND + LASH support: $LASH_FOUND GNOME 2 support: $GNOME_FOUND Installation prefix: $prefix @@ -24388,7 +24388,7 @@ ALSA support: $ALSA_FOUND XML support: $XML_FOUND LRDF support: $LRDF_FOUND - LADCCA support: $LADCCA_FOUND + LASH support: $LASH_FOUND GNOME 2 support: $GNOME_FOUND Installation prefix: $prefix diff -Nru /tmp/jack-rack-1.4.4/configure.ac ./configure.ac --- /tmp/jack-rack-1.4.4/configure.ac 2005-06-06 20:53:55.000000000 +0200 +++ ./configure.ac 2006-06-06 17:34:53.000000000 +0200 @@ -132,42 +132,42 @@ AM_CONDITIONAL(HAVE_XML, test "$XML_FOUND" = "yes") ############## -### LADCCA ### +### LASH ### ############## if test x$XML_FOUND = xyes; then - jr_enable_ladcca="yes" - AC_ARG_ENABLE(ladcca, - [ --disable-ladcca disable LADCCA support],[ + jr_enable_lash="yes" + AC_ARG_ENABLE(lash, + [ --disable-lash disable LASH support],[ case "$enableval" in "yes") ;; "no") - jr_enable_ladcca="no" + jr_enable_lash="no" ;; *) - AC_MSG_ERROR([must use --enable-ladcca(=yes/no) or --disable-ladcca]) + AC_MSG_ERROR([must use --enable-lash(=yes/no) or --disable-lash]) ;; esac ]) - if test "$jr_enable_ladcca" = "yes"; then - PKG_CHECK_MODULES(LADCCA, ladcca-1.0 >= 0.4.0, LADCCA_FOUND="yes", LADCCA_FOUND="no") + if test "$jr_enable_lash" = "yes"; then + PKG_CHECK_MODULES(LASH, lash-1.0 >= 0.4.0, LASH_FOUND="yes", LASH_FOUND="no") - if test "$LADCCA_FOUND" = "yes"; then - AC_DEFINE(HAVE_LADCCA, 1, [whether or not we are supporting ladcca]) - LADCCA_VERSION=$( pkg-config --modversion ladcca-1.0 ) - AC_DEFINE_UNQUOTED(LADCCA_VERSION, "$LADCCA_VERSION", [The version of ladcca we're compiling against]) - AC_SUBST(LADCCA_CFLAGS) - AC_SUBST(LADCCA_LIBS) + if test "$LASH_FOUND" = "yes"; then + AC_DEFINE(HAVE_LASH, 1, [whether or not we are supporting lash]) + LASH_VERSION=$( pkg-config --modversion lash-1.0 ) + AC_DEFINE_UNQUOTED(LASH_VERSION, "$LASH_VERSION", [The version of lash we're compiling against]) + AC_SUBST(LASH_CFLAGS) + AC_SUBST(LASH_LIBS) fi else - AC_MSG_WARN([LADCCA support is disabled]) - LADCCA_FOUND="no" + AC_MSG_WARN([LASH support is disabled]) + LASH_FOUND="no" fi else - LADCCA_FOUND="no" + LASH_FOUND="no" fi -AM_CONDITIONAL(HAVE_LADCCA, test "$LADCCA_FOUND" = "yes") +AM_CONDITIONAL(HAVE_LASH, test "$LASH_FOUND" = "yes") ############ @@ -256,7 +256,7 @@ ALSA support: $ALSA_FOUND XML support: $XML_FOUND LRDF support: $LRDF_FOUND - LADCCA support: $LADCCA_FOUND + LASH support: $LASH_FOUND GNOME 2 support: $GNOME_FOUND Installation prefix: $prefix diff -Nru /tmp/jack-rack-1.4.4/src/Makefile.am ./src/Makefile.am --- /tmp/jack-rack-1.4.4/src/Makefile.am 2003-10-21 14:32:00.000000000 +0200 +++ ./src/Makefile.am 2006-06-06 17:33:50.000000000 +0200 @@ -43,7 +43,7 @@ $(GTK_CFLAGS) \ $(GNOMEUI_CFLAGS) \ $(JACK_CFLAGS) \ - $(LADCCA_CFLAGS) \ + $(LASH_CFLAGS) \ $(LRDF_CFLAGS) \ $(ALSA_CFLAGS) \ $(XML_CFLAGS) \ @@ -61,7 +61,7 @@ $(JACK_LIBS) \ $(GTK_LIBS) \ $(GNOMEUI_LIBS) \ - $(LADCCA_LIBS) \ + $(LASH_LIBS) \ $(LRDF_LIBS) \ $(ALSA_LIBS) \ $(XML_LIBS) diff -Nru /tmp/jack-rack-1.4.4/src/Makefile.in ./src/Makefile.in --- /tmp/jack-rack-1.4.4/src/Makefile.in 2005-06-06 20:56:30.000000000 +0200 +++ ./src/Makefile.in 2006-06-06 17:33:50.000000000 +0200 @@ -131,8 +131,8 @@ HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@ HAVE_GNOME_FALSE = @HAVE_GNOME_FALSE@ HAVE_GNOME_TRUE = @HAVE_GNOME_TRUE@ -HAVE_LADCCA_FALSE = @HAVE_LADCCA_FALSE@ -HAVE_LADCCA_TRUE = @HAVE_LADCCA_TRUE@ +HAVE_LASH_FALSE = @HAVE_LASH_FALSE@ +HAVE_LASH_TRUE = @HAVE_LASH_TRUE@ HAVE_LRDF_FALSE = @HAVE_LRDF_FALSE@ HAVE_LRDF_TRUE = @HAVE_LRDF_TRUE@ HAVE_XML_FALSE = @HAVE_XML_FALSE@ @@ -146,8 +146,8 @@ JACK_CFLAGS = @JACK_CFLAGS@ JACK_LIBS = @JACK_LIBS@ JR_DESKTOP_PREFIX = @JR_DESKTOP_PREFIX@ -LADCCA_CFLAGS = @LADCCA_CFLAGS@ -LADCCA_LIBS = @LADCCA_LIBS@ +LASH_CFLAGS = @LASH_CFLAGS@ +LASH_LIBS = @LASH_LIBS@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ @@ -270,7 +270,7 @@ $(GTK_CFLAGS) \ $(GNOMEUI_CFLAGS) \ $(JACK_CFLAGS) \ - $(LADCCA_CFLAGS) \ + $(LASH_CFLAGS) \ $(LRDF_CFLAGS) \ $(ALSA_CFLAGS) \ $(XML_CFLAGS) \ @@ -287,7 +287,7 @@ $(JACK_LIBS) \ $(GTK_LIBS) \ $(GNOMEUI_LIBS) \ - $(LADCCA_LIBS) \ + $(LASH_LIBS) \ $(LRDF_LIBS) \ $(ALSA_LIBS) \ $(XML_LIBS) diff -Nru /tmp/jack-rack-1.4.4/src/ac_config.h.in ./src/ac_config.h.in --- /tmp/jack-rack-1.4.4/src/ac_config.h.in 2005-06-01 00:24:32.000000000 +0200 +++ ./src/ac_config.h.in 2006-06-06 17:33:50.000000000 +0200 @@ -40,8 +40,8 @@ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H -/* whether or not we are supporting ladcca */ -#undef HAVE_LADCCA +/* whether or not we are supporting lash */ +#undef HAVE_LASH /* "whether or not lrdf support is enabled" */ #undef HAVE_LRDF @@ -79,8 +79,8 @@ /* Where files for desktop integration will be installed */ #undef JR_DESKTOP_PREFIX -/* The version of ladcca we're compiling against */ -#undef LADCCA_VERSION +/* The version of lash we're compiling against */ +#undef LASH_VERSION /* Name of package */ #undef PACKAGE diff -Nru /tmp/jack-rack-1.4.4/src/globals.h ./src/globals.h --- /tmp/jack-rack-1.4.4/src/globals.h 2005-06-06 20:23:48.000000000 +0200 +++ ./src/globals.h 2006-06-06 17:33:50.000000000 +0200 @@ -26,9 +26,9 @@ #include "ac_config.h" -#ifdef HAVE_LADCCA - #include - extern cca_client_t * global_cca_client; +#ifdef HAVE_LASH + #include + extern lash_client_t * global_lash_client; #endif #define JACK_RACK_LOGO_FILE "jack-rack-logo.png" diff -Nru /tmp/jack-rack-1.4.4/src/jack_rack.c ./src/jack_rack.c --- /tmp/jack-rack-1.4.4/src/jack_rack.c 2003-02-19 15:38:40.000000000 +0100 +++ ./src/jack_rack.c 2006-06-06 17:33:50.000000000 +0200 @@ -29,8 +29,8 @@ #include #include -#ifdef HAVE_LADCCA -#include +#ifdef HAVE_LASH +#include #endif #include "jack_rack.h" diff -Nru /tmp/jack-rack-1.4.4/src/main.c ./src/main.c --- /tmp/jack-rack-1.4.4/src/main.c 2005-06-06 18:18:13.000000000 +0200 +++ ./src/main.c 2006-06-06 17:33:50.000000000 +0200 @@ -32,8 +32,8 @@ #include #include -#ifdef HAVE_LADCCA -#include +#ifdef HAVE_LASH +#include #endif #ifdef HAVE_GNOME @@ -57,8 +57,8 @@ GString *client_name = NULL; GString *initial_filename = NULL; -#ifdef HAVE_LADCCA -cca_client_t * global_cca_client; +#ifdef HAVE_LASH +lash_client_t * global_lash_client; #endif #define CLIENT_NAME_BASE "JACK Rack" @@ -76,8 +76,8 @@ #ifdef HAVE_ALSA printf( " ALSA %s\n", ALSA_VERSION); #endif -#ifdef HAVE_LADCCA - printf( " LADCCA %s\n", LADCCA_VERSION); +#ifdef HAVE_LASH + printf( " LASH %s\n", LASH_VERSION); #endif #ifdef HAVE_XML printf( " libxml2 %s\n", XML_VERSION); @@ -124,9 +124,9 @@ { 0, 0, 0, 0 } }; -#ifdef HAVE_LADCCA - cca_args_t * cca_args; - cca_event_t * cca_event; +#ifdef HAVE_LASH + lash_args_t * lash_args; + lash_event_t * lash_event; #endif #ifdef ENABLE_NLS @@ -147,8 +147,8 @@ } -#ifdef HAVE_LADCCA - cca_args = cca_extract_args (&argc, &argv); +#ifdef HAVE_LASH + lash_args = lash_extract_args (&argc, &argv); #endif gtk_set_locale (); @@ -226,19 +226,19 @@ } #endif /* HAVE_XML */ -#ifdef HAVE_LADCCA +#ifdef HAVE_LASH { - int flags = CCA_Config_File; - global_cca_client = cca_init (cca_args, PACKAGE_NAME, flags, CCA_PROTOCOL (2,0)); + int flags = LASH_Config_File; + global_lash_client = lash_init (lash_args, PACKAGE_NAME, flags, LASH_PROTOCOL (2,0)); } - if (global_cca_client) + if (global_lash_client) { - cca_event = cca_event_new_with_type (CCA_Client_Name); - cca_event_set_string (cca_event, client_name->str); - cca_send_event (global_cca_client, cca_event); + lash_event = lash_event_new_with_type (LASH_Client_Name); + lash_event_set_string (lash_event, client_name->str); + lash_send_event (global_lash_client, lash_event); } -#endif /* HAVE_LADCCA */ +#endif /* HAVE_LASH */ #ifdef HAVE_XML xmlSetCompressMode (XML_COMPRESSION_LEVEL); diff -Nru /tmp/jack-rack-1.4.4/src/midi.c ./src/midi.c --- /tmp/jack-rack-1.4.4/src/midi.c 2003-04-18 16:13:24.000000000 +0200 +++ ./src/midi.c 2006-06-06 17:33:50.000000000 +0200 @@ -30,8 +30,8 @@ #include #include -#ifdef HAVE_LADCCA -#include +#ifdef HAVE_LASH +#include #endif #include "midi.h" @@ -66,10 +66,10 @@ - /* tell ladcca our client id */ -#ifdef HAVE_LADCCA - cca_alsa_client_id (global_cca_client, snd_seq_client_id (seq)); -#endif /* HAVE_LADCCA */ + /* tell lash our client id */ +#ifdef HAVE_LASH + lash_alsa_client_id (global_lash_client, snd_seq_client_id (seq)); +#endif /* HAVE_LASH */ /* set our client name */ snd_seq_set_client_name (seq, client_name->str); diff -Nru /tmp/jack-rack-1.4.4/src/process.c ./src/process.c --- /tmp/jack-rack-1.4.4/src/process.c 2003-10-24 17:35:21.000000000 +0200 +++ ./src/process.c 2006-06-06 17:33:50.000000000 +0200 @@ -597,9 +597,9 @@ jack_activate (procinfo->jack_client); -#ifdef HAVE_LADCCA - /* sort out ladcca stuff */ - cca_jack_client_name (global_cca_client, jack_client_name); +#ifdef HAVE_LASH + /* sort out lash stuff */ + lash_jack_client_name (global_lash_client, jack_client_name); #endif return procinfo; diff -Nru /tmp/jack-rack-1.4.4/src/ui.c ./src/ui.c --- /tmp/jack-rack-1.4.4/src/ui.c 2005-06-06 20:29:58.000000000 +0200 +++ ./src/ui.c 2006-06-06 17:33:50.000000000 +0200 @@ -31,8 +31,8 @@ #include #include -#ifdef HAVE_LADCCA -#include +#ifdef HAVE_LASH +#include #endif #include "ui.h" @@ -121,20 +121,20 @@ G_CALLBACK (save_as_cb), ui); #endif /* HAVE_XML */ -#ifdef HAVE_LADCCA - if (cca_enabled (global_cca_client)) +#ifdef HAVE_LASH + if (lash_enabled (global_lash_client)) { separator = gtk_separator_menu_item_new (); gtk_widget_show (separator); gtk_menu_shell_append (GTK_MENU_SHELL (file_menu), separator); - ui->cca_save_menu_item = gtk_menu_item_new_with_label (_("Save project")); - gtk_widget_show (ui->cca_save_menu_item); - gtk_menu_shell_append (GTK_MENU_SHELL (file_menu), ui->cca_save_menu_item); - g_signal_connect (G_OBJECT (ui->cca_save_menu_item), "activate", - G_CALLBACK (cca_save_cb), ui); + ui->lash_save_menu_item = gtk_menu_item_new_with_label (_("Save project")); + gtk_widget_show (ui->lash_save_menu_item); + gtk_menu_shell_append (GTK_MENU_SHELL (file_menu), ui->lash_save_menu_item); + g_signal_connect (G_OBJECT (ui->lash_save_menu_item), "activate", + G_CALLBACK (lash_save_cb), ui); } -#endif /* HAVE_LADCCA */ +#endif /* HAVE_LASH */ separator = gtk_separator_menu_item_new (); gtk_widget_show (separator); @@ -299,18 +299,18 @@ NULL, G_CALLBACK (save_as_cb), ui, -1); #endif /* HAVE_XML */ -#ifdef HAVE_LADCCA - if (cca_enabled (global_cca_client)) +#ifdef HAVE_LASH + if (lash_enabled (global_lash_client)) { gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); - ui->cca_save = gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar), + ui->lash_save = gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar), GTK_STOCK_SAVE, - _("Save the LADCCA project"), - NULL, G_CALLBACK (cca_save_cb), ui, -1); + _("Save the LASH project"), + NULL, G_CALLBACK (lash_save_cb), ui, -1); } -#endif /* HAVE_LADCCA */ +#endif /* HAVE_LASH */ gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); gtk_toolbar_insert_stock (GTK_TOOLBAR (toolbar), @@ -425,9 +425,9 @@ ui->state = STATE_NORMAL; ui->main_window = NULL; -#ifdef HAVE_LADCCA - ui->cca_save = NULL; - ui->cca_save_menu_item = NULL; +#ifdef HAVE_LASH + ui->lash_save = NULL; + ui->lash_save_menu_item = NULL; #endif ui->ui_to_process = lff_new (PROCESS_FIFO_SIZE, sizeof (ctrlmsg_t)); diff -Nru /tmp/jack-rack-1.4.4/src/ui.h ./src/ui.h --- /tmp/jack-rack-1.4.4/src/ui.h 2005-06-06 20:21:47.000000000 +0200 +++ ./src/ui.h 2006-06-06 17:33:50.000000000 +0200 @@ -85,9 +85,9 @@ GtkWidget * open; #endif -#ifdef HAVE_LADCCA - GtkWidget * cca_save; - GtkWidget * cca_save_menu_item; +#ifdef HAVE_LASH + GtkWidget * lash_save; + GtkWidget * lash_save_menu_item; #endif GtkWidget * splash_screen; diff -Nru /tmp/jack-rack-1.4.4/src/ui_callbacks.c ./src/ui_callbacks.c --- /tmp/jack-rack-1.4.4/src/ui_callbacks.c 2003-10-24 17:35:21.000000000 +0200 +++ ./src/ui_callbacks.c 2006-06-06 17:33:50.000000000 +0200 @@ -30,8 +30,8 @@ #include #include -#ifdef HAVE_LADCCA -#include +#ifdef HAVE_LASH +#include #endif #ifdef HAVE_GNOME @@ -213,16 +213,16 @@ } #endif /* HAVE_XML */ -#ifdef HAVE_LADCCA +#ifdef HAVE_LASH void -cca_save_cb (GtkButton * button, gpointer user_data) +lash_save_cb (GtkButton * button, gpointer user_data) { - cca_event_t * event; + lash_event_t * event; - event = cca_event_new_with_type (CCA_Save); - cca_send_event (global_cca_client, event); + event = lash_event_new_with_type (LASH_Save); + lash_send_event (global_lash_client, event); } -#endif /* HAVE_LADCCA */ +#endif /* HAVE_LASH */ void @@ -238,6 +238,7 @@ if (ui->shutdown) { gtk_main_quit (); + process_info_destroy(ui->procinfo); return; } @@ -329,50 +330,50 @@ return FALSE; } -#ifdef HAVE_LADCCA +#ifdef HAVE_LASH static int -cca_idle (ui_t * ui, cca_client_t * client) +lash_idle (ui_t * ui, lash_client_t * client) { - cca_event_t * event; + lash_event_t * event; - while ( (event = cca_get_event (client)) ) + while ( (event = lash_get_event (client)) ) { - switch (cca_event_get_type (event)) + switch (lash_event_get_type (event)) { - case CCA_Save_File: - ui_save_file (ui, cca_get_fqn (cca_event_get_string (event), "jack_rack.rack")); - cca_send_event (global_cca_client, event); + case LASH_Save_File: + ui_save_file (ui, lash_get_fqn (lash_event_get_string (event), "jack_rack.rack")); + lash_send_event (global_lash_client, event); break; - case CCA_Restore_File: - ui_open_file (ui, cca_get_fqn (cca_event_get_string (event), "jack_rack.rack")); - cca_send_event (global_cca_client, event); + case LASH_Restore_File: + ui_open_file (ui, lash_get_fqn (lash_event_get_string (event), "jack_rack.rack")); + lash_send_event (global_lash_client, event); break; - case CCA_Quit: + case LASH_Quit: quit_cb (NULL, ui); - cca_event_destroy (event); + lash_event_destroy (event); break; - case CCA_Server_Lost: + case LASH_Server_Lost: printf ("server lost\n"); - printf (_("LADCCA server disconnected\n")); - gtk_widget_set_sensitive (ui->cca_save, FALSE); - gtk_widget_set_sensitive (ui->cca_save_menu_item, FALSE); - cca_event_destroy (event); + printf (_("LASH server disconnected\n")); + gtk_widget_set_sensitive (ui->lash_save, FALSE); + gtk_widget_set_sensitive (ui->lash_save_menu_item, FALSE); + lash_event_destroy (event); return 0; break; default: - fprintf (stderr, "Recieved LADCCA event of unknown type %d\n", cca_event_get_type (event)); - cca_event_destroy (event); + fprintf (stderr, "Recieved LASH event of unknown type %d\n", lash_event_get_type (event)); + lash_event_destroy (event); break; } } - if (!cca_enabled (client)) + if (!lash_enabled (client)) return 0; return 1; } -#endif /* HAVE_LADCCA */ +#endif /* HAVE_LASH */ #ifdef HAVE_ALSA @@ -495,9 +496,9 @@ ui_t * ui; jack_rack_t * jack_rack; gboolean enabled; -#ifdef HAVE_LADCCA - static int call_cca_idle = 1; -#endif /* HAVE_LADCCA */ +#ifdef HAVE_LASH + static int call_lash_idle = 1; +#endif /* HAVE_LASH */ ui = (ui_t *) data; jack_rack = ui->jack_rack; @@ -557,14 +558,15 @@ case CTRLMSG_QUIT: gtk_main_quit (); + process_info_destroy(ui->procinfo); break; } } -#ifdef HAVE_LADCCA - if (call_cca_idle) - call_cca_idle = cca_idle (ui, global_cca_client); +#ifdef HAVE_LASH + if (call_lash_idle) + call_lash_idle = lash_idle (ui, global_lash_client); #endif usleep (1000); diff -Nru /tmp/jack-rack-1.4.4/src/ui_callbacks.h ./src/ui_callbacks.h --- /tmp/jack-rack-1.4.4/src/ui_callbacks.h 2003-04-18 16:13:24.000000000 +0200 +++ ./src/ui_callbacks.h 2006-06-06 17:33:50.000000000 +0200 @@ -37,8 +37,8 @@ void save_as_cb (GtkButton * button, gpointer user_data); #endif -#ifdef HAVE_LADCCA -void cca_save_cb (GtkButton * button, gpointer user_data); +#ifdef HAVE_LASH +void lash_save_cb (GtkButton * button, gpointer user_data); #endif #ifdef HAVE_GNOME