summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-01-27 19:09:11 +0300
committerAndrei Karas <akaras@inbox.ru>2014-01-27 19:09:11 +0300
commitef4660e60014af6d83ff3675ceed1f316e38bf0c (patch)
tree7f139ba721930fd2557db978f50fe62b79fa6bf3
parent9d885eab232de0acdf95405a996ed749fdbeea54 (diff)
downloadmv-ef4660e60014af6d83ff3675ceed1f316e38bf0c.tar.gz
mv-ef4660e60014af6d83ff3675ceed1f316e38bf0c.tar.bz2
mv-ef4660e60014af6d83ff3675ceed1f316e38bf0c.tar.xz
mv-ef4660e60014af6d83ff3675ceed1f316e38bf0c.zip
Mark external guichan usage as depricated.
Add warning about using external guichan.
-rwxr-xr-xconfigure.ac2
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/localconsts.h5
3 files changed, 7 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index b44f12e33..bbb44d791 100755
--- a/configure.ac
+++ b/configure.ac
@@ -250,7 +250,7 @@ fi
AM_CONDITIONAL(USE_OPENGL, test x$with_opengl = xyes)
# Option to enable internal guichan
-AC_ARG_WITH(internalguichan,[ --without-internalguichan don't use internal guichan ] )
+AC_ARG_WITH(internalguichan,[ --without-internalguichan DEPRICATED. don't use internal guichan ] )
if test "x$with_internalguichan" == "xno"; then
with_internalguichan=no
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f6550de05..059eef64f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -47,7 +47,7 @@ ELSEIF (CMAKE_SYSTEM_NAME STREQUAL Linux)
SET(EXTRA_LIBRARIES rt)
ENDIF()
-SET(FLAGS "${FLAGS} -DUSE_MUMBLE")
+SET(FLAGS "${FLAGS} -DUSE_MUMBLE -DUSE_INTERNALGUICHAN")
IF (WITH_OPENGL)
FIND_PACKAGE(OpenGL REQUIRED)
diff --git a/src/localconsts.h b/src/localconsts.h
index 92c36d92a..cf6194c9e 100644
--- a/src/localconsts.h
+++ b/src/localconsts.h
@@ -33,6 +33,11 @@
#endif
#endif
+#ifndef USE_INTERNALGUICHAN
+#warning using depricated way for linking with guichan. \
+ Please removed configure flag --without-internalguichan
+#endif
+
#if !defined(__GXX_EXPERIMENTAL_CXX0X__)
#undef nullptr
#define nullptr 0