X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=b404da7fd5f0f817001a26e7fb47c7e9029b1c23;hp=f0754926397ec97afe04ee3afc45ec14d745cfeb;hb=9825fbdda45adea6715afaebd6f446f3294f62e9;hpb=c37c3422065b07b906a015537ac93169ee19efea

diff --git a/configure.ac b/configure.ac
index f0754926..b404da7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,6 +162,18 @@ AC_CHECK_HEADER(SDL/SDL.h, [],
 
 ########################################################################### mysql
 have_mysql="yes"
+AC_ARG_ENABLE(mysql_headers, [AC_HELP_STRING(--enable-mysql-headers=dir,
+	[look for mysql.h also in dir])])
+if test -n "$enable_mysql_headers"; then
+	mysql_cppflags="-I$enable_mysql_headers"
+	CPPFLAGS="$CPPFLAGS $mysql_cppflags"
+fi
+AC_ARG_ENABLE(mysql_libs, [AC_HELP_STRING(--enable-mysql-libs=dir,
+	[look for libmysqlclient also in dir])])
+if test -n "$enable_mysql_headers"; then
+	mysql_libs="-L$enable_mysql_libs"
+	LDFLAGS="$LDFLAGS $mysql_libs"
+fi
 AC_CHECK_HEADER(mysql/mysql.h, [], [
 	have_mysql="no"
 ])
@@ -169,8 +181,9 @@ AC_CHECK_LIB([mysqlclient], [mysql_init], [], [
 	have_mysql="no"
 ])
 if test "$have_mysql" = "yes"; then
-	server_ldflags="$server_ldflags -lmysqlclient"
+	server_ldflags="$server_ldflags $mysql_libs -lmysqlclient"
 	server_errlist_objs="$server_errlist_objs mysql_selector"
+	AC_SUBST(mysql_cppflags)
 	AC_DEFINE(HAVE_MYSQL, 1, [define to 1 to turn on mysql support])
 else
 	AC_MSG_WARN([cannot build mysql-based audio file selector])
@@ -350,7 +363,7 @@ AC_SUBST(gui_objs, add_dot_o($gui_objs))
 
 AC_OUTPUT
 AC_MSG_NOTICE([creating Makefile.deps])
-gcc -MM -MG *.c > Makefile.deps
+gcc -MM -MG $mysql_cppflags *.c > Makefile.deps
 AC_MSG_NOTICE([
 paraslash configuration:
 ~~~~~~~~~~~~~~~~~~~~~~~~