From 0c142d8d1e50d04940c81a619c6b2992a44ec68d Mon Sep 17 00:00:00 2001
From: Angel Ortega <angel@triptico.com>
Date: Wed, 9 Feb 2011 12:23:31 +0100
Subject: [PATCH] Print the configured drivers in config and help.

---
 config.sh | 12 ++++++++++++
 main.c    |  7 ++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/config.sh b/config.sh
index 4c24584..d590ab5 100755
--- a/config.sh
+++ b/config.sh
@@ -100,6 +100,8 @@ cat VERSION >> config.h
 # add installation prefix
 echo "#define CONFOPT_PREFIX \"$PREFIX\"" >> config.h
 
+DRIVERS="wav"
+
 #########################################################
 
 # configuration directives
@@ -123,6 +125,7 @@ else
 		WITHOUT_UNIX_GLOB=1
         WITH_WIN32=1
         echo $TMP_LDFLAGS >> config.ldflags
+        DRIVERS="win32 ${DRIVERS}"
 	else
 		echo "No"
 	fi
@@ -140,6 +143,7 @@ $CC .tmp.c -o .tmp.o 2> /dev/null
 if [ $? = 0 ] ; then
 	echo "#define CONFOPT_LINUX_OSS 1" >> config.h
 	echo "OK"
+    DRIVERS="oss ${DRIVERS}"
 else
 	echo "No"
 fi
@@ -154,6 +158,7 @@ if [ $? = 0 ] ; then
 	echo "#define CONFOPT_SGI 1" >> config.h
 	echo "-laudio" >> config.ldflags
 	echo "OK"
+    DRIVERS="sgi ${DRIVERS}"
 else
 	echo "No"
 fi
@@ -168,6 +173,7 @@ if [ $? = 0 ] ; then
 	echo "#define CONFOPT_ESD 1" >> config.h
 	echo "-lesd" >> config.ldflags
 	echo "OK"
+    DRIVERS="esd ${DRIVERS}"
 else
 	echo "No"
 fi
@@ -186,6 +192,7 @@ if [ $? = 0 ] ; then
 	echo $TMP_CFLAGS >> config.cflags
 	echo $TMP_LDFLAGS >> config.ldflags
 	echo "OK"
+    DRIVERS="arts ${DRIVERS}"
 else
 	echo "No"
 fi
@@ -205,6 +212,7 @@ if [ $? = 0 ] ; then
 	echo $TMP_CFLAGS >> config.cflags
 	echo $TMP_LDFLAGS >> config.ldflags
 	echo "OK"
+    DRIVERS="pulse ${DRIVERS}"
 else
 	echo "No"
 fi
@@ -314,6 +322,10 @@ echo >> makefile.opts
 
 cat makefile.opts makefile.in makefile.depend > Makefile
 
+echo "#define CONFOPT_DRIVERS \"${DRIVERS}\"" >> config.h
+echo
+echo "Configured drivers: ${DRIVERS}"
+
 #########################################################
 
 # cleanup
diff --git a/main.c b/main.c
index 179a0c0..27f6eea 100644
--- a/main.c
+++ b/main.c
@@ -1,7 +1,7 @@
 /*
 
     Ann Hell Ex Machina - Music Software
-    Copyright (C) 2003/2008 Angel Ortega <angel@triptico.com>
+    Copyright (C) 2003/2011 Angel Ortega <angel@triptico.com>
 
     main.c - Miscellaneous functions and startup
 
@@ -54,12 +54,12 @@ static void read_config(void)
 static int main_usage(void)
 {
     printf("Ann Hell Ex Machina %s - Music Writing Software\n", VERSION);
-    printf("Copyright (C) 2003-2008 Angel Ortega <angel@triptico.com>\n");
+    printf("Copyright (C) 2003-2011 Angel Ortega <angel@triptico.com>\n");
     printf("This software is covered by the GPL license. NO WARRANTY.\n\n");
     printf("Usage: ahxm [options] {script.ahs}\n\n");
     printf("Options:\n\n");
     printf("-o {output file or device} Set output file [default: driver dependent].\n");
-    printf("-d {driver}                Output driver [default: 'default'].\n");
+    printf("-d {driver}                Output driver [default: 'default'] (see below).\n");
     printf("-L {path}                  Add path to script / data library search path.\n");
     printf("-r {sampling rate}         Set sampling rate [default: %d]\n",
            ss_frequency);
@@ -90,6 +90,7 @@ static int main_usage(void)
     printf("Library path: ");
     libpath_print();
     printf("\n");
+    printf("Configured drivers: %s\n", CONFOPT_DRIVERS);
 
     return 1;
 }
-- 
2.11.4.GIT