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>
This commit is contained in:
Sebastian Kemper 2021-08-22 01:48:47 +02:00
parent 2feac1069f
commit b86cf0cdc6
2 changed files with 21 additions and 2 deletions

View File

@ -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

View File

@ -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: