Merge lp:~mordred/gearmand/build-fixes into lp:gearmand/1.0

[Monty Taylor]

[Monty Taylor (mordred)]

Fix some build issues that came up during debian package testing. Sorry this didn't show up in hudson guys - I'll sort that out later.

[lp:~mordred/gearmand/build-fixes]

222. By Monty Taylor on 2009-09-29

Cleaned up the lib versioning test - we sure don't need to do the test twice.

=== modified file 'configure.ac'
--- configure.ac	2009-09-24 23:43:15 +0000
+++ configure.ac	2009-09-29 05:01:12 +0000
@@ -43,12 +43,13 @@
 #                          or changed
 AC_SUBST(GEARMAN_SERVER_LIBRARY_VERSION)
 
-# libgearman versioning when linked with GNU ld.
-if test "$lt_cv_prog_gnu_ld" = "yes"
-then
+# lib versioning when linked with GNU ld.
+AS_IF([test "$lt_cv_prog_gnu_ld" = "yes"],[
     LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/libgearman/libgearman.ver"
-fi
+    LD_VERSION_SCRIPT_SERVER="-Wl,--version-script=\$(top_srcdir)/libgearman-server/libgearman-server.ver"
+])
 AC_SUBST(LD_VERSION_SCRIPT)
+AC_SUBST(LD_VERSION_SCRIPT_SERVER)
 
 PANDORA_REQUIRE_PTHREAD
 

=== modified file 'docs/man_gen.perl'
--- docs/man_gen.perl	2009-07-18 06:42:29 +0000
+++ docs/man_gen.perl	2009-09-29 05:01:12 +0000
@@ -57,9 +57,11 @@
       # We've reached the end of a comment block, try to find a function.
       my $name= "";
       my $func= "";
+      my @func_lines;
 
       while ($line= <>)
       {
+        chomp($line);
         if ($line=~ m/^$/)
         {
           last;
@@ -74,11 +76,11 @@
           $name= $1;
         }
 
-        chomp($line);
         $line=~ s/^ +/ /;
-        $func.= $line;
+        push(@func_lines, $line);
       }
 
+      $func= join(" ", @func_lines);
       if ($name)
       {
         # We have a function! Output a man page.

=== modified file 'libgearman-server/Makefile.am'
--- libgearman-server/Makefile.am	2009-09-24 23:43:15 +0000
+++ libgearman-server/Makefile.am	2009-09-29 05:01:12 +0000
@@ -81,7 +81,7 @@
 libgearman_server_la_LDFLAGS= \
 	-version-info \
 	$(GEARMAN_SERVER_LIBRARY_VERSION) \
-	$(LD_VERSION_SCRIPT)
+	$(LD_VERSION_SCRIPT_SERVER)
 
 libgearman_server_la_LIBADD= \
 	$(top_builddir)/libgearman/libgearman.la \

=== modified file 'libgearman-server/libgearman-server.ver'
--- libgearman-server/libgearman-server.ver	2009-09-24 23:43:15 +0000
+++ libgearman-server/libgearman-server.ver	2009-09-29 05:01:12 +0000
@@ -1,1 +1,1 @@
-libgearman-server_1 { global: *; };
+libgearman_server_0 { global: *; };

=== modified file 'libgearman/libgearman.ver'
--- libgearman/libgearman.ver	2009-06-14 22:16:21 +0000
+++ libgearman/libgearman.ver	2009-09-29 05:01:12 +0000
@@ -1,1 +1,1 @@
-libgearman_1 { global: *; };
+libgearman_2 { global: *; };