X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=net%2Fweechat%2FMakefile;h=67ef94ddce855d0295926416718266dbb6c3556d;hb=7005afba58ba2353eda7d870e0bcd2328408a732;hp=77b876da47efd977caff04f4648cade74e4da512;hpb=76e8333cc6854dd06795406660b25e08d2380fd5;p=packages.git

diff --git a/net/weechat/Makefile b/net/weechat/Makefile
index 77b876da4..67ef94ddc 100644
--- a/net/weechat/Makefile
+++ b/net/weechat/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=weechat
-PKG_VERSION:=0.2.5
-PKG_RELEASE:=2
+PKG_VERSION:=0.2.6
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://weechat.flashtux.org/download/
-PKG_MD5SUM:=42f96620c3b2fd3dca9768d9ce16dd06
+PKG_MD5SUM:=ccdecf663b0050a23049acb4b9a76193
 
 PKG_FIXUP = libtool
 
@@ -78,15 +78,20 @@ CONFIGURE_ARGS+= \
 	--disable-perl \
 	--disable-python \
 	--disable-ruby \
+	LUACONFIG="" \
 
 CONFIGURE_VARS+= \
 	LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib/libiconv/lib" \
 
-ifndef ($(SDK)$(CONFIG_PACKAGE_weechat-mod-lua),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_weechat-mod-lua),)
   CONFIGURE_ARGS+= \
 	--enable-lua \
+	--enable-plugins \
+	--with-plugins="lua" \
 	--with-lua-inc="$(STAGING_DIR)/usr/include" \
-	--with-lua-lib="$(STAGING_DIR)/usr/lib"
+	--with-lua-lib="$(STAGING_DIR)/usr/lib" \
+	LUA_CFLAGS="-I$(STAGING_DIR)/usr/include/"
+	LUA_LFLAGS="-L$(STAGING_DIR)/usr/lib -llualib50 -llua50"
   CONFIGURE_VARS+= \
 	LIBS="-ldl -lm"
 else
@@ -95,7 +100,11 @@ else
 endif
 
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(LUA_FLAGS) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		LUACONFIG="" \
+		all install
 endef
 
 define Package/weechat/install