summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2016-08-04 11:13:42 +0200
committerTobias Klauser <tklauser@distanz.ch>2016-08-04 11:13:42 +0200
commite6b7339a68ce57244117e2470f87ff581520cfc7 (patch)
tree159f2c034dbe89425069ca158f457a90ec31f1c7 /.travis.yml
parent820e85f9f29513860092a02599efa529c00a1089 (diff)
build: configure: Use command line options to disable optional libraries
Make the configure script accept command line options similar to the autotools generated configure. Implement --disable-geoip and --disable-zlib and use the to replace the respective DISABLE_* variables introduced in 0349b93a6689a ("build: configure: Allow to disable support for libgeoip and zlib"). Also update INSTALL and the travis CI configuration accordingly. Based on previous work by Vadim Kochan. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 3c66eed..fb7dd31 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,6 +31,6 @@ addons:
script:
- CC=$CC ./configure && make CC=$CC
- - CC=$CC DISABLE_GEOIP=1 ./configure && make clean && make CC=$CC
- - CC=$CC DISABLE_ZLIB=1 ./configure && make clean && make CC=$CC
- - CC=$CC DISABLE_GEOIP=1 DISABLE_ZLIB=1 ./configure && make clean && make CC=$CC
+ - CC=$CC ./configure --disable-geoip && make clean && make CC=$CC
+ - CC=$CC ./configure --disable-zlib && make clean && make CC=$CC
+ - CC=$CC ./configure --disable-geoip --disable-zlib && make clean && make CC=$CC