Просмотр исходного кода

Added a configure option for vip features

Added the new option to the CI matrix
Lemongrass3110 8 лет назад
Родитель
Сommit
3108bb1265
3 измененных файлов с 78 добавлено и 2 удалено
  1. 5 2
      .travis.yml
  2. 36 0
      configure
  3. 37 0
      configure.in

+ 5 - 2
.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

+ 36 - 0
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
 #

+ 37 - 0
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
 #