gsmlib: disable NLS

It's not wanted, so add "--disable-nls" to override user selecting
CONFIG_BUILD_NLS.

This also updates 01-update-autotools.patch to make these disappear:

ERROR: Use of AM_GNU_GETTEXT without [external] argument is no longer supported.

Makefile.am:21: warning: 'intl' should not be in SUBDIRS when AM_GNU_GETTEXT([external]) is used

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>

diff --git a/libs/gsmlib/Makefile b/libs/gsmlib/Makefile
index 7dae960939417f792f096834ac27c6e66d0d9c51..9bc4324ce0da5ce66d528092749e76058f21fbd4 100644 (file)
--- a/libs/gsmlib/Makefile
+++ b/libs/gsmlib/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gsmlib
 PKG_VERSION:=1.10-20140304
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/vbouchaud/gsmlib.git
@@ -62,6 +62,8 @@ define Package/gsm-utils/description
 Some simple command line programs to access GSM mobile phones via GSM modems.
 endef
 
+CONFIGURE_ARGS += --disable-nls
+
 TARGET_CXXFLAGS += -std=c++11
 
 define Build/InstallDev

diff --git a/libs/gsmlib/patches/01-update-autotools.patch b/libs/gsmlib/patches/01-update-autotools.patch
index 6461e5c3402a7f5665b2164a510e096bad62d246..372a4e6158e96e43276c2301245aaaca9a29fd89 100644 (file)
--- a/libs/gsmlib/patches/01-update-autotools.patch
+++ b/libs/gsmlib/patches/01-update-autotools.patch
@@ -19,6 +19,15 @@ Description: Update autotools-related stuff.
  dnl comment out this line to get extensive debugging output and asserts
  dnl CXXFLAGS="-DNDEBUG $CXXFLAGS"
  
+@@ -108,7 +111,7 @@ AC_SUBST(GSM_VERSION)
+ dnl national language support (NLS)
+ LINGUAS="de"
+ ALL_LINGUAS=$LINGUAS
+-AM_GNU_GETTEXT
++AM_GNU_GETTEXT([external])
+ dnl AM_GLIB_GNU_GETTEXT
+ 
+ dnl set locale dir (FIXME there must be a better way)
 --- /dev/null
 +++ b/po/Makevars
 @@ -0,0 +1,5 @@
@@ -29,7 +38,7 @@ Description: Update autotools-related stuff.
 +
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -11,6 +11,8 @@
+@@ -11,14 +11,12 @@
  # * Created: 21.5.1999
  # *************************************************************************
  
@@ -38,3 +47,11 @@ Description: Update autotools-related stuff.
  SUBDIRS_ =    po gsmlib apps tests doc scripts win32 ext
  
  EXTRA_DIST =  gsmlib.spec
+ 
+-if COMPILE_INTL
+-SUBDIRS =     intl $(SUBDIRS_) # po - make automake happy
+-else
+ SUBDIRS =     $(SUBDIRS_) # po intl - make automake happy
+-endif
+ 
+ all: