Changeset 1704:7005f6725af7 in roaraudio

Timestamp:

05/14/09 14:08:52 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

include Audacious in main configure

File:

• configure (modified) (9 diffs)

configure

@@ -49 +49 @@
 AO_INST_DIR=''
 XMMS_INST_DIR=''
+AUDACIOUS_INST_DIR=''
 
 SNDIO_EMUL=true
@@ -54 +55 @@
 LIBAO=true
 XMMS=true
+AUDACIOUS=true
 
 DEFAULT_RATE=''
@@ -138 +140 @@
    echo '--ao-install-dir DIR        - Set install dir for libao plugin'
    echo '--xmms-install-dir DIR      - Set install dir for XMMS plugin'
+   echo '--audacious-install-dir DIR - Set install dir for Audacious plugin'
    echo
    echo '--prefix DIR                - Set general prefix (default: '"$PREFIX"')'
@@ -171 +174 @@
    echo '--without-libao             - Disable build of libao plugin'
    echo '--without-xmms              - Disable build of XMMS plugin'
+   echo '--without-audacious         - Disable build of Audacious plugin'
    echo
    echo '--mmcu MMCU                 - Sets -mmcu compiler/linker option'
@@ -230 +234 @@
    shift;
   ;;
+  '--audacious-install-dir')
+   AUDACIOUS_INST_DIR="$2"
+   shift;
+  ;;
   '--default-rate')
    DEFAULT_RATE="$2"
@@ -288 +296 @@
   '--without-xmms')
    XMMS=false
+  ;;
+  '--without-audacious')
+   AUDACIOUS=false
   ;;
   '--minimal')
@@ -293 +304 @@
    RUNTIME_DETECT=false
    XMMS=false
+   AUDACIOUS=false
    LIBAO=false
    PROXY=false
@@ -350 +362 @@
    PROXY=false
    XMMS=false
+   AUDACIOUS=false
    WITHOUT_VIO="$WITHOUT_VIO"' pipe' # hope that with buffered pipes we can remove this soon
   ;;
@@ -1376 +1389 @@
 then
  echo 'running xmms plugin configure...'
-  cd xmms/
- if [ "$XMMS_INST_DIR" = '' ]
- then
-  ./configure --force-have-roar --pkg-config "$PKG_CONFIG"
- else
+ cd xmms/
   ./configure --force-have-roar --pkg-config "$PKG_CONFIG" --inst-dir "$XMMS_INST_DIR"
- fi
  cd ..
 else
  echo "running xmms plugin configure... disabled by user"
+fi
+
+if $AUDACIOUS
+then
+ echo 'running Audacious plugin configure...'
+ cd audacious/
+  ./configure --force-have-roar --pkg-config "$PKG_CONFIG" --inst-dir "$AUDACIOUS_INST_DIR"
+ cd ..
+else
+ echo "running Audacious plugin configure... disabled by user"
 fi