bk commit into 5.0 tree (tnurnberg:1.2608) BUG#29645

[Tatjana A Nuernberg]

Below is the list of changes that have just been committed into a local
5.0 repository of tnurnberg.  When tnurnberg 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, 2008-02-25 07:50:55+01:00, tnurnberg@stripped +1 -0
  Bug#29645: Link failure when using the embedded server
  
  mysql_config --cflags gave a flag that forced the HP/UX
  C++ compiler into C-mode; as a result, C++ sources could
  not be compiled correctly.
  
  We now filter out the offending flag (like we do for Sun)
  so that --cflags will work for both C and C++.

  scripts/mysql_config.sh@stripped, 2008-02-25 07:50:54+01:00, tnurnberg@stripped +3 -1
    Add -AC99 (for HP/UX) to the list of flags we need to remove
    from "mysql_config --cflags" so they work for C and C++ both. 

diff -Nrup a/scripts/mysql_config.sh b/scripts/mysql_config.sh
--- a/scripts/mysql_config.sh	2007-09-28 18:52:17 +02:00
+++ b/scripts/mysql_config.sh	2008-02-25 07:50:54 +01:00
@@ -113,10 +113,12 @@ include="-I$pkgincludedir"
 # Remove some options that a client doesn't have to care about
 # FIXME until we have a --cxxflags, we need to remove -Xa
 #       and -xstrconst to make --cflags usable for Sun Forte C++
+# FIXME until we have a --cxxflags, we need to remove -AC99
+#       to make --cflags usable for HP C++ (aCC)
 for remove in DDBUG_OFF DSAFEMALLOC USAFEMALLOC DSAFE_MUTEX \
               DPEDANTIC_SAFEMALLOC DUNIV_MUST_NOT_INLINE DFORCE_INIT_OF_VARS \
               DEXTRA_DEBUG DHAVE_purify O 'O[0-9]' 'xO[0-9]' 'W[-A-Za-z]*' \
-              Xa xstrconst "xc99=none" \
+              Xa xstrconst "xc99=none" AC99 \
               unroll2 ip mp restrict
 do
   # The first option we might strip will always have a space before it because