bk commit into 5.0 tree (dkatz:1.2481) BUG#25061

[damien]

Below is the list of changes that have just been committed into a local
5.0 repository of dkatz. When dkatz does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-07-26 23:39:53-04:00, dkatz@stripped +1 -0
  Bug #25061 Build failure on HP/UX similar to BUG#20507
  
  Added libCsup as a mysql library dependency on hpux11.
  
  This means any projects statically linking to our libraries using the HPUX11 compiler will need to add the -lCSup option to their build link options. If they use the mysql_config tool this will happen automatically.
  
  Projects that dynamically link to libmysqlclient will continue to work without any modifications.
  
  Library libCsup is a C++ runtime library needed for yassl support when built with the hpux11 C/C++ compiler. The first attempts to fix this bug were to remove the yassl dependencies on libCsup. We tried removing all pure virtual functions and other hacks, but the dependency remained. The only other options left involve extensive restructuring of the yassl library.
      

  config/ac-macros/yassl.m4@stripped, 2007-07-26 23:39:50-04:00, dkatz@stripped +9 -0
    Added libCsup as a mysql library dependency on hpux11 when building yassl.

diff -Nrup a/config/ac-macros/yassl.m4 b/config/ac-macros/yassl.m4
--- a/config/ac-macros/yassl.m4	2006-09-21 05:37:05 -04:00
+++ b/config/ac-macros/yassl.m4	2007-07-26 23:39:50 -04:00
@@ -31,6 +31,15 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [
         AC_MSG_NOTICE([disabling inlining for yassl/taocrypt/src/])
         ;;
     esac
+    case $SYSTEM_TYPE in
+      *hpux11*)
+      if test "$ac_cv_prog_gcc" = "no"
+      then
+        # yass compiled with the HPUX 11.0 compiler requires a special lib
+        NON_THREADED_LIBS="$NON_THREADED_LIBS -lCsup"
+      fi
+        ;;
+    esac
     AC_SUBST([yassl_taocrypt_extra_cxxflags])
     # Link extra/yassl/include/openssl subdir to include/
     yassl_h_ln_cmd="\$(LN) -s \$(top_srcdir)/extra/yassl/include/openssl openssl"