Changeset 1729:49fc00705baf in roaraudio for plugins/ao

Timestamp:

05/17/09 01:23:53 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

use pkg-config for libao plugin

Location:

plugins/ao

Files:

• Makefile (modified) (1 diff)
• configure (modified) (5 diffs)

plugins/ao/Makefile

@@ -6 +6 @@
 
 #DEFINES=-DDEBUG
-CFLAGS += -g -Wall -O2 -I../../include $(DEFINES) $(INCLUDE) $(INCPATH) $(SHARED_CF) $(fPIC) $(GTK_CFLAFS) $(XMMS_CFLAGS)
-LDFLAGS = -g $(SHARED) $(LDPATH) -L../../lib -lroar $(GTK_LIBS) $(XMMS_LIBS)
+CFLAGS += -g -Wall -O2 -I../../include $(DEFINES) $(INCLUDE) $(INCPATH) $(SHARED_CF) $(fPIC) $(AO_CFLAGS)
+LDFLAGS = -g $(SHARED) $(LDPATH) -L../../lib -lroar $(AO_LIBS)
 
 all: ${TARGET}

plugins/ao/configure

@@ -12 +12 @@
    shift;
   ;;
+  --pkg-config)
+   PKG_CONFIG="$2"
+   shift;
+  ;;
   --force-have-roar)
    HAVE_ROAR=true
@@ -20 +24 @@
 
 Options:
-  --help         - Show this help
-  --inst-dir DIR - Install dir
+  --help               - Show this help
+  --inst-dir DIR       - Install dir
+  --force-have-roar    - Force to assume libroar is ok
+  --pkg-config PKGCONF - Set filename for pkg-config
 EOF
     exit 0
@@ -47 +53 @@
 fi
 
+echo -n "checking for pkg-config... "
+if [ "$PKG_CONFIG" = '' ]
+then
+ PKG_CONFIG=$(which pkg-config false 2> /dev/null | grep ^/ | head -n 1)
+ if $PKG_CONFIG --help > /dev/null 2> /dev/null
+ then
+  echo $PKG_CONFIG
+ else
+  PKG_CONFIG=''
+  echo no
+  on_error;
+ fi
+else
+  echo $PKG_CONFIG '(forced)'
+fi
+
 echo -n 'testing for libao... '
 cat > tests.c << EOF
@@ -54 +76 @@
 EOF
 
-$CC -lao -o tests tests.c 2> /dev/null
+if [ "$PKG_CONFIG" = '' ]
+then
+ AO_LIBS=''
+ AO_CFLAGS=''
+else
+ AO_LIBS=`pkg-config --libs ao`
+ AO_CFLAGS=`pkg-config --cflags ao`
+fi
+if [ "$AO_LIBS" = '' -a "$AO_CFLAGS" = '' ]
+then
+ AO_LIBS='-lao'
+ AO_CFLAGS=''
+fi
+
+$CC $AO_LIBS $AO_CFLAGS -o tests tests.c 2> /dev/null
 ./tests 2> /dev/null
 
@@ -92 +128 @@
  echo "CC=$CC"
  echo "INSTALL_DIR=$INSTALL_DIR"
+ echo
+ echo "AO_CFLAGS=$AO_CFLAGS"
+ echo "AO_LIBS=$AO_LIBS"
 } > Makefile.conf