Changeset 3477 for trunk/psLib/configure.ac

Timestamp:

Mar 22, 2005, 2:23:58 PM (21 years ago)

Author:

desonia

Message:

changed configure to use mysql_config to get CFLAGS/LDFLAGS.

File:

• trunk/psLib/configure.ac (modified) (1 diff)

trunk/psLib/configure.ac

@@ -51 +51 @@
 then
   AC_MSG_RESULT([enable building MySQL functionality])
-  AC_ARG_WITH(mysql,
-  [AC_HELP_STRING([--with-mysql=DIR],[Specify location of MYSQL.])],
-  [MYSQL_CFLAGS="-I$withval/include"
-   MYSQL_LDFLAGS="-L$withval/lib"])
-  AC_ARG_WITH(mysql-include,
-  [AC_HELP_STRING([--with-mysql-include=DIR],[Specify MYSQL include directory.])],
-  [MYSQL_CFLAGS="-I$withval"])
-  AC_ARG_WITH(mysql-lib,
-  [AC_HELP_STRING([--with-mysql-lib=DIR],[Specify MYSQL library directory.])],
-  [MYSQL_LDFLAGS="-L$withval"])
-  CFLAGS="${CFLAGS=} $MYSQL_CFLAGS"
-  PSLIB_LIBS="${PSLIB_LIBS=} $MYSQL_LDFLAGS -lmysql"
-  AC_CHECK_HEADERS([mysql/mysql.h],[],
-     [AC_MSG_ERROR([MySQL 4.1.2 or newer is required.  Obtain it at  http://www.mysql.com or use --with-mysql to specify location.])])
+  AC_ARG_WITH(mysql_config,
+    [AC_HELP_STRING([--with-mysql_config=FILE],[Specify location of MYSQL configuration script.])],
+    [MYSQL_CONFIG=$withval],
+    [MYSQL_CONFIG=`which mysql_config`])
+  AC_CHECK_FILE($MYSQL_CONFIG,[],
+    [AC_MSG_ERROR([MYSQL 4.1.2 or newer is required.  http://www.mysql.com or use --with-mysql_config to specify location of ocnfiguration script.])])
+
+  AC_MSG_CHECKING([MySQL cflags])
+  MYSQL_CFLAGS="`${MYSQL_CONFIG} --cflags`"
+  AC_MSG_RESULT([${MYSQL_CFLAGS}])
+  CFLAGS="${CFLAGS=} ${MYSQL_CFLAGS}"
+
+  AC_MSG_CHECKING([MySQL link options])
+  MYSQL_LDFLAGS="`${MYSQL_CONFIG} --libs`"
+  AC_MSG_RESULT([${MYSQL_LDFLAGS}])
+  PSLIB_LIBS="${PSLIB_LIBS=} ${MYSQL_LDFLAGS}"
 
   AC_RUN_IFELSE([AC_LANG_PROGRAM(