Browse Source

Partial commit for autoconf fix

Brian Aker 13 years ago
parent
commit
a402a30656

+ 12 - 8
configure.ac

@@ -6,7 +6,7 @@
 # Use and distribution licensed under the BSD license.  See
 # the COPYING file in this directory for full text.
 
-AC_INIT([gearmand],[0.25],[https://launchpad.net/gearmand], [gearmand], [http://gearman.info/])
+AC_INIT([gearmand],[0.25],[https://bugs.launchpad.net/gearmand], [gearmand], [http://gearman.info/])
 
 AC_CONFIG_AUX_DIR(config)
 
@@ -47,13 +47,20 @@ LT_LANG([C++])
 LT_LANG([C])
 gl_VISIBILITY
 
+AX_PTHREAD(, [AC_MSG_ERROR(could not find libpthread)])
+
+dnl First look for Boost, maybe for a specific minimum version:
+BOOST_REQUIRE([1.39])
+BOOST_PROGRAM_OPTIONS
+
+PANDORA_CXX_CSTDINT
+PANDORA_CXX_CINTTYPES
+
 WITH_LIBMEMCACHED
 m4_include([m4/memcached.m4])
 m4_include([m4/memcached_sasl.m4])
 AM_CONDITIONAL(BUILDING_LIBMEMCACHED, false)
 
-LDFLAGS="$LDFLAGS -z relro -z now"
-
 AM_CONDITIONAL(BUILDING_GEARMAN, true)
 AM_CONDITIONAL(HAVE_LIBGEARMAN, true)
 AC_SUBST(_WITH_LIBGEARMAN_SUPPORT, ["_WITH_LIBGEARMAN_SUPPORT 0"])
@@ -61,15 +68,10 @@ AC_DEFINE([GEARMAND_BINARY], "./gearmand/gearmand", [Name of the gearmand binary
 AC_DEFINE([HAVE_LIBGEARMAN], 1, [libgearman support])
 AC_DEFINE([HAVE_GEARMAND_BINARY], 1, [libgearman support])
 
-dnl First look for Boost, maybe for a specific minimum version:
-BOOST_REQUIRE([1.39])
-BOOST_PROGRAM_OPTIONS([mt-])
-
 m4_include([m4/drizzled.m4])
 WITH_LIBDRIZZLE
 WITH_DRIZZLED
 
-AX_PTHREAD(, [AC_MSG_ERROR(could not find libpthread)])
 PANDORA_REQUIRE_LIBEVENT
 PANDORA_REQUIRE_LIBUUID
 
@@ -146,6 +148,8 @@ AC_CHECK_FUNCS([strtoul])
 AC_CHECK_FUNC(setsockopt, [], [AC_CHECK_LIB(socket, setsockopt)])
 AC_CHECK_FUNC(bind, [], [AC_CHECK_LIB(bind, bind)])
 
+m4_include([m4/relro.m4])
+
 
 AC_CONFIG_FILES([libtest/version.h])
 AC_CONFIG_FILES(Makefile

+ 5 - 3
libgearman-server/include.am

@@ -12,10 +12,11 @@
 # All paths should be given relative to the root
 #
 
-libgearman_server_libgearman_server_la_SOURCES=
-libgearman_server_libgearman_server_la_LIBADD=
-libgearman_server_libgearman_server_la_CXXFLAGS=
 libgearman_server_libgearman_server_la_CFLAGS=
+libgearman_server_libgearman_server_la_CXXFLAGS=
+libgearman_server_libgearman_server_la_LDFLAGS=
+libgearman_server_libgearman_server_la_LIBADD=
+libgearman_server_libgearman_server_la_SOURCES=
 
 include libgearman-server/error/include.am
 include libgearman-server/plugins/include.am
@@ -82,6 +83,7 @@ libgearman_server_libgearman_server_la_CXXFLAGS+= -DBUILDING_LIBGEARMAN
 
 libgearman_server_libgearman_server_la_LIBADD+= $(LTLIBEVENT)
 libgearman_server_libgearman_server_la_LIBADD+= $(PTHREAD_LIBS)
+libgearman_server_libgearman_server_la_LIBADD+= $(BOOST_PROGRAM_OPTIONS_LIBS)
 
 if TARGET_LINUX
 libgearman_server_libgearman_server_la_LIBADD+= -lm

+ 4 - 3
libgearman-server/plugins.cc

@@ -48,9 +48,10 @@ namespace plugins {
 
 void initialize(boost::program_options::options_description &all)
 {
-#ifdef HAVE_LIBDRIZZLE
-  queue::initialize_drizzle();
-#endif
+  if (HAVE_LIBDRIZZLE)
+  {
+    queue::initialize_drizzle();
+  }
 
   if (HAVE_LIBMEMCACHED)
   {

+ 12 - 9
libhostile/include.am

@@ -24,12 +24,15 @@ noinst_HEADERS+= \
 		 libhostile/setsockopt.h \
 		 libhostile/write.h
 
-libhostile_libhostile_la_SOURCES= \
-				  libhostile/getaddrinfo.c \
-				  libhostile/initialize.c \
-				  libhostile/malloc.c \
-				  libhostile/realloc.c \
-				  libhostile/recv.c \
-				  libhostile/send.c \
-				  libhostile/setsockopt.c \
-				  libhostile/write.c
+libhostile_libhostile_la_SOURCES= libhostile/initialize.c
+
+if TARGET_LINUX
+libhostile_libhostile_la_SOURCES+= \
+				   libhostile/getaddrinfo.c \
+				   libhostile/malloc.c \
+				   libhostile/realloc.c \
+				   libhostile/recv.c \
+				   libhostile/send.c \
+				   libhostile/setsockopt.c \
+				   libhostile/write.c
+endif

+ 24 - 13
m4/libdrizzle.m4

@@ -1,18 +1,29 @@
 AC_DEFUN([_WITH_LIBDRIZZLE],
   [ AC_ARG_ENABLE([libdrizzle],
-    [AS_HELP_STRING([--disable-libdrizzle],
-      [Build with libdrizzle support @<:@default=on@:>@])],
-    [ac_enable_libdrizzle="$enableval"],
-    [ac_enable_libdrizzle="yes"])
+   [AS_HELP_STRING([--disable-libdrizzle],
+     [Build with libdrizzle support @<:@default=on@:>@])],
+     [ac_enable_libdrizzle="$enableval"],
+     [ac_enable_libdrizzle="yes"])
 
-    AS_IF([test "x$ac_enable_libdrizzle" = "xyes"],
-         [ PKG_CHECK_MODULES([libdrizzle], 
-			     [ libdrizzle-1.0 >= 2011.03.13 ], 
-			     [AC_DEFINE([HAVE_LIBDRIZZLE], [ 1 ], [Enable libdrizzle support])], 
-			     [ac_enable_libdrizzle="no"] )],
-         [ AC_DEFINE([HAVE_LIBDRIZZLE], [ 0 ], [Enable libdrizzle support]) ])
-    AM_CONDITIONAL(HAVE_LIBDRIZZLE, test "x${ac_enable_libdrizzle}" = "xyes")
-    ])
-])
+     AS_IF([test "x$ac_enable_libdrizzle" = "xyes"],
+       [ PKG_CHECK_MODULES([libdrizzle], 
+                           [ libdrizzle-1.0 >= 2011.03.13 ], 
+			   [
+                            AC_DEFINE([HAVE_LIBDRIZZLE], [ 1 ], [Enable libdrizzle support])
+                            AC_SUBST(_WITH_LIBDRIZZLE_SUPPORT, ["_WITH_LIBDRIZZLE_SUPPORT 1"])
+                            ],
+                           [
+                             [ac_enable_libdrizzle="no"]
+                             AC_DEFINE([HAVE_LIBDRIZZLE], [ 0 ], [Enable libdrizzle support])
+                             AC_SUBST(_WITH_LIBDRIZZLE_SUPPORT, ["_WITH_LIBDRIZZLE_SUPPORT 1"])
+                             ])],
+                             [
+                             AC_DEFINE([HAVE_LIBDRIZZLE], [ 0 ], [Enable libdrizzle support])
+                             AC_SUBST(_WITH_LIBDRIZZLE_SUPPORT, ["_WITH_LIBDRIZZLE_SUPPORT 1"])
+                             ]
+                             )
+
+     AM_CONDITIONAL(HAVE_LIBDRIZZLE, test "x${ac_enable_libdrizzle}" = "xyes")
+     ])
 
 AC_DEFUN([WITH_LIBDRIZZLE], [ AC_REQUIRE([_WITH_LIBDRIZZLE]) ])

+ 0 - 32
m4/pandora_canonical.m4

@@ -43,34 +43,19 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[
   ifdef([m4_define],,[define([m4_define],   defn([define]))])
   ifdef([m4_undefine],,[define([m4_undefine],   defn([undefine]))])
   m4_define([PCT_ALL_ARGS],[$*])
-  m4_define([PCT_REQUIRE_CXX],[no])
   m4_define([PCT_FORCE_GCC42],[no])
   m4_define([PCT_DONT_SUPPRESS_INCLUDE],[no])
-  m4_define([PCT_NO_VC_CHANGELOG],[no])
   m4_define([PCT_VERSION_FROM_VC],[no])
-  m4_define([PCT_USE_VISIBILITY],[yes])
   m4_foreach([pct_arg],[$*],[
     m4_case(pct_arg,
-      [require-cxx], [
-        m4_undefine([PCT_REQUIRE_CXX])
-        m4_define([PCT_REQUIRE_CXX],[yes])
-      ],
       [force-gcc42], [
         m4_undefine([PCT_FORCE_GCC42])
         m4_define([PCT_FORCE_GCC42],[yes])
       ],
-      [skip-visibility], [
-        m4_undefine([PCT_USE_VISIBILITY])
-        m4_define([PCT_USE_VISIBILITY],[no])
-      ],
       [dont-suppress-include], [
         m4_undefine([PCT_DONT_SUPPRESS_INCLUDE])
         m4_define([PCT_DONT_SUPPRESS_INCLUDE],[yes])
       ],
-      [no-vc-changelog], [
-        m4_undefine([PCT_NO_VC_CHANGELOG])
-        m4_define([PCT_NO_VC_CHANGELOG],[yes])
-      ],
       [version-from-vc], [
         m4_undefine([PCT_VERSION_FROM_VC])
         m4_define([PCT_VERSION_FROM_VC],[yes])
@@ -107,11 +92,6 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[
   ])
   AC_REQUIRE([PANDORA_64BIT])
 
-  m4_if(PCT_NO_VC_CHANGELOG,yes,[
-    vc_changelog=no
-  ],[
-    vc_changelog=yes
-  ])
   m4_if(PCT_VERSION_FROM_VC,yes,[
     PANDORA_VC_INFO_HEADER
   ],[
@@ -141,18 +121,6 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[
 
   PANDORA_PLATFORM
 
-  dnl autoconf doesn't automatically provide a fail-if-no-C++ macro
-  dnl so we check c++98 features and fail if we don't have them, mainly
-  dnl for that reason
-  PANDORA_CHECK_CXX_STANDARD
-  m4_if(PCT_REQUIRE_CXX, [yes], [
-    AS_IF([test "$ac_cv_cxx_stdcxx_98" = "no"],[
-      PANDORA_MSG_ERROR([No working C++ Compiler has been found. ${PACKAGE} requires a C++ compiler that can handle C++98])
-    ])
-  ])
-  PANDORA_CXX_CSTDINT
-  PANDORA_CXX_CINTTYPES
-  
   m4_if(m4_substr(m4_esyscmd(test -d gnulib && echo 0),0,1),0,[
     gl_INIT
     AC_CONFIG_LIBOBJ_DIR([gnulib])

+ 0 - 174
m4/pandora_vc_build.m4

@@ -1,174 +0,0 @@
-dnl  Copyright (C) 2009 Sun Microsystems, Inc.
-dnl This file is free software; Sun Microsystems, Inc.
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([PANDORA_TEST_VC_DIR],[
-  pandora_building_from_vc=no
-
-  if test -d ".bzr" ; then
-    pandora_building_from_bzr=yes
-    pandora_building_from_vc=yes
-  else
-    pandora_building_from_bzr=no
-  fi
-
-  if test -d ".svn" ; then
-    pandora_building_from_svn=yes
-    pandora_building_from_vc=yes
-  else
-    pandora_building_from_svn=no
-  fi
-
-  if test -d ".hg" ; then
-    pandora_building_from_hg=yes
-    pandora_building_from_vc=yes
-  else
-    pandora_building_from_hg=no
-  fi
-
-  if test -d ".git" ; then
-    pandora_building_from_git=yes
-    pandora_building_from_vc=yes
-  else
-    pandora_building_from_git=no
-  fi
-])
-
-AC_DEFUN([PANDORA_BUILDING_FROM_VC],[
-  m4_syscmd(PANDORA_TEST_VC_DIR
-    m4_if(PCT_NO_VC_CHANGELOG,yes,[
-      vc_changelog=no
-      ],[
-      vc_changelog=yes
-      ])
-  
-    [
-
-    PANDORA_RELEASE_DATE=`date +%Y.%m`
-    PANDORA_RELEASE_NODOTS_DATE=`date +%Y%m`
-
-    # Set some defaults
-    PANDORA_VC_REVNO="0"
-    PANDORA_VC_REVID="unknown"
-    PANDORA_VC_BRANCH="bzr-export"
-
-    if test "${pandora_building_from_bzr}" = "yes"; then
-      echo "# Grabbing changelog and version information from bzr"
-      PANDORA_BZR_REVNO=`bzr revno`
-      if test "x$PANDORA_BZR_REVNO" != "x${PANDORA_VC_REVNO}" ; then
-        PANDORA_VC_REVNO="${PANDORA_BZR_REVNO}"
-        PANDORA_VC_REVID=`bzr log -r-1 --show-ids | grep revision-id | cut -f2 -d' ' | head -1`
-        PANDORA_VC_BRANCH=`bzr nick`
-        PANDORA_VC_TAG=`bzr tags -r-1 | cut -f1 -d' ' | head -1`
-        PANDORA_VC_LATEST_TAG=`bzr tags --sort=time | grep -v '\?'| cut -f1 -d' '  | tail -1`
-        if test "x${vc_changelog}" = "xyes"; then
-          bzr log --gnu > ChangeLog
-        fi
-      fi
-    elif test "${pandora_building_from_git}" = "yes"; then
-      echo "# Grabbing changelog and version information from git"
-      PANDORA_GIT_REVID=`git --no-pager log --max-count=1 | cut -f2 -d' ' | head -1`
-      if test "x$PANDORA_GIT_REVID" != "x${PANDORA_VC_REVNO}" ; then
-         PANDORA_VC_REVID="${PANDORA_GIT_REVID}"
-         PANDORA_VC_BRANCH=`git branch | grep -Ei "\* (.*)" | cut -f2 -d' '`
-      fi
-    fi
-
-    if ! test -d config ; then
-      mkdir -p config
-    fi
-
-    if test "${pandora_building_from_bzr}" = "yes" -o ! -f config/pandora_vc_revinfo ; then 
-      cat > config/pandora_vc_revinfo.tmp <<EOF
-PANDORA_VC_REVNO=${PANDORA_VC_REVNO}
-PANDORA_VC_REVID=${PANDORA_VC_REVID}
-PANDORA_VC_BRANCH=${PANDORA_VC_BRANCH}
-PANDORA_VC_TAG=${PANDORA_VC_TAG}
-PANDORA_VC_LATEST_TAG=${PANDORA_VC_LATEST_TAG}
-PANDORA_RELEASE_DATE=${PANDORA_RELEASE_DATE}
-PANDORA_RELEASE_NODOTS_DATE=${PANDORA_RELEASE_NODOTS_DATE}
-EOF
-      if ! diff config/pandora_vc_revinfo.tmp config/pandora_vc_revinfo >/dev/null 2>&1 ; then
-        mv config/pandora_vc_revinfo.tmp config/pandora_vc_revinfo
-      fi
-      rm -f config/pandora_vc_revinfo.tmp
-    fi
-  ])
-])
-  
-AC_DEFUN([_PANDORA_READ_FROM_FILE],[
-  $1=`grep $1 $2 | cut -f2 -d=`
-])
-
-AC_DEFUN([PANDORA_VC_VERSION],[
-  AC_REQUIRE([PANDORA_BUILDING_FROM_VC])
-
-  PANDORA_TEST_VC_DIR
-
-  AS_IF([test -f ${srcdir}/config/pandora_vc_revinfo],[
-    _PANDORA_READ_FROM_FILE([PANDORA_VC_REVNO],${srcdir}/config/pandora_vc_revinfo)
-    _PANDORA_READ_FROM_FILE([PANDORA_VC_REVID],${srcdir}/config/pandora_vc_revinfo)
-    _PANDORA_READ_FROM_FILE([PANDORA_VC_BRANCH],
-                            ${srcdir}/config/pandora_vc_revinfo)
-    _PANDORA_READ_FROM_FILE([PANDORA_VC_TAG],
-                            ${srcdir}/config/pandora_vc_revinfo)
-    _PANDORA_READ_FROM_FILE([PANDORA_VC_LATEST_TAG],
-                            ${srcdir}/config/pandora_vc_revinfo)
-    _PANDORA_READ_FROM_FILE([PANDORA_RELEASE_DATE],
-                            ${srcdir}/config/pandora_vc_revinfo)
-    _PANDORA_READ_FROM_FILE([PANDORA_RELEASE_NODOTS_DATE],
-                            ${srcdir}/config/pandora_vc_revinfo)
-  ])
-  AS_IF([test "x${PANDORA_VC_BRANCH}" != x"${PACKAGE}"],[
-    PANDORA_RELEASE_COMMENT="${PANDORA_VC_BRANCH}"
-  ],[
-    PANDORA_RELEASE_COMMENT="trunk"
-  ])
-    
-  AS_IF([test "x${PANDORA_VC_TAG}" != "x"],[
-    PANDORA_RELEASE_VERSION="${PANDORA_VC_TAG}"
-    changequote(<<, >>)dnl
-    PANDORA_RELEASE_ID=`echo ${PANDORA_RELEASE_VERSION} | sed 's/[^0-9]//g'`
-    changequote([, ])dnl
-  ],[
-    AS_IF([test "x${PANDORA_VC_LATEST_TAG}" != "x"],[
-      PANDORA_RELEASE_VERSION="${PANDORA_VC_LATEST_TAG}.${PANDORA_VC_REVNO}"
-      changequote(<<, >>)dnl
-      PANDORA_RELEASE_ID=`echo ${PANDORA_VC_LATEST_TAG} | sed 's/[^0-9]//g'`
-      changequote([, ])dnl
-    ],[
-      PANDORA_RELEASE_VERSION="${PANDORA_RELEASE_DATE}.${PANDORA_VC_REVNO}"
-      changequote(<<, >>)dnl
-      PANDORA_RELEASE_ID=`echo ${PANDORA_RELEASE_DATE} | sed 's/[^0-9]//g'`
-      changequote([, ])dnl
-    ])
-  ])
-
-
-  VERSION="${PANDORA_RELEASE_VERSION}"
-  AC_DEFINE_UNQUOTED([PANDORA_RELEASE_VERSION],["${PANDORA_RELEASE_VERSION}"],
-                     [The real version of the software])
-  AC_SUBST(PANDORA_VC_REVNO)
-  AC_SUBST(PANDORA_VC_REVID)
-  AC_SUBST(PANDORA_VC_BRANCH)
-  AC_SUBST(PANDORA_RELEASE_DATE)
-  AC_SUBST(PANDORA_RELEASE_NODOTS_DATE)
-  AC_SUBST(PANDORA_RELEASE_COMMENT)
-  AC_SUBST(PANDORA_RELEASE_VERSION)
-  AC_SUBST(PANDORA_RELEASE_ID)
-])
-
-AC_DEFUN([PANDORA_VC_INFO_HEADER],[
-  AC_REQUIRE([PANDORA_VC_VERSION])
-  m4_define([PANDORA_VC_PREFIX],m4_toupper(m4_normalize(AC_PACKAGE_NAME))[_])
-
-  AC_DEFINE_UNQUOTED(PANDORA_VC_PREFIX[VC_REVNO], [$PANDORA_VC_REVNO], [Version control revision number])
-  AC_DEFINE_UNQUOTED(PANDORA_VC_PREFIX[VC_REVID], ["$PANDORA_VC_REVID"], [Version control revision ID])
-  AC_DEFINE_UNQUOTED(PANDORA_VC_PREFIX[VC_BRANCH], ["$PANDORA_VC_BRANCH"], [Version control branch name])
-  AC_DEFINE_UNQUOTED(PANDORA_VC_PREFIX[RELEASE_DATE], ["$PANDORA_RELEASE_DATE"], [Release date of version control checkout])
-  AC_DEFINE_UNQUOTED(PANDORA_VC_PREFIX[RELEASE_NODOTS_DATE], [$PANDORA_RELEASE_NODOTS_DATE], [Numeric formatted release date of checkout])
-  AC_DEFINE_UNQUOTED(PANDORA_VC_PREFIX[RELEASE_COMMENT], ["$PANDORA_RELEASE_COMMENT"], [Set to trunk if the branch is the main $PACKAGE branch])
-  AC_DEFINE_UNQUOTED(PANDORA_VC_PREFIX[RELEASE_VERSION], ["$PANDORA_RELEASE_VERSION"], [Release date and revision number of checkout])
-  AC_DEFINE_UNQUOTED(PANDORA_VC_PREFIX[RELEASE_ID], [$PANDORA_RELEASE_ID], [Numeric formatted release date and revision number of checkout])
-])

+ 0 - 7
m4/pandora_warnings.m4

@@ -27,13 +27,6 @@ AC_DEFUN([PANDORA_WARNINGS],[
     ]) 
   ])
 
-  AC_REQUIRE([PANDORA_BUILDING_FROM_VC])
-  m4_if(PW_WARN_ALWAYS_ON, [yes],
-    [ac_cv_warnings_as_errors=yes],
-    AS_IF([test "$pandora_building_from_vc" = "yes"],
-          [ac_cv_warnings_as_errors=yes],
-          [ac_cv_warnings_as_errors=no]))
-
   AC_ARG_ENABLE([gcc-profile-mode],
       [AS_HELP_STRING([--enable-gcc-profile-mode],
          [Toggle gcc profile mode @<:@default=off@:>@])],

+ 12 - 0
m4/relro.m4

@@ -0,0 +1,12 @@
+# Set -z,relro.
+# Note this is only for shared objects.
+ac_ld_relro=no
+if test x"$with_gnu_ld" = x"yes"; then
+  AC_MSG_CHECKING([for ld that supports -Wl,-z,relro])
+  cxx_z_relo=`$LD -v --help 2>/dev/null | grep "z relro"`
+  if test -n "$cxx_z_relo"; then
+    LDFLAGS="$LDFLAGS -z relro -z now"
+    ac_ld_relro=yes
+  fi
+  AC_MSG_RESULT($ac_ld_relro)
+fi

+ 33 - 25
tests/drizzle_test.cc

@@ -27,42 +27,47 @@ using namespace libtest;
 #define WORKER_FUNCTION "drizzle_queue_test"
 
 #if defined(HAVE_LIBDRIZZLE) && HAVE_LIBDRIZZLE
-
 #include <libdrizzle-1.0/drizzle_client.h>
+#endif
 
 static bool ping_drizzled(void)
 {
-  drizzle_st *drizzle= drizzle_create(NULL);
-
-  if (drizzle == NULL)
+#if defined(HAVE_LIBDRIZZLE) && HAVE_LIBDRIZZLE
+  if (HAVE_LIBDRIZZLE)
   {
-    return false;
-  }
+    drizzle_st *drizzle= drizzle_create(NULL);
 
-  drizzle_con_st *con;
+    if (drizzle == NULL)
+    {
+      return false;
+    }
 
-  if ((con= drizzle_con_create(drizzle, NULL)) == NULL)
-  {
-    drizzle_free(drizzle);
-    return false;
-  }
+    drizzle_con_st *con;
 
-  drizzle_con_set_tcp(con, NULL, 0);
-  drizzle_con_set_auth(con, "root", 0);
-  drizzle_return_t rc;
-  drizzle_result_st *result= drizzle_ping(con, NULL, &rc);
+    if ((con= drizzle_con_create(drizzle, NULL)) == NULL)
+    {
+      drizzle_free(drizzle);
+      return false;
+    }
 
-  bool success= bool(result);
+    drizzle_con_set_tcp(con, NULL, 0);
+    drizzle_con_set_auth(con, "root", 0);
+    drizzle_return_t rc;
+    drizzle_result_st *result= drizzle_ping(con, NULL, &rc);
 
-  drizzle_result_free(result);
-  drizzle_con_free(con);
-  drizzle_free(drizzle);
+    bool success= bool(result);
 
-  return success;
-}
+    drizzle_result_free(result);
+    drizzle_con_free(con);
+    drizzle_free(drizzle);
 
+    return success;
+  }
 #endif
 
+  return false;
+}
+
 #ifndef __INTEL_COMPILER
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #endif
@@ -113,10 +118,13 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
     return NULL;
   }
 
-  if (ping_drizzled() == false)
+  if (HAVE_LIBDRIZZLE)
   {
-    error= TEST_SKIPPED;
-    return NULL;
+    if (ping_drizzled() == false)
+    {
+      error= TEST_SKIPPED;
+      return NULL;
+    }
   }
 
   Context *test= new Context(DRIZZLE_TEST_PORT, servers);

Some files were not shown because too many files changed in this diff