Changeset 236 for trunk

Show
Ignore:
Timestamp:
02/24/08 16:25:24 (4 years ago)
Author:
ath
Message:

Add FmEffectRubber?.

Location:
trunk
Files:
7 added
7 modified

Legend:

Unmodified
Added
Removed

  • trunk/configure

    r234 r236  
    21392139 
    21402140# Make our submodules happy, as we haven't installed RGC yet 
    2141 RGC_SRC_DIR="$(pwd)/$srcdir/rgc/include" 
    2142 RGC_LIB_DIR="$(pwd)/rgc/src" 
    2143 RUBBER_SRC_DIR="$(pwd)/$srcdir/rubberband/rubberband" 
    2144 RUBBER_LIB_DIR="$(pwd)/rubberband/lib" 
    2145 export RGC_SERVER_CFLAGS="-I"$RGC_SRC_DIR 
    2146 export RGC_SERVER_LIBS="-L$RGC_LIB_DIR -lrgc_server" 
    2147 export RGC_CLIENT_CFLAGS="-I"$RGC_SRC_DIR 
    2148 export RGC_CLIENT_LIBS="-L$RGC_LIB_DIR -lrgc_client" 
    2149 export RUBBERBAND_CFLAGS="-I"$RUBBER_SRC_DIR 
    2150 export RUBBERBAND_LIBS="-L$RUBBER_LIB_DIR -lrubberband" 
     2141RGC_SRC_DIR="$(pwd)/$srcdir/rgc" 
     2142RGC_LIB_DIR="$(pwd)/rgc" 
     2143export RGC_SERVER_CFLAGS="-I$RGC_SRC_DIR/include" 
     2144export RGC_SERVER_LIBS="-L$RGC_LIB_DIR/src -lrgc_server" 
     2145export RGC_CLIENT_CFLAGS="-I$RGC_SRC_DIR/include" 
     2146export RGC_CLIENT_LIBS="-L$RGC_LIB_DIR/src -lrgc_client" 
    21512147 
    21522148subdirs="$subdirs rubberband" 
    21532149 
     2150 
     2151RUBBER_SRC_DIR="$(pwd)/$srcdir/rubberband" 
     2152RUBBER_LIB_DIR="$(pwd)/rubberband" 
     2153export RUBBERBAND_CFLAGS="-I$RUBBER_SRC_DIR/include" 
     2154export RUBBERBAND_LIBS="-L$RUBBER_LIB_DIR/src -lrubberband -lfftw3" 
    21542155 
    21552156subdirs="$subdirs fm_server" 
    … …  
    33743375fi 
    33753376 
    3376  
    3377  
    3378 echo "*****************************" 
    3379 echo srcdir $srcdir 
    3380 echo ac_top_srcdir $ac_top_srcdir 
    3381 echo ac_top_build_prefix $ac_top_srcdir 
    3382 echo ac_srcdir $ac_top_srcdir 
    3383 echo "*****************************" 
    3384  

  • trunk/configure.ac

    r234 r236  
    99 
    1010# Make our submodules happy, as we haven't installed RGC yet 
    11 RGC_SRC_DIR="$(pwd)/$srcdir/rgc/include" 
    12 RGC_LIB_DIR="$(pwd)/rgc/src" 
    13 RUBBER_SRC_DIR="$(pwd)/$srcdir/rubberband/rubberband" 
    14 RUBBER_LIB_DIR="$(pwd)/rubberband/lib" 
    15 export RGC_SERVER_CFLAGS="-I"$RGC_SRC_DIR 
    16 export RGC_SERVER_LIBS="-L$RGC_LIB_DIR -lrgc_server" 
    17 export RGC_CLIENT_CFLAGS="-I"$RGC_SRC_DIR 
    18 export RGC_CLIENT_LIBS="-L$RGC_LIB_DIR -lrgc_client" 
    19 export RUBBERBAND_CFLAGS="-I"$RUBBER_SRC_DIR 
    20 export RUBBERBAND_LIBS="-L$RUBBER_LIB_DIR -lrubberband" 
     11RGC_SRC_DIR="$(pwd)/$srcdir/rgc" 
     12RGC_LIB_DIR="$(pwd)/rgc" 
     13export RGC_SERVER_CFLAGS="-I$RGC_SRC_DIR/include" 
     14export RGC_SERVER_LIBS="-L$RGC_LIB_DIR/src -lrgc_server" 
     15export RGC_CLIENT_CFLAGS="-I$RGC_SRC_DIR/include" 
     16export RGC_CLIENT_LIBS="-L$RGC_LIB_DIR/src -lrgc_client" 
    2117 
    2218AC_CONFIG_SUBDIRS([rubberband]) 
     19 
     20RUBBER_SRC_DIR="$(pwd)/$srcdir/rubberband" 
     21RUBBER_LIB_DIR="$(pwd)/rubberband" 
     22export RUBBERBAND_CFLAGS="-I$RUBBER_SRC_DIR/include" 
     23export RUBBERBAND_LIBS="-L$RUBBER_LIB_DIR/src -lrubberband -lfftw3" 
    2324 
    2425AC_CONFIG_SUBDIRS([fm_server]) 
    … …  
    3031AC_CONFIG_FILES([Makefile]) 
    3132AC_OUTPUT 
    32  
    33  
    34 echo "*****************************" 
    35 echo srcdir $srcdir 
    36 echo ac_top_srcdir $ac_top_srcdir 
    37 echo ac_top_build_prefix $ac_top_srcdir 
    38 echo ac_srcdir $ac_top_srcdir 
    39 echo "*****************************" 
    40  

  • trunk/fm_server/configure

    r234 r236  
    2498524985    else 
    2498624986        if test -n "$PKG_CONFIG" && \ 
    24987     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"rubberband\"") >&5 
    24988   ($PKG_CONFIG --exists --print-errors "rubberband") 2>&5 
     24987    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"rubberband fftw3 samplerate\"") >&5 
     24988  ($PKG_CONFIG --exists --print-errors "rubberband fftw3 samplerate") 2>&5 
    2498924989  ac_status=$? 
    2499024990  echo "$as_me:$LINENO: \$? = $ac_status" >&5 
    2499124991  (exit $ac_status); }; then 
    24992   pkg_cv_RUBBERBAND_CFLAGS=`$PKG_CONFIG --cflags "rubberband" 2>/dev/null` 
     24992  pkg_cv_RUBBERBAND_CFLAGS=`$PKG_CONFIG --cflags "rubberband fftw3 samplerate" 2>/dev/null` 
    2499324993else 
    2499424994  pkg_failed=yes 
    … …  
    2500325003    else 
    2500425004        if test -n "$PKG_CONFIG" && \ 
    25005     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"rubberband\"") >&5 
    25006   ($PKG_CONFIG --exists --print-errors "rubberband") 2>&5 
     25005    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"rubberband fftw3 samplerate\"") >&5 
     25006  ($PKG_CONFIG --exists --print-errors "rubberband fftw3 samplerate") 2>&5 
    2500725007  ac_status=$? 
    2500825008  echo "$as_me:$LINENO: \$? = $ac_status" >&5 
    2500925009  (exit $ac_status); }; then 
    25010   pkg_cv_RUBBERBAND_LIBS=`$PKG_CONFIG --libs "rubberband" 2>/dev/null` 
     25010  pkg_cv_RUBBERBAND_LIBS=`$PKG_CONFIG --libs "rubberband fftw3 samplerate" 2>/dev/null` 
    2501125011else 
    2501225012  pkg_failed=yes 
    … …  
    2502725027fi 
    2502825028        if test $_pkg_short_errors_supported = yes; then 
    25029                 RUBBERBAND_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "rubberband"` 
     25029                RUBBERBAND_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "rubberband fftw3 samplerate"` 
    2503025030        else 
    25031                 RUBBERBAND_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "rubberband"` 
     25031                RUBBERBAND_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "rubberband fftw3 samplerate"` 
    2503225032        fi 
    2503325033        # Put the nasty error message in config.log where it belongs 
    2503425034        echo "$RUBBERBAND_PKG_ERRORS" >&5 
    2503525035 
    25036         { { echo "$as_me:$LINENO: error: Package requirements (rubberband) were not met: 
     25036        { { echo "$as_me:$LINENO: error: Package requirements (rubberband fftw3 samplerate) were not met: 
    2503725037 
    2503825038$RUBBERBAND_PKG_ERRORS 
    … …  
    2504525045See the pkg-config man page for more details. 
    2504625046" >&5 
    25047 echo "$as_me: error: Package requirements (rubberband) were not met: 
     25047echo "$as_me: error: Package requirements (rubberband fftw3 samplerate) were not met: 
    2504825048 
    2504925049$RUBBERBAND_PKG_ERRORS 

  • trunk/fm_server/configure.ac

    r234 r236  
    6666AC_SUBST(SAMPLERATE_CFLAGS) 
    6767 
    68 PKG_CHECK_MODULES(RUBBERBAND, rubberband) 
     68PKG_CHECK_MODULES(RUBBERBAND, rubberband fftw3 samplerate) 
    6969AC_SUBST(RUBBERBAND_LIBS) 
    7070AC_SUBST(RUBBERBAND_CFLAGS) 

  • trunk/rubberband/configure

    r235 r236  
    2222122221fi 
    2222222222 
    22223  

  • trunk/rubberband/configure.ac

    r235 r236  
    4141                 src/Makefile]) 
    4242AC_OUTPUT 
    43  

  • trunk/rubberband/rubberband.pc.in

    r235 r236  
    77Version: 1.0 
    88Description:  
     9Requires: fftw3, samplerate 
    910Libs: -L@libdir@ -lrubberband 
    1011Cflags: -I@includedir@