diff options
| -rw-r--r-- | acinclude.m4 | 17 | ||||
| -rw-r--r-- | include/config-netware.h | 12 | ||||
| -rw-r--r-- | sql/mysqld.cc | 1 |
3 files changed, 26 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index f868489f2d2..9c7271f7cc9 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1723,10 +1723,19 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [ [ndb_debug="$withval"], [ndb_debug="default"]) AC_ARG_WITH([ndb-ccflags], - [ - --with-ndb-ccflags Extra CC options for ndb compile], - [ndb_cxxflags_fix="$ndb_cxxflags_fix $withval"], - [ndb_cxxflags_fix=$ndb_cxxflags_fix]) + AC_HELP_STRING([--with-ndb-ccflags=CFLAGS], + [Extra CFLAGS for ndb compile]), + [ndb_ccflags=${withval}], + [ndb_ccflags=""]) + + case "$ndb_ccflags" in + "yes") + AC_MSG_RESULT([The --ndb-ccflags option requires a parameter (passed to CC for ndb compilation)]) + ;; + *) + ndb_cxxflags_fix="$ndb_cxxflags_fix $ndb_ccflags" + ;; + esac AC_MSG_CHECKING([for NDB Cluster options]) AC_MSG_RESULT([]) diff --git a/include/config-netware.h b/include/config-netware.h index c8eba43b86f..1b24655ee89 100644 --- a/include/config-netware.h +++ b/include/config-netware.h @@ -51,6 +51,18 @@ extern "C" { #define HAVE_PTHREAD_YIELD_ZERO_ARG 1 #define HAVE_BROKEN_REALPATH 1 +/* changes made to make use of LibC-June-2004 for building purpose */ +#undef HAVE_POSIX_SIGNALS +#undef HAVE_PTHREAD_ATTR_SETSCOPE +#undef HAVE_ALLOC_A +#undef HAVE_FINITE +#undef HAVE_GETPWNAM +#undef HAVE_GETPWUID +#undef HAVE_PTHREAD_SETSCHEDPARAM +#undef HAVE_READLINK +#undef HAVE_STPCPY +/* changes end */ + /* no libc crypt() function */ #ifdef HAVE_OPENSSL #define HAVE_CRYPT 1 diff --git a/sql/mysqld.cc b/sql/mysqld.cc index b5a292fec28..55995a71980 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -152,6 +152,7 @@ int deny_severity = LOG_WARNING; #define zVOLSTATE_MAINTENANCE 3 #ifdef __NETWARE__ +#include <nks/netware.h> #include <nks/vm.h> #include <library.h> #include <monitor.h> |