Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed #193 by reverting some changes from a075324.

Browse Source
This commit is contained in:
aleos89 2015-01-08 14:21:12 -05:00
parent 9021cb6349
commit 5759f5fb93
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
configure vendored
View File

@ -2860,13 +2860,13 @@ if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then elif test $ac_cv_prog_cc_g = yes; then
if test "$GCC" = yes; then if test "$GCC" = yes; then
CFLAGS="-O3" CFLAGS="-g -O2"
else else
CFLAGS= CFLAGS="-g"
fi fi
else else
if test "$GCC" = yes; then if test "$GCC" = yes; then
CFLAGS="-O3" CFLAGS="-O2"
else else
CFLAGS= CFLAGS=
fi fi
@ -6297,6 +6297,10 @@ fi
# Debug # Debug
# #
case $enable_debug in case $enable_debug in
"no")
# default value
CPPFLAGS="$CPPFLAGS"
;;
"yes") "yes")
if test $ac_cv_prog_cc_g = yes; then if test $ac_cv_prog_cc_g = yes; then
CPPFLAGS="$CPPFLAGS -g -DDEBUG" CPPFLAGS="$CPPFLAGS -g -DDEBUG"
@ -6309,15 +6313,12 @@ case $enable_debug in
"gdb") "gdb")
if test $ac_cv_prog_cc_g = yes; then if test $ac_cv_prog_cc_g = yes; then
CPPFLAGS="$CPPFLAGS -ggdb -DDEBUG" CPPFLAGS="$CPPFLAGS -ggdb -DDEBUG"
LDFLAGS="$LDFLAGS -ggdb" LDFLAGS="$LDFLAGS -g"
else else
echo "error: --enable-debug flag=$enable_debug entered but the compiler does not support -g" echo "error: --enable-debug flag=$enable_debug entered but the compiler does not support -g"
exit 1 exit 1
fi fi
;; ;;
*) # default value
CPPFLAGS="$CPPFLAGS"
;;
esac esac
# #
@ -7378,8 +7379,8 @@ else
$as_echo "no" >&6; } $as_echo "no" >&6; }
fi fi
CFLAGS_AR="$OPT_LTO_AR $CFLAGS"
CFLAGS="$OPT_LTO $CFLAGS" CFLAGS="$OPT_LTO $CFLAGS"
CFLAGS_AR="$OPT_LTO_AR $CFLAGS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: Configure finish" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: Configure finish" >&5

11
configure.in
View File

@ -962,6 +962,10 @@ fi
# Debug # Debug
# #
case $enable_debug in case $enable_debug in
"no")
# default value
CPPFLAGS="$CPPFLAGS"
;;
"yes") "yes")
if test $ac_cv_prog_cc_g = yes; then if test $ac_cv_prog_cc_g = yes; then
CPPFLAGS="$CPPFLAGS -g -DDEBUG" CPPFLAGS="$CPPFLAGS -g -DDEBUG"
@ -974,15 +978,12 @@ case $enable_debug in
"gdb") "gdb")
if test $ac_cv_prog_cc_g = yes; then if test $ac_cv_prog_cc_g = yes; then
CPPFLAGS="$CPPFLAGS -ggdb -DDEBUG" CPPFLAGS="$CPPFLAGS -ggdb -DDEBUG"
LDFLAGS="$LDFLAGS -ggdb" LDFLAGS="$LDFLAGS -g"
else else
echo "error: --enable-debug flag=$enable_debug entered but the compiler does not support -g" echo "error: --enable-debug flag=$enable_debug entered but the compiler does not support -g"
exit 1 exit 1
fi fi
;; ;;
*) # default value
CPPFLAGS="$CPPFLAGS"
;;
esac esac
# #
@ -1260,8 +1261,8 @@ else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
CFLAGS_AR="$OPT_LTO_AR $CFLAGS"
CFLAGS="$OPT_LTO $CFLAGS" CFLAGS="$OPT_LTO $CFLAGS"
CFLAGS_AR="$OPT_LTO_AR $CFLAGS"
AC_SUBST([CFLAGS_AR]) AC_SUBST([CFLAGS_AR])
AC_MSG_NOTICE([Configure finish]) AC_MSG_NOTICE([Configure finish])