From 3108bb12652972a2bc18aaafb4c781c6d2bb9d6d Mon Sep 17 00:00:00 2001 From: Lemongrass3110 Date: Tue, 18 Oct 2016 22:02:08 +0200 Subject: [PATCH] Added a configure option for vip features Added the new option to the CI matrix --- .travis.yml | 7 +++++-- configure | 36 ++++++++++++++++++++++++++++++++++++ configure.in | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 452a579aec..9fc6129b32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,8 +41,11 @@ env: - DB_PASS="ragnarok" - PACKETDBVER=45 matrix: - - CONFIGURE_FLAGS="--enable-prere=no" - - CONFIGURE_FLAGS="--enable-prere=yes" + matrix: + - CONFIGURE_FLAGS="--enable-prere=no --enable-vip=no" + - CONFIGURE_FLAGS="--enable-prere=yes --enable-vip=no" + - CONFIGURE_FLAGS="--enable-prere=no --enable-vip=yes" + - CONFIGURE_FLAGS="--enable-prere=yes --enable-vip=yes" notifications: email: false diff --git a/configure b/configure index ac712aadba..c39bcf3a43 100755 --- a/configure +++ b/configure @@ -696,6 +696,7 @@ enable_manager enable_packetver enable_debug enable_prere +enable_vip enable_warn enable_buildbot enable_rdtsc @@ -1335,6 +1336,8 @@ Optional Features: (available options: yes, no, gdb) --enable-prere[=ARG] Compiles serv in prere mode. (disabled by default) (available options: yes, no) + --enable-vip[=ARG] Compiles serv with vip features. (disabled by default) + (available options: yes, no) --enable-warn[=ARG] Compiles with warnings. (disabled by default) (available options: yes, no, extra) --enable-buildbot[=ARG] (available options: yes, no) @@ -3506,6 +3509,26 @@ fi +# +# VIP +# +# Check whether --enable-vip was given. +if test "${enable_vip+set}" = set; then : + enableval=$enable_vip; + enable_vip="$enableval" + case $enableval in + "no");; + "yes");; + *) as_fn_error $? "invalid argument --enable-vip=$enableval... stopping" "$LINENO" 5;; + esac + +else + enable_vip="no" + +fi + + + # # warn # @@ -6334,6 +6357,19 @@ case $enable_prere in ;; esac +# +# VIP +# +case $enable_vip in + "no") + # default value + CPPFLAGS="$CPPFLAGS" + ;; + "yes") + CPPFLAGS="$CPPFLAGS -DVIP_ENABLE" + ;; +esac + # # Warnings # diff --git a/configure.in b/configure.in index 3d55d504f0..9ce551c468 100644 --- a/configure.in +++ b/configure.in @@ -100,6 +100,30 @@ AC_ARG_ENABLE( ) +# +# VIP +# +AC_ARG_ENABLE( + [vip], + AC_HELP_STRING( + [--enable-vip@<:@=ARG@:>@], + [ + Compiles serv with vip features. (disabled by default) + (available options: yes, no) + ] + ), + [ + enable_vip="$enableval" + case $enableval in + "no");; + "yes");; + *) AC_MSG_ERROR([[invalid argument --enable-vip=$enableval... stopping]]);; + esac + ], + [enable_vip="no"] +) + + # # warn # @@ -999,6 +1023,19 @@ case $enable_prere in ;; esac +# +# VIP +# +case $enable_vip in + "no") + # default value + CPPFLAGS="$CPPFLAGS" + ;; + "yes") + CPPFLAGS="$CPPFLAGS -DVIP_ENABLE" + ;; +esac + # # Warnings #