[Antiright-devel] antiright ./configure src/system.antiright

[Jeffrey Bedard]

CVSROOT:        /cvsroot/antiright
Module name:    antiright
Branch:         
Changes by:     Jeffrey Bedard <address@hidden> 04/08/31 01:20:35

Modified files:
        .              : configure 
        src            : system.antiright 

Log message:
        Rewrote test for libcdaudio-config.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/configure.diff?tr1=1.42&tr2=1.43&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/antiright/antiright/src/system.antiright.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: antiright/configure
diff -u antiright/configure:1.42 antiright/configure:1.43
--- antiright/configure:1.42    Mon Aug 30 00:03:11 2004
+++ antiright/configure Tue Aug 31 01:20:34 2004
@@ -24,7 +24,7 @@
 #
 ###############################################################################
 
-VERSION=2.2
+VERSION=2.2.1
 DEFS="$DEFS -DPACKAGE_STRING='\"AntiRight_$VERSION\"'"
 
 ICONDIR=/usr/X11R6/include/X11/bitmaps/antiright
@@ -68,11 +68,16 @@
 fi
 
 # Use libcdaudio, if available.  
-if [ "$(which libcdaudio-config)" != "" ]; then
-    LIBS="$LIBS $(libcdaudio-config --libs)"
-    INCLUDE="$INCLUDE $(libcdaudio-config --cflags)"
-    DEFS="$DEFS -DHAVE_LIBCDAUDIO"
-fi
+paths="/usr/local/bin /usr/bin/libcdaudio-config /usr/pkg/bin"
+for path in $paths
+do
+  if [ -f $path/libcdaudio-config ]; then
+      LIBS="$LIBS $($path/libcdaudio-config --libs)"
+      INCLUDE="$INCLUDE $($path/libcdaudio-config --cflags)"
+      DEFS="$DEFS -DHAVE_LIBCDAUDIO"
+      break
+  fi
+done
 
 if [ ! -f /usr/X11R6/include/Xm/XpmP.h ]; then
     LIBS="$LIBS -lXpm"
Index: antiright/src/system.antiright
diff -u antiright/src/system.antiright:1.2 antiright/src/system.antiright:1.3
--- antiright/src/system.antiright:1.2  Mon Aug  9 22:45:02 2004
+++ antiright/src/system.antiright      Tue Aug 31 01:20:35 2004
@@ -108,3 +108,4 @@
 cdrom:/dev/cdrom
 
 # Customizations
+