2372c7602891a418917e1fc91aa96a3e441cd73f hiram Tue Oct 15 10:23:07 2013 -0700 now using mysql_config to find MYSQLINC and MYSQLLIBS refs #11899 #9149 diff --git src/hg/sqlEnvTest.sh src/hg/sqlEnvTest.sh index 71ea17d..9dcf8bc 100755 --- src/hg/sqlEnvTest.sh +++ src/hg/sqlEnvTest.sh @@ -1,26 +1,30 @@ #!/bin/sh # special test to avoid this during external userApps build if test "$NOSQLTEST" = "1" ; then exit 0 fi export UNAME=`uname -n` if test "$UNAME" = "hgwdev" ; then exit 0 fi +if test -f `which mysql_config` ; then + exit 0 +fi + if test "$MYSQLLIBS x" = " x" -o "$MYSQLINC x" = " x" ; then echo "ERROR: missing MYSQLLIBS or MYSQLINC definitions in environment" echo "these are typically," echo " for bash shell users:" echo ' $ export MYSQLLIBS="/usr/lib/mysql/libmysqlclient.a -lz"' echo " $ export MYSQLINC=/usr/include/mysql" echo " for csh/tcsh shell users:" echo ' % setenv MYSQLLIBS "/usr/lib/mysql/libmysqlclient.a -lz"' echo " % setenv MYSQLINC /usr/include/mysql" echo "See also: http://genome.ucsc.edu/admin/jk-install.html" exit 255 fi exit 0