Skip to content

Commit

Permalink
patch #8333
Browse files Browse the repository at this point in the history
  • Loading branch information
spiralvoice committed Feb 23, 2014
1 parent fe04d7f commit 2e165df
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 0 deletions.
1 change: 1 addition & 0 deletions config/Makefile.config.in
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ RPMBUILD=@RPMBUILD@

CONFIGURE_ARGUMENTS=@CONFIGURE_ARGUMENTS@
CONFIGURE_RUN=@CONFIGURE_RUN@
DEVFLAGS=@DEVFLAGS@

prefix=@prefix@

Expand Down
16 changes: 16 additions & 0 deletions config/configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -339,8 +339,10 @@ FORCE_OCAML=no
FORCE_MINGW=no
PROFILE=no
DEBUG=no
DEV=no
GUI=no
CHECKBOUNDS=false
DEVFLAGS=

# ********** **********
# ********** Network and Feature configure switches and dependency **********
Expand Down Expand Up @@ -429,9 +431,15 @@ AC_ARG_ENABLE(profile,
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"])
Expand Down Expand Up @@ -776,6 +784,13 @@ if test "$DEBUG" = "yes"; then
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."
Expand Down Expand Up @@ -1577,6 +1592,7 @@ AC_SUBST(CC_VERSION)
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
Expand Down
1 change: 1 addition & 0 deletions distrib/ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ ChangeLog
=========

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)
Expand Down

0 comments on commit 2e165df

Please sign in to comment.