diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more config fixes, this time check again for mysql, but in the rifht place.

Browse Source
This commit is contained in:
Vítor Santos Costa 2014-07-09 12:52:55 -05:00
parent fcf5309653
commit e167cdfa4c
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.h.in
View File

@ -477,6 +477,9 @@
/* Older versions of MPZ didn't have XOR */
#undef HAVE_MPZ_XOR
/* Define to 1 if you have the <mysql/mysql.h> header file. */
#undef HAVE_MYSQL_MYSQL_H
/* Define to 1 if you have the `nanosleep' function. */
#undef HAVE_NANOSLEEP

24
configure vendored
View File

@ -10116,6 +10116,20 @@ else
yap_cv_mysql="no"
fi
for ac_header in mysql/mysql.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "mysql/mysql.h" "ac_cv_header_mysql_mysql_h" "$ac_includes_default"
if test "x$ac_cv_header_mysql_mysql_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_MYSQL_MYSQL_H 1
_ACEOF
else
yap_cv_mysql="no"
fi
done
if test "$yap_cv_mysql" = yes
then
YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_MYSQL"
@ -10273,7 +10287,7 @@ if test "x$ac_cv_header_sql_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SQL_H 1
_ACEOF
yap_cv_odbc="yes"
else
yap_cv_odbc="no"
fi
@ -13250,7 +13264,7 @@ else
JAVA_TEST=Test.java
CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST
/* #line 13253 "configure" */
/* #line 13267 "configure" */
public class Test {
}
EOF
@ -13426,7 +13440,7 @@ EOF
if uudecode$EXEEXT Test.uue; then
ac_cv_prog_uudecode_base64=yes
else
echo "configure: 13429: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
echo "configure: 13443: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
echo "configure: failed file was:" >&5
cat Test.uue >&5
ac_cv_prog_uudecode_base64=no
@ -13557,7 +13571,7 @@ else
JAVA_TEST=Test.java
CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST
/* #line 13560 "configure" */
/* #line 13574 "configure" */
public class Test {
}
EOF
@ -13592,7 +13606,7 @@ JAVA_TEST=Test.java
CLASS_TEST=Test.class
TEST=Test
cat << \EOF > $JAVA_TEST
/* [#]line 13595 "configure" */
/* [#]line 13609 "configure" */
public class Test {
public static void main (String args[]) {
System.exit (0);

3
packages/myddas/configure.in
View File

@ -37,6 +37,7 @@ then
PKG_MYDDAS="packages/myddas"
dnl check for mysql
AC_SEARCH_LIBS(mysql_init, [mysqlclient], [yap_cv_mysql="yes"], [yap_cv_mysql="no"])
AC_CHECK_HEADERS(mysql/mysql.h, [], [yap_cv_mysql="no"])
if test "$yap_cv_mysql" = yes
then
YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_MYSQL"
@ -63,7 +64,7 @@ then
fi
#from SWI ODBC library.
AC_CHECK_HEADERS(windef.h)
AC_CHECK_HEADERS(sql.h, [yap_cv_odbc="yes"], [yap_cv_odbc="no"])
AC_CHECK_HEADERS(sql.h, [ ], [yap_cv_odbc="no"])
if test "$yap_cv_odbc" = yes
then
YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_ODBC"