[Mldonkey-commits] mldonkey config/Makefile.config.in config/Makef...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/08/16 19:08:23

Modified files:
        config         : Makefile.config.in Makefile.in aclocal.m4 
                         configure.in 
        distrib        : ChangeLog 

Log message:
        patch #5313

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/Makefile.config.in?cvsroot=mldonkey&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/Makefile.in?cvsroot=mldonkey&r1=1.168&r2=1.169
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/aclocal.m4?cvsroot=mldonkey&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.273&r2=1.274
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.961&r2=1.962

Patches:
Index: config/Makefile.config.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/Makefile.config.in,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- config/Makefile.config.in   15 May 2006 17:43:09 -0000      1.60
+++ config/Makefile.config.in   16 Aug 2006 19:08:21 -0000      1.61
@@ -35,6 +35,7 @@
 address@hidden@
 address@hidden@
 address@hidden@
address@hidden@
 address@hidden@
 address@hidden@
 address@hidden@

Index: config/Makefile.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/Makefile.in,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -b -r1.168 -r1.169
--- config/Makefile.in  15 Aug 2006 12:37:18 -0000      1.168
+++ config/Makefile.in  16 Aug 2006 19:08:21 -0000      1.169
@@ -293,7 +293,7 @@
 MAIN_SRCS=$(COMMON)/commonMain.ml
 
 ifeq ("$(DONKEY_SUI)", "yes")
-  CRYPTOPP_LIBS_flags += -cc '$(CXX) $(CXXFLAGS)' -ccopt 
-fno-omit-frame-pointer -ccopt -mno-omit-leaf-frame-pointer
+  CRYPTOPP_LIBS_flags += -cc '$(CXX) $(CXXFLAGS)' -ccopt '$(CRYPTOPPFLAGS)'
   DONKEY_SRCS += $(LIB)/CryptoPP.cc $(LIB)/CryptoPP_stubs.c 
$(SRC_DONKEY)/donkeySui1.ml $(SRC_DONKEY)/donkeySui.ml
 else
   DONKEY_SRCS += $(SRC_DONKEY)/donkeySui2.ml $(SRC_DONKEY)/donkeySui.ml
@@ -1952,7 +1952,7 @@
        $(OCAMLC) -verbose -ccopt "-I $(OCAML_SRC)/byterun -o $*.o" -ccopt 
"$(CFLAGS)" $(LIBS_flags) -c $<
 
 .cc.o :
-       $(CXX) $(CXXFLAGS) -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer 
-o $*.o "-I$(OCAMLLIB)" -c $<
+       $(CXX) $(CXXFLAGS) $(CRYPTOPPFLAGS) -o $*.o "-I$(OCAMLLIB)" -c $<
 
 .cmo.byte:
        $(OCAMLC) -o $*.byte $(LIBS) $<

Index: config/aclocal.m4
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/aclocal.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- config/aclocal.m4   24 Apr 2005 19:44:16 -0000      1.4
+++ config/aclocal.m4   16 Aug 2006 19:08:21 -0000      1.5
@@ -1131,3 +1131,44 @@
 AC_LANG_RESTORE
 ])dnl ACX_PTHREAD
 
+AC_DEFUN(ACX_CHECK_CC_FLAGS,
+[
+AC_REQUIRE([AC_PROG_CC])
+AC_CACHE_CHECK(whether ${CC} accepts $1, ac_$2,
+[echo 'void f(){}' > conftest.c
+if test -z "`${CC} $1 -c conftest.c 2>&1`"; then
+        ac_$2=yes
+else
+        ac_$2=no
+fi
+rm -f conftest*
+])
+if test "$ac_$2" = yes; then
+        :
+        $3
+else
+        :
+        $4
+fi
+])
+
+AC_DEFUN(ACX_CHECK_CXX_FLAGS,
+[
+AC_REQUIRE([AC_PROG_CXX])
+AC_CACHE_CHECK(whether ${CXX} accepts $1, ac_$2,
+[echo 'void f(){}' > conftest.cpp
+if test -z "`${CXX} $1 -c conftest.cpp 2>&1`"; then
+        ac_$2=yes
+else
+        ac_$2=no
+fi
+rm -f conftest*
+])
+if test "$ac_$2" = yes; then
+        :
+        $3
+else
+        :
+        $4
+fi
+])
\ No newline at end of file

Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -b -r1.273 -r1.274
--- config/configure.in 15 Aug 2006 11:35:12 -0000      1.273
+++ config/configure.in 16 Aug 2006 19:08:22 -0000      1.274
@@ -896,6 +896,7 @@
 echo -e "---------------------------------------------\n"
 
 CXX_VERSION=
+CRYPTOPPFLAGS=
 echo "--------------------------------------"
 echo "     Checking activated networks."
 echo "--------------------------------------"
@@ -916,6 +917,8 @@
          DONKEY_SUI=no
        else
          AC_MSG_RESULT(yes)
+         ACX_CHECK_CXX_FLAGS(-fno-omit-frame-pointer,no_omit_frame_pointer, 
CRYPTOPPFLAGS="-fno-omit-frame-pointer")
+         
ACX_CHECK_CXX_FLAGS(-mno-omit-leaf-frame-pointer,no_omit_leaf_frame_pointer, 
CRYPTOPPFLAGS="$CRYPTOPPFLAGS -mno-omit-leaf-frame-pointer")
          CXX=$NEWCXX
          CXX_VERSION=`$CXX -dumpversion`
          DONKEY_SUI_FILE=DonkeySui1
@@ -1264,6 +1267,7 @@
 AC_SUBST(FASTTRACK)
 AC_SUBST(DONKEY)
 AC_SUBST(DONKEY_SUI)
+AC_SUBST(CRYPTOPPFLAGS)
 AC_SUBST(DONKEY_SUI_FILE)
 AC_SUBST(DONKEY_SERVER)
 AC_SUBST(GUI)

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.961
retrieving revision 1.962
diff -u -b -r1.961 -r1.962
--- distrib/ChangeLog   15 Aug 2006 12:37:55 -0000      1.961
+++ distrib/ChangeLog   16 Aug 2006 19:08:22 -0000      1.962
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/08/16
+5313: CryptoPP: Check for g++ capabilities
+
 2006/08/15
 5308: CryptoPP: Fix infinite loop when re-creating private key fails
 5307: CryptoPP: Deactivate compiler option -momit-leaf-frame-pointer