--- build.sh.orig	Wed Nov 26 08:51:23 2003
+++ build.sh	Wed Jan 28 23:02:19 2004
@@ -24,6 +24,42 @@
 
 if [ "$database" = p ]; then
     echo You have selected PostgreSQL as database
+    # see if we can find pg_config to grab the build options
+    # N.B. we can't determine pglibs from pg_config so this is still hardcoded.
+    for i in /usr/local/pgsql/bin /usr/local/postgres/bin /opt/pgsql/bin /usr/local/bin /usr/local/sbin /usr/bin /usr/sbin;
+        do
+        if [ -x $i/pg_config ]; then
+            version=`$i/pg_config --version|awk '{print $2}'`
+            if [ -n "$pg_config" ]; then
+                # we've found more than one 
+                if [ -n "$pg_configs" ]; then
+                    pg_configs="$version:$i/pg_config $pg_configs"
+                else
+                    pg_configs="$version:$i/pg_config $pg_config"
+                fi
+            fi    
+            pg_config="$version:$i/pg_config"
+        fi
+    done
+    if [ -n "$pg_configs" ]; then
+        # sort the list
+        pg_configs=`echo $pg_configs|tr ' ' '\n' | sort `
+        echo Found multiple versions of pg_config:
+        echo $pg_configs|tr ' ' '\n'|sed -e 's/^/PostgreSQL /'
+        pg_config=`echo $pg_configs|tr ' ' '\n'|tail -n 1|awk -F : '{print $2}'`
+        echo Enter your preferred version or press RETURN to use [$pg_config]:
+        read line
+        if [ "$line" != "" ]; then
+            pg_config=$line
+        fi
+    else
+        pg_config=`echo $pg_config|awk -F : '{print $2}'`
+    fi
+    if [ -x $pg_config ]; then
+        pglibdir=`$pg_config --libdir`
+        pgincdir=`$pg_config --includedir`
+    fi
+    
     libdir=$pglibdir
     incdir=$pgincdir
     libs=$pglibs
@@ -31,6 +67,41 @@
     db=pgsql
 else
     echo You have selected MySQL as database
+    # try using mysql_config to determine build options
+    for i in /usr/local/mysql/bin /opt/mysql/bin /usr/local/bin /usr/local/sbin /usr/bin /usr/sbin;
+        do
+        if [ -x $i/mysql_config ]; then
+            version=`$i/mysql_config --version`
+            if [ -n "$mysql_config" ]; then
+                # we've found more than one 
+                if [ -n "$mysql_configs" ]; then
+                    mysql_configs="$version:$i/mysql_config $mysql_configs"
+                else
+                    mysql_configs="$version:$i/mysql_config $mysql_config"
+                fi
+            fi    
+            mysql_config="$version:$i/mysql_config"
+        fi
+    done
+    if [ -n "$mysql_configs" ]; then
+        # sort the list
+        mysql_configs=`echo $mysql_configs|tr ' ' '\n' | sort `
+        echo Found multiple versions of mysql_config:
+        echo $mysql_configs|tr ' ' '\n'|sed -e 's/^/MySQL /'
+        mysql_config=`echo $mysql_configs|tr ' ' '\n'|tail -n 1|awk -F : '{print $2}'`
+        echo Enter your preferred version or press RETURN to use [$mysql_config]:
+        read line
+        if [ "$line" != "" ]; then
+            mysql_config=$line
+        fi
+    else
+        mysql_config=`echo $mysql_config|awk -F : '{print $2}'`
+    fi
+    if [ -x $mysql_config ]; then
+        mylibdir=`$mysql_config --libs | awk -F \' '{print $2}'`
+        myincdir=`$mysql_config --cflags | awk -F \' '{print $2}'`
+        mylibs=`$mysql_config --libs|sed -e 's/^.*-lmysqlclient /-lmysqlclient /'`
+    fi
     libdir=$mylibdir
     incdir=$myincdir
     libs=$mylibs