* Updated configure script:
- small correction to the help text of --with-mysql and --with-pcre - added the -Wno-switch compiler option to suppress the "enumeration value '%s' not handled in switch" warnings git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11695 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
FlavioJS
parent
ea9b71e78b
commit
a7c2a09d23
@ -3,6 +3,11 @@ Date Added
|
||||
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
|
||||
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
|
||||
|
||||
2007/11/08
|
||||
* Updated configure script:
|
||||
- small correction to the help text of --with-mysql and --with-pcre
|
||||
- added the -Wno-switch compiler option to suppress the
|
||||
"enumeration value '%s' not handled in switch" warnings [FlavioJS]
|
||||
2007/11/07
|
||||
* Some updates on the mail system packets [Zephyrus]
|
||||
- Corrected the mail database structure on main.sql
|
||||
|
||||
53
configure
vendored
53
configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Revision: 11312 .
|
||||
# From configure.in Revision: 11695.
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61.
|
||||
#
|
||||
@ -1252,10 +1252,12 @@ if test -n "$ac_init_help"; then
|
||||
Optional Packages:
|
||||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||||
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
||||
--with-mysql=[ARG] use MySQL client library [default=yes], optionally
|
||||
specify path to the mysql_config executable
|
||||
--with-pcre=[ARG] use PCRE library [default=yes], optionally specify
|
||||
the root directory path of pcre installation
|
||||
--with-mysql[=ARG] use MySQL client library, optionally specify path to
|
||||
the mysql_config executable (by default mysql is
|
||||
used if found)
|
||||
--with-pcre[=ARG] use PCRE library, optionally specify the root
|
||||
directory path of pcre installation (by default pcre
|
||||
is used if found)
|
||||
--with-zlib=DIR root directory path of zlib installation (defaults
|
||||
to /usr/local or /usr if not found in /usr/local)
|
||||
|
||||
@ -3788,6 +3790,47 @@ fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
|
||||
|
||||
{ echo "$as_me:$LINENO: checking whether $CC supports -Wno-switch" >&5
|
||||
echo $ECHO_N "checking whether $CC supports -Wno-switch... $ECHO_C" >&6; }
|
||||
OLD_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -Wno-switch"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
int foo;
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (ac_try="$ac_compile"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
(eval "$ac_compile") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } && {
|
||||
test -z "$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest.$ac_objext; then
|
||||
{ echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6; }
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
CFLAGS="$OLD_CFLAGS"
|
||||
|
||||
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
|
||||
|
||||
###############################################################################
|
||||
# Checks for libraries and header files.
|
||||
|
||||
|
||||
23
configure.in
23
configure.in
@ -2,7 +2,7 @@
|
||||
# Process this file with autoconf to produce a configure script.
|
||||
|
||||
AC_INIT(eAthena)
|
||||
AC_REVISION($Revision$)
|
||||
AC_REVISION($Revision: 11695$)
|
||||
AC_PREREQ([2.61])
|
||||
AC_CONFIG_SRCDIR([src/common/cbasetypes.h])
|
||||
AC_CONFIG_FILES([Makefile src/common/Makefile])
|
||||
@ -17,8 +17,8 @@ AC_CONFIG_FILES([src/map/Makefile src/plugins/Makefile src/tool/Makefile])
|
||||
AC_ARG_WITH(
|
||||
[mysql],
|
||||
AC_HELP_STRING(
|
||||
[--with-mysql=@<:@ARG@:>@],
|
||||
[use MySQL client library @<:@default=yes@:>@, optionally specify path to the mysql_config executable]
|
||||
[--with-mysql@<:@=ARG@:>@],
|
||||
[use MySQL client library, optionally specify path to the mysql_config executable (by default mysql is used if found)]
|
||||
),
|
||||
[
|
||||
if test "$withval" = "no" ; then
|
||||
@ -41,8 +41,8 @@ AC_ARG_WITH(
|
||||
AC_ARG_WITH(
|
||||
[pcre],
|
||||
AC_HELP_STRING(
|
||||
[--with-pcre=@<:@ARG@:>@],
|
||||
[use PCRE library @<:@default=yes@:>@, optionally specify the root directory path of pcre installation]
|
||||
[--with-pcre@<:@=ARG@:>@],
|
||||
[use PCRE library, optionally specify the root directory path of pcre installation (by default pcre is used if found)]
|
||||
),
|
||||
[
|
||||
if test "$withval" = "no" ; then
|
||||
@ -146,6 +146,19 @@ AC_COMPILE_IFELSE(
|
||||
)
|
||||
|
||||
|
||||
AC_MSG_CHECKING([whether $CC supports -Wno-switch])
|
||||
OLD_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -Wno-switch"
|
||||
AC_COMPILE_IFELSE(
|
||||
[int foo;],
|
||||
[AC_MSG_RESULT([yes])],
|
||||
[
|
||||
AC_MSG_RESULT([no])
|
||||
CFLAGS="$OLD_CFLAGS"
|
||||
]
|
||||
)
|
||||
|
||||
|
||||
###############################################################################
|
||||
# Checks for libraries and header files.
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user