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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       14/02/23 18:18:46

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

Log message:
        patch #8333

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/Makefile.config.in?cvsroot=mldonkey&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.360&r2=1.361
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1592&r2=1.1593

Patches:
Index: config/Makefile.config.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/Makefile.config.in,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- config/Makefile.config.in   1 Nov 2010 17:19:23 -0000       1.66
+++ config/Makefile.config.in   23 Feb 2014 18:18:46 -0000      1.67
@@ -87,6 +87,7 @@
 
 address@hidden@
 address@hidden@
address@hidden@
 
 address@hidden@
 

Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -b -r1.360 -r1.361
--- config/configure.in 23 Feb 2014 18:10:54 -0000      1.360
+++ config/configure.in 23 Feb 2014 18:18:46 -0000      1.361
@@ -339,8 +339,10 @@
 FORCE_MINGW=no
 PROFILE=no
 DEBUG=no
+DEV=no
 GUI=no
 CHECKBOUNDS=false
+DEVFLAGS=
 
 # **********                                                                   
               **********
 # **********                Network and Feature configure switches and 
dependency             **********
@@ -429,9 +431,15 @@
 AC_ARG_ENABLE(debug,
   AS_HELP_STRING([--enable-debug], [compile with debugging information]),
   [DEBUG="$enableval"])
+AC_ARG_ENABLE(dev,
+  AS_HELP_STRING([--enable-dev], [development mode (enables debug and annot 
information)]),
+  [DEV="$enableval"])
 if test "$PROFILE" = "yes"; then
   DEBUG="yes"
 fi
+if test "$DEV" = "yes"; then
+  DEBUG="yes"
+fi
 AC_ARG_ENABLE(gui,
   AS_HELP_STRING([--disable-gui], [disable GUI build (default)]),
   [GUI="$enableval"])
@@ -776,6 +784,13 @@
     OCAMLOPT="$OCAMLOPT -g"
 fi
 
+if test "$DEV" = "yes"; then
+  case "$OCAMLVERSION" in
+    3.*) DEVFLAGS="-annot" ;;
+    *) DEVFLAGS="-annot -bin-annot" ;;
+  esac
+fi
+
 echo ""
 echo "----------------------------------"
 echo "     Checking system headers."
@@ -1577,6 +1592,7 @@
 AC_SUBST(CXX_VERSION)
 AC_SUBST(CONFIGURE_ARGUMENTS)
 AC_SUBST(CONFIGURE_RUN)
+AC_SUBST(DEVFLAGS)
 
 AUTOCONF=../src/utils/lib/autoconf.ml
 GTK_AUTOCONF=../src/utils/lib/gAutoconf.ml

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1592
retrieving revision 1.1593
diff -u -b -r1.1592 -r1.1593
--- distrib/ChangeLog   23 Feb 2014 18:17:58 -0000      1.1592
+++ distrib/ChangeLog   23 Feb 2014 18:18:46 -0000      1.1593
@@ -15,6 +15,7 @@
 =========
 
 2014/02/23:
+8333: Config: New configure option --enable-dev (ygrek)
 8332: New option "all" for command verify_chunks (ygrek)
 8331: printf2: add ?exn parameter for easy exception printing (ygrek)
 8330: printexc2: reduce complexity, drop unused code (ygrek)