znc: revert cmake build artifacts from makefile

Revert some cmake stuff that accidentially made it into the Makefile to
unbreak the build.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>

diff --git a/net/znc/Makefile b/net/znc/Makefile
index 2094c6effe76bed2837164a2f4f57eb09dfe4787..76c443c167206e00e4c6327f433e91a539009fe2 100644 (file)
--- a/net/znc/Makefile
+++ b/net/znc/Makefile
@@ -277,16 +277,6 @@ $(eval $(call webskin,ice))
 PKG_CONFIG_DEPENDS += $(patsubst %,CONFIG_PACKAGE_%,$(ZNC_MODULES))
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-CMAKE_OPTIONS += $(if $(CONFIG_ZNC_ICU), WANT_ICU=TRUE, WANT_ICU=FALSE) \
-       WANT_CYRUS=FALSE \
-       WANT_PERL=FALSE \
-       WANT_PYTHON=FALSE \
-       WANT_SWIG=FALSE \
-       WANT_TCL=FALSE \
-       WANT_OPENSSL=TRUE \
-       WANT_ZLIB=TRUE
 
 CONFIGURE_VARS += \
        CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin" \
@@ -294,6 +284,20 @@ CONFIGURE_VARS += \
        LDFLAGS="-nodefaultlibs -lc -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
        LIBS="-lstdc++ -lm -lssl -lcrypto $(LIBGCC_S) -lc"
 
+CONFIGURE_ARGS += \
+       $(if $(CONFIG_ZNC_ICU), --enable-charset, --disable-charset) \
+       --disable-cyrus \
+       --disable-debug \
+       --enable-largefile \
+       --disable-perl \
+       --enable-poll \
+       --disable-python \
+       --enable-ssl \
+       --disable-swig \
+       --disable-tcl \
+       --enable-tdns \
+       --enable-zlib
+
 define Build/Configure
        $(call Build/Configure/Default,)
        $(call libtool_disable_rpath)