Brian's c++/clang fixes, minor adjustments

.gitignore

@@ -13,6 +13,7 @@ config*
 *.ncb
 *.suo
 build-aux/
+rpm/spec
 stamp-h
 libtool.m4
 aclocal.m4

configure.ac

@@ -658,7 +658,7 @@ AC_ARG_WITH(libz,
 if test "$GCC" = "yes"
 then
     AM_CFLAGS="$AM_CFLAGS -Wall -Wno-unused"
-    if test "$ENABLED_DEBUG" = "no"
+    if test "$ax_enable_debug" = "no"
     then
         if test "$ENABLED_FASTMATH" = "yes"
         then
@@ -712,8 +712,7 @@ echo "   * C++ Compiler:              $CXX_VERSION"
 echo "   * C++ Flags:                 $CXXFLAGS"
 echo "   * CPP Flags:                 $CPPFLAGS"
 echo "   * LIB Flags:                 $LIB"
-echo "   * Assertions enabled:        $ac_cv_assert"
+echo "   * Debug enabled:             $ax_enable_debug"
-echo "   * Debug enabled:             $with_debug"
 echo "   * Warnings as failure:       $ac_cv_warnings_as_errors"
 echo 
 echo "   Features "

cyassl/test.h

@@ -201,7 +201,7 @@ static INLINE int mygetopt(int argc, char** argv, const char* optstring)
     }
 
     c  = *next++;
-    // The C++ strchr returns a different value
+    /* The C++ strchr can return a different value */
     cp = (char*)strchr(optstring, c);
 
     if (cp == NULL || c == ':') 

cyassl/version.h

@@ -0,0 +1,35 @@
+/* cyassl_version.h.in
+ *
+ * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
+ *
+ * This file is part of CyaSSL.
+ *
+ * CyaSSL is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * CyaSSL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define LIBCYASSL_VERSION_STRING "2.4.0"
+#define LIBCYASSL_VERSION_HEX 0x02004000
+
+#ifdef __cplusplus
+}
+#endif
+

m4/ax_harden_compiler_flags.m4

@@ -107,13 +107,11 @@
         AX_APPEND_COMPILE_FLAGS([-Werror],[ax_append_compile_cflags_extra])
         ])
 
-      AX_APPEND_COMPILE_FLAGS([-g])
       AS_IF([test "$ax_enable_debug" = "yes"], [
+        AX_APPEND_COMPILE_FLAGS([-g])
         AX_APPEND_COMPILE_FLAGS([-ggdb],,[$ax_append_compile_cflags_extra])
         AX_APPEND_COMPILE_FLAGS([-O0],,[$ax_append_compile_cflags_extra])
-        ],[
+        ],[])
-        AX_APPEND_COMPILE_FLAGS([-O2],,[$ax_append_compile_cflags_extra])
-        ])
 
       AX_APPEND_COMPILE_FLAGS([-fstack-check],,[$ax_append_compile_cflags_extra])
       AX_APPEND_COMPILE_FLAGS([-Wno-pragmas],,[$ax_append_compile_cflags_extra])
@@ -169,12 +167,11 @@
         AX_APPEND_COMPILE_FLAGS([-Werror],[ax_append_compile_cxxflags_extra])
         ])
 
-      AX_APPEND_COMPILE_FLAGS([-g],,[$ax_append_compile_cxxflags_extra])
       AS_IF([test "$ax_enable_debug" = "yes" ], [
+        AX_APPEND_COMPILE_FLAGS([-g],,[$ax_append_compile_cxxflags_extra])
         AX_APPEND_COMPILE_FLAGS([-O0],,[$ax_append_compile_cxxflags_extra])
         AX_APPEND_COMPILE_FLAGS([-ggdb],,[$ax_append_compile_cxxflags_extra])
         ],[
-        AX_APPEND_COMPILE_FLAGS([-O2],,[$ax_append_compile_cxxflags_extra])
         AX_APPEND_COMPILE_FLAGS([-D_FORTIFY_SOURCE=2],,[$ax_append_compile_cxxflags_extra])
         ])