diff --git a/.gitignore b/.gitignore index 6d1958983..ee65c0856 100644 --- a/.gitignore +++ b/.gitignore @@ -95,6 +95,7 @@ deps/memcached/memcached-1.4.20/ #libconfig deps/libconfig/libconfig-1.4.9/ +deps/libconfig/libconfig-1.7.2/ #libmicrohttpd deps/libmicrohttpd/libmicrohttpd-0.9.55/ diff --git a/deps/Makefile b/deps/Makefile index a474a35eb..e71b8cd57 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -121,8 +121,8 @@ sqlite3/sqlite3/sqlite3.o: sqlite3: sqlite3/sqlite3/sqlite3.o libconfig/libconfig/lib/.libs/libconfig++.a: - cd libconfig && rm -rf libconfig-1.4.9 - cd libconfig && tar -zxf libconfig-1.4.9.tar.gz + cd libconfig && rm -rf libconfig-1.7.2 + cd libconfig && tar -zxf libconfig-1.7.2.tar.gz cd libconfig/libconfig && ./configure --disable-examples cd libconfig/libconfig && CC=${CC} CXX=${CXX} ${MAKE} diff --git a/deps/libconfig/libconfig b/deps/libconfig/libconfig index 30a4423c3..140442ff4 120000 --- a/deps/libconfig/libconfig +++ b/deps/libconfig/libconfig @@ -1 +1 @@ -libconfig-1.4.9 \ No newline at end of file +libconfig-1.7.2 \ No newline at end of file diff --git a/deps/libconfig/libconfig-1.7.2.tar.gz b/deps/libconfig/libconfig-1.7.2.tar.gz new file mode 100644 index 000000000..7baedb959 Binary files /dev/null and b/deps/libconfig/libconfig-1.7.2.tar.gz differ diff --git a/lib/Makefile b/lib/Makefile index e4eb88079..bf3e7d9ba 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -11,7 +11,7 @@ MARIADB_IDIR=$(MARIADB_PATH)/include JEMALLOC_PATH=$(DEPS_PATH)/jemalloc/jemalloc JEMALLOC_IDIR=$(JEMALLOC_PATH)/include/jemalloc -LIBCONFIG_PATH=$(DEPS_PATH)/libconfig/libconfig-1.4.9 +LIBCONFIG_PATH=$(DEPS_PATH)/libconfig/libconfig LIBCONFIG_IDIR=-I$(LIBCONFIG_PATH)/lib #INJECTION_PATH=$(DEPS_PATH)/libinjection diff --git a/src/Makefile b/src/Makefile index d305edafe..5e8db4a07 100644 --- a/src/Makefile +++ b/src/Makefile @@ -17,7 +17,7 @@ JEMALLOC_PATH=$(DEPS_PATH)/jemalloc/jemalloc JEMALLOC_IDIR=$(JEMALLOC_PATH)/include/jemalloc JEMALLOC_LDIR=$(JEMALLOC_PATH)/lib -LIBCONFIG_PATH=$(DEPS_PATH)/libconfig/libconfig-1.4.9 +LIBCONFIG_PATH=$(DEPS_PATH)/libconfig/libconfig LIBCONFIG_IDIR=-I$(LIBCONFIG_PATH)/lib LIBCONFIG_LDIR=-L$(LIBCONFIG_PATH)/lib/.libs