Merge branch 'develop' of mut-mut-scmv1.dev.parimutuel.local:p094212/cpp-pthread into develop

Author: Herbert KOELMAN

src/Makefile.in

@@ -18,7 +18,7 @@ CCC=@CXX@
 CXX=$CCC
 RANLIB=@RANLIB@
 RM=rm -f
-AR=@AR@
+AR=@AR@ @ARFLAGS@
 MV=@MV@
 
 BITS=@BITS@

src/configure

@@ -624,6 +624,7 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+ARFLAGS
 OBJECTS
 BITS
 EGREP
@@ -3843,13 +3844,17 @@ case "$CXX" in
     CPPFLAGS="-qlanglvl=extended0x:decltype:static_assert:rvaluereferences -qsourcetype=c++ $CPPFLAGS"
     CFLAGS="-bh:5 -qmaxmem=-1 -q$BITS $CFLAGS"
     CXXFLAGS="-O"
+    ARFLAGS="-X$bits"
+
     LDFLAGS="$LDFLAGS -brtl -bmaxdata:0x80000000"
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: using large memory model (maxdata:0x80000000), optimising level 2 (-O),using run-time link method (-brtl)" >&5
 $as_echo "using large memory model (maxdata:0x80000000), optimising level 2 (-O),using run-time link method (-brtl)" >&6; }
     ;;
   g++ | gcc)
     CPPFLAGS="-x c++ -std=c++11 -frtti $CPPFLAGS"
     CXXFLAGS="-O2"
+    ARFLAGS=""
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
   ;;

src/configure.ac

@@ -43,12 +43,14 @@ case "$CXX" in
     CPPFLAGS="-qlanglvl=extended0x:decltype:static_assert:rvaluereferences -qsourcetype=c++ $CPPFLAGS"
     CFLAGS="-bh:5 -qmaxmem=-1 -q$BITS $CFLAGS"
     CXXFLAGS="-O"
+    AC_SUBST(ARFLAGS,"-X$bits")
     LDFLAGS="$LDFLAGS -brtl -bmaxdata:0x80000000"
     AC_MSG_RESULT([using large memory model (maxdata:0x80000000), optimising level 2 (-O),using run-time link method (-brtl)])
     ;;
   g++ | gcc)
     CPPFLAGS="-x c++ -std=c++11 -frtti $CPPFLAGS"
     CXXFLAGS="-O2"
+    AC_SUBST(ARFLAGS,"")
     AC_MSG_RESULT([yes])
   ;;
   *)