Changeset 1695:8edface8b1cf in roaraudio

Timestamp:

05/14/09 01:46:38 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

check for version, use $PKG_CONFIG

File:

• plugins/audacious/configure (modified) (4 diffs)

plugins/audacious/configure

@@ -51 +51 @@
  PKG_CONFIG=''
  echo no
+ on_error;
 fi
 
@@ -57 +58 @@
 if [ "$PKG_CONFIG" != '' ]
 then
- GTK_LIBS=`pkg-config  gtk+-2.0 --libs 2> /dev/null`
- GTK_CFLAFS=`pkg-config --cflags gtk+-2.0 2> /dev/null`
+ GTK_LIBS=`$PKG_CONFIG  gtk+-2.0 --libs 2> /dev/null`
+ GTK_CFLAFS=`$PKG_CONFIG --cflags gtk+-2.0 2> /dev/null`
 else
  GTK_LIBS=`gtk-config gtk+-2.0 --libs 2> /dev/null`
@@ -72 +73 @@
 fi
 
+echo -n 'testing for audacious version... '
+if $PKG_CONFIG --atleast-version=1.5.1 audacious 2> /dev/null
+then
+ echo '>= 1.5.1'
+else
+ echo 'too old'
+ on_error;
+fi
+
 echo -n 'testing for audacious... '
-XMMS_LIBS=`pkg-config audacious  --libs 2> /dev/null`
-XMMS_CFLAGS=`pkg-config audacious  --cflags 2> /dev/null`
+XMMS_LIBS=`$PKG_CONFIG audacious  --libs 2> /dev/null`
+XMMS_CFLAGS=`$PKG_CONFIG audacious  --cflags 2> /dev/null`
 
 if [ "$XMMS_LIBS" = '' -a "$XMMS_CFLAGS" = '' ]
@@ -87 +97 @@
 if [ "$INSTALL_DIR" = '' ]
 then
- INSTALL_DIR="`pkg-config --variable=output_plugin_dir audacious 2> /dev/null`"
+ INSTALL_DIR="`$PKG_CONFIG --variable=output_plugin_dir audacious 2> /dev/null`"
 
  if [ "$INSTALL_DIR" = '' ]