Merge lp:~brianaker/libdrizzle/lp-1093585 into lp:libdrizzle

[Brian Aker]

[lp:~brianaker/libdrizzle/lp-1093585]

63. By Brian Aker on 2012-12-27

Fix for uninstall of libdrizzle-config

64. By Brian Aker on 2012-12-27

Fix for when glib is not available. When it is available we do a sanity check on the binary.

65. By Brian Aker on 2012-12-27

Fix a few valgrind warnings.

[Andrew Hutchings (linuxjedi)]

LGTM

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2012-12-24 10:20:04 +0000
+++ Makefile.am	2012-12-27 12:32:26 +0000
@@ -9,6 +9,7 @@
 CLEANFILES =
 DISTCLEANFILES =
 bin_PROGRAMS =
+dist_bin_SCRIPTS =
 noinst_HEADERS =
 lib_LTLIBRARIES =
 man_MANS =
@@ -17,17 +18,20 @@
 include_HEADERS =
 nobase_include_HEADERS =
 check_PROGRAMS =
+check_SCRIPTS =
 EXTRA_HEADERS =
 BUILT_SOURCES=
 EXTRA_DIST=
+EXTRA_SCRIPTS=
 CONFIGURE_DEPENDENCIES=
 PREFIX= @prefix@
 
 #includes additional rules from aminclude.am
 @INC_AMINCLUDE@
 DISTCLEANFILES+= aminclude.am
+CLEANFILES+= $(dist_bin_SCRIPTS)
 
-TESTS+= ${check_PROGRAMS}
+TESTS+= ${check_PROGRAMS} ${check_SCRIPTS}
 
 include tests/include.am
 include m4/include.am
@@ -65,8 +69,4 @@
 	-rm -f @PACKAGE@-*.rpm
 	-rm @GENERIC_CONFIG@
 
-install-exec-local:    install-generic-config
-
-install-generic-config:
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	$(INSTALL_SCRIPT) @GENERIC_CONFIG@ $(DESTDIR)$(bindir)
+dist_bin_SCRIPTS+= @GENERIC_CONFIG@ 
 
=== added file 'cli/drizzle_binlogs_check.sh'
--- cli/drizzle_binlogs_check.sh	1970-01-01 00:00:00 +0000
+++ cli/drizzle_binlogs_check.sh	2012-12-27 12:32:26 +0000
@@ -0,0 +1,4 @@
+#!/bin/sh
+# Simple test for drizzle_binlog
+
+cli/drizzle_binlogs --help  &> /dev/null 
 
=== modified file 'cli/include.am'
--- cli/include.am	2012-12-21 13:17:29 +0000
+++ cli/include.am	2012-12-27 12:32:26 +0000
@@ -2,8 +2,15 @@
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
 
+if HAVE_GLIB
+
 bin_PROGRAMS+= cli/drizzle_binlogs
 cli_drizzle_binlogs_SOURCES= cli/drizzle_binlogs.c
-cli_drizzle_binlogs_LDADD= libdrizzle/libdrizzle.la @GLIB_LIBS@
+cli_drizzle_binlogs_LDADD= libdrizzle/libdrizzle.la
+cli_drizzle_binlogs_LDADD+= @GLIB_LIBS@
 cli_drizzle_binlogs_CFLAGS= @GLIB_CFLAGS@
 cli_drizzle_binlogs_CXXFLAGS= @GLIB_CFLAGS@
+
+check_SCRIPTS+= cli/drizzle_binlogs_check.sh
+
+endif
 
=== modified file 'configure.ac'
--- configure.ac	2012-12-24 10:20:04 +0000
+++ configure.ac	2012-12-27 12:32:26 +0000
@@ -59,7 +59,9 @@
 # Checks for libraries.
 AX_CXX_GCC_ABI_DEMANGLE
 AX_CHECK_OPENSSL
-AM_PATH_GLIB_2_0
+AM_PATH_GLIB_2_0(,[HAVE_GLIB=false],[HAVE_GLIB=true])
+
+AM_CONDITIONAL([HAVE_GLIB],[test "x$HAVE_GLIB"="xtrue"])
 
 # Checks for header files.
 AC_DEFUN([CHECK_FOR_CXXABI],
 
=== modified file 'tests/unit/binlog.c'
--- tests/unit/binlog.c	2012-12-24 10:20:04 +0000
+++ tests/unit/binlog.c	2012-12-27 12:32:26 +0000
@@ -64,6 +64,7 @@
   if (ret != DRIZZLE_RETURN_OK)
   {
     printf("Drizzle connection failure\n");
+    drizzle_quit(con);
     return EXIT_SKIP;
   }
 
 
=== modified file 'tests/unit/connect.c'
--- tests/unit/connect.c	2012-12-24 10:20:04 +0000
+++ tests/unit/connect.c	2012-12-27 12:32:26 +0000
@@ -62,6 +62,7 @@
   if (ret != DRIZZLE_RETURN_OK)
   {
     printf("Drizzle connection failure\n");
+    drizzle_quit(con);
     return EXIT_SKIP;
   }
 
 
=== modified file 'tests/unit/insert_id.c'
--- tests/unit/insert_id.c	2012-12-24 10:20:04 +0000
+++ tests/unit/insert_id.c	2012-12-27 12:32:26 +0000
@@ -63,6 +63,7 @@
   if (ret != DRIZZLE_RETURN_OK)
   {
     printf("Drizzle connection failure\n");
+    drizzle_quit(con);
     return EXIT_SKIP;
   }
 
 
=== modified file 'tests/unit/query.c'
--- tests/unit/query.c	2012-12-24 10:20:04 +0000
+++ tests/unit/query.c	2012-12-27 12:32:26 +0000
@@ -65,6 +65,7 @@
   if (ret != DRIZZLE_RETURN_OK)
   {
     printf("Drizzle connection failure\n");
+    drizzle_quit(con);
     return EXIT_SKIP;
   }
 
 
=== modified file 'tests/unit/statement.c'
--- tests/unit/statement.c	2012-12-24 10:20:04 +0000
+++ tests/unit/statement.c	2012-12-27 12:32:26 +0000
@@ -63,6 +63,7 @@
   if (ret != DRIZZLE_RETURN_OK)
   {
     printf("Drizzle connection failure\n");
+    drizzle_quit(con);
     return EXIT_SKIP;
   }
 
 
=== modified file 'tests/unit/unbuffered_query.c'
--- tests/unit/unbuffered_query.c	2012-12-24 10:20:04 +0000
+++ tests/unit/unbuffered_query.c	2012-12-27 12:32:26 +0000
@@ -65,6 +65,7 @@
   if (ret != DRIZZLE_RETURN_OK)
   {
     printf("Drizzle connection failure\n");
+    drizzle_quit(con);
     return EXIT_SKIP;
   }