Skip to content
Snippets Groups Projects
Commit 88144092 authored by Danny Auble's avatar Danny Auble
Browse files

update warning message about no mysql, rerun autogen.sh

parent 3fb9f1a4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
auxdir/x_ac_databases.m4
+ 37
− 37
View file @ 88144092
......@@ -8,7 +8,7 @@
# X_AC_DATABASES
#
# DESCRIPTION:
# Test for Different Database apis. If found define appropriate ENVs.
# Test for Different Database apis. If found define appropriate ENVs.
##*****************************************************************************
AC_DEFUN([X_AC_DATABASES],
......@@ -19,10 +19,10 @@ AC_DEFUN([X_AC_DATABASES],
### Check for mysql_config program
AC_ARG_WITH(
[mysql_config],
AS_HELP_STRING(--with-mysql_config=PATH,
AS_HELP_STRING(--with-mysql_config=PATH,
Specify path to mysql_config binary),
[_x_ac_mysql_bin="$withval"])
if test x$_x_ac_mysql_bin = xno; then
AC_PATH_PROG(HAVEMYSQLCONFIG, mysql_config, no)
else
......@@ -30,7 +30,7 @@ AC_DEFUN([X_AC_DATABASES],
fi
if test x$HAVEMYSQLCONFIG = xno; then
AC_MSG_WARN([*** mysql_config not found. Evidently no MySQL install on system.])
AC_MSG_WARN([*** mysql_config not found. Evidently no MySQL development libs installed on system.])
else
# check for mysql-5.0.0+
mysql_config_major_version=`$HAVEMYSQLCONFIG --version | \
......@@ -42,9 +42,9 @@ AC_DEFUN([X_AC_DATABASES],
if test $mysql_config_major_version -lt 5; then
AC_MSG_WARN([*** mysql-$mysql_config_major_version.$mysql_config_minor_version.$mysql_config_micro_version available, we need >= mysql-5.0.0 installed for the mysql interface.])
ac_have_mysql="no"
else
# mysql_config puts -I on the front of the dir. We don't
ac_have_mysql="no"
else
# mysql_config puts -I on the front of the dir. We don't
# want that so we remove it.
MYSQL_CFLAGS=`$HAVEMYSQLCONFIG --cflags`
MYSQL_LIBS=`$HAVEMYSQLCONFIG --libs_r`
......@@ -53,20 +53,20 @@ AC_DEFUN([X_AC_DATABASES],
CFLAGS="$MYSQL_CFLAGS $save_CFLAGS"
LIBS="$MYSQL_LIBS $save_LIBS"
AC_TRY_LINK([#include <mysql.h>],[
int main()
{
int main()
{
MYSQL mysql;
(void) mysql_init(&mysql);
(void) mysql_init(&mysql);
(void) mysql_close(&mysql);
}
],
}
],
[ac_have_mysql="yes"],
[ac_have_mysql="no"])
CFLAGS="$save_CFLAGS"
LIBS="$save_LIBS"
if test "$ac_have_mysql" == "yes"; then
AC_MSG_RESULT([MySQL test program built properly.])
AC_SUBST(MYSQL_LIBS)
AC_MSG_RESULT([MySQL test program built properly.])
AC_SUBST(MYSQL_LIBS)
AC_SUBST(MYSQL_CFLAGS)
AC_DEFINE(HAVE_MYSQL, 1, [Define to 1 if using MySQL libaries])
else
......@@ -77,29 +77,29 @@ AC_DEFUN([X_AC_DATABASES],
CFLAGS="$MYSQL_CFLAGS $save_CFLAGS"
LIBS="$MYSQL_LIBS $save_LIBS"
AC_TRY_LINK([#include <mysql.h>],[
int main()
{
int main()
{
MYSQL mysql;
(void) mysql_init(&mysql);
(void) mysql_init(&mysql);
(void) mysql_close(&mysql);
}
],
}
],
[ac_have_mysql="yes"],
[ac_have_mysql="no"])
CFLAGS="$save_CFLAGS"
LIBS="$save_LIBS"
if test "$ac_have_mysql" == "yes"; then
AC_MSG_RESULT([MySQL (non-threaded) test program built properly.])
AC_SUBST(MYSQL_LIBS)
AC_MSG_RESULT([MySQL (non-threaded) test program built properly.])
AC_SUBST(MYSQL_LIBS)
AC_SUBST(MYSQL_CFLAGS)
AC_DEFINE(MYSQL_NOT_THREAD_SAFE, 1, [Define to 1 if with non thread-safe code])
AC_DEFINE(HAVE_MYSQL, 1, [Define to 1 if using MySQL libaries])
else
MYSQL_CFLAGS=""
MYSQL_LIBS=""
AC_MSG_WARN([*** MySQL test program execution failed.])
fi
AC_MSG_WARN([*** MySQL test program execution failed.])
fi
fi
fi
fi
......@@ -111,7 +111,7 @@ AC_DEFUN([X_AC_DATABASES],
### Check for pg_config program
AC_ARG_WITH(
[pg_config],
AS_HELP_STRING(--with-pg_config=PATH,
AS_HELP_STRING(--with-pg_config=PATH,
Specify path to pg_config binary),
[_x_ac_pgsql_bin="$withval"])
......@@ -120,41 +120,41 @@ AC_DEFUN([X_AC_DATABASES],
else
AC_PATH_PROG(HAVEPGCONFIG, pg_config, no, $_x_ac_pgsql_bin)
fi
if test x$HAVEPGCONFIG = xno; then
AC_MSG_WARN([*** pg_config not found. Evidently no PostgreSQL install on system.])
AC_MSG_WARN([*** pg_config not found. Evidently no PostgreSQL development libs installed on system.])
else
PGSQL_INCLUDEDIR=`$HAVEPGCONFIG --includedir`
PGSQL_LIBDIR=`$HAVEPGCONFIG --libdir`
PGSQL_CFLAGS="-I$PGSQL_INCLUDEDIR -L$PGSQL_LIBDIR"
PGSQL_CFLAGS="-I$PGSQL_INCLUDEDIR -L$PGSQL_LIBDIR"
save_CFLAGS="$CFLAGS"
CFLAGS="$PGSQL_CFLAGS $save_CFLAGS"
CFLAGS="$PGSQL_CFLAGS $save_CFLAGS"
PGSQL_LIBS=" -lpq"
save_LIBS="$LIBS"
LIBS="$PGSQL_LIBS $save_LIBS"
LIBS="$PGSQL_LIBS $save_LIBS"
AC_TRY_LINK([#include <libpq-fe.h>],[
int main()
int main()
{
PGconn *conn;
conn = PQconnectdb("dbname = postgres");
(void) PQfinish(conn);
}
],
}
],
[ac_have_pgsql="yes"],
[ac_have_pgsql="no"])
LIBS="$save_LIBS"
CFLAGS="$save_CFLAGS"
if test "$ac_have_pgsql" == "yes"; then
AC_MSG_RESULT([PostgreSQL test program built properly.])
AC_SUBST(PGSQL_LIBS)
AC_SUBST(PGSQL_LIBS)
AC_SUBST(PGSQL_CFLAGS)
AC_DEFINE(HAVE_PGSQL, 1, [Define to 1 if using PostgreSQL libaries])
else
else
PGSQL_CFLAGS=""
PGSQL_LIBS=""
AC_MSG_WARN([*** PostgreSQL test program execution failed.])
fi
fi
fi
AM_CONDITIONAL(WITH_PGSQL, test x"$ac_have_pgsql" == x"yes")
......
configure
+ 20
− 23
View file @ 88144092
......@@ -18139,9 +18139,6 @@ $as_echo "#define SYSTEM_DIMENSIONS 3" >>confdefs.h
$as_echo "#define HAVE_CRAY 1" >>confdefs.h
 
 
$as_echo "#define HAVE_CRAY_XT 1" >>confdefs.h
$as_echo "#define HAVE_FRONT_END 1" >>confdefs.h
 
else
......@@ -18937,8 +18934,8 @@ fi
fi
 
if test x$HAVEMYSQLCONFIG = xno; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** mysql_config not found. Evidently no MySQL install on system." >&5
$as_echo "$as_me: WARNING: *** mysql_config not found. Evidently no MySQL install on system." >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** mysql_config not found. Evidently no MySQL development libs installed on system." >&5
$as_echo "$as_me: WARNING: *** mysql_config not found. Evidently no MySQL development libs installed on system." >&2;}
else
# check for mysql-5.0.0+
mysql_config_major_version=`$HAVEMYSQLCONFIG --version | \
......@@ -18951,7 +18948,7 @@ $as_echo "$as_me: WARNING: *** mysql_config not found. Evidently no MySQL instal
if test $mysql_config_major_version -lt 5; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** mysql-$mysql_config_major_version.$mysql_config_minor_version.$mysql_config_micro_version available, we need >= mysql-5.0.0 installed for the mysql interface." >&5
$as_echo "$as_me: WARNING: *** mysql-$mysql_config_major_version.$mysql_config_minor_version.$mysql_config_micro_version available, we need >= mysql-5.0.0 installed for the mysql interface." >&2;}
ac_have_mysql="no"
ac_have_mysql="no"
else
# mysql_config puts -I on the front of the dir. We don't
# want that so we remove it.
......@@ -18968,12 +18965,12 @@ int
main ()
{
 
int main()
{
int main()
{
MYSQL mysql;
(void) mysql_init(&mysql);
(void) mysql_init(&mysql);
(void) mysql_close(&mysql);
}
}
 
;
return 0;
......@@ -18989,7 +18986,7 @@ rm -f core conftest.err conftest.$ac_objext \
CFLAGS="$save_CFLAGS"
LIBS="$save_LIBS"
if test "$ac_have_mysql" == "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: MySQL test program built properly." >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: MySQL test program built properly." >&5
$as_echo "MySQL test program built properly." >&6; }
 
 
......@@ -19010,12 +19007,12 @@ int
main ()
{
 
int main()
{
int main()
{
MYSQL mysql;
(void) mysql_init(&mysql);
(void) mysql_init(&mysql);
(void) mysql_close(&mysql);
}
}
 
;
return 0;
......@@ -19032,7 +19029,7 @@ rm -f core conftest.err conftest.$ac_objext \
LIBS="$save_LIBS"
 
if test "$ac_have_mysql" == "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: MySQL (non-threaded) test program built properly." >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: MySQL (non-threaded) test program built properly." >&5
$as_echo "MySQL (non-threaded) test program built properly." >&6; }
 
 
......@@ -19045,7 +19042,7 @@ $as_echo "#define HAVE_MYSQL 1" >>confdefs.h
else
MYSQL_CFLAGS=""
MYSQL_LIBS=""
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** MySQL test program execution failed." >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** MySQL test program execution failed." >&5
$as_echo "$as_me: WARNING: *** MySQL test program execution failed." >&2;}
fi
fi
......@@ -19158,18 +19155,18 @@ fi
fi
 
if test x$HAVEPGCONFIG = xno; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** pg_config not found. Evidently no PostgreSQL install on system." >&5
$as_echo "$as_me: WARNING: *** pg_config not found. Evidently no PostgreSQL install on system." >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** pg_config not found. Evidently no PostgreSQL development libs installed on system." >&5
$as_echo "$as_me: WARNING: *** pg_config not found. Evidently no PostgreSQL development libs installed on system." >&2;}
else
PGSQL_INCLUDEDIR=`$HAVEPGCONFIG --includedir`
PGSQL_LIBDIR=`$HAVEPGCONFIG --libdir`
PGSQL_CFLAGS="-I$PGSQL_INCLUDEDIR -L$PGSQL_LIBDIR"
save_CFLAGS="$CFLAGS"
CFLAGS="$PGSQL_CFLAGS $save_CFLAGS"
CFLAGS="$PGSQL_CFLAGS $save_CFLAGS"
 
PGSQL_LIBS=" -lpq"
save_LIBS="$LIBS"
LIBS="$PGSQL_LIBS $save_LIBS"
LIBS="$PGSQL_LIBS $save_LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <libpq-fe.h>
......@@ -19177,12 +19174,12 @@ int
main ()
{
 
int main()
int main()
{
PGconn *conn;
conn = PQconnectdb("dbname = postgres");
(void) PQfinish(conn);
}
}
 
;
return 0;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
Nutzungsbedingungen | Datenschutzerklärung | Barrierefreiheitserklärung