mirror of
https://github.com/openwrt/telephony.git
synced 2025-05-03 21:59:03 +08:00
b86cf0cdc6
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>
58 lines
1.2 KiB
Diff
58 lines
1.2 KiB
Diff
Description: Update autotools-related stuff.
|
|
|
|
--- a/configure.in
|
|
+++ b/configure.in
|
|
@@ -15,6 +15,7 @@ AC_INIT(gsmlib/gsm_error.h)
|
|
|
|
dnl Other
|
|
AC_CONFIG_AUX_DIR(scripts)
|
|
+AC_CONFIG_MACRO_DIR([m4])
|
|
AC_PROG_INSTALL
|
|
|
|
dnl check for libintl
|
|
@@ -34,6 +35,8 @@ if test "$CXXFLAGS" = ""; then
|
|
CXXFLAGS="-O2"
|
|
fi
|
|
|
|
+AC_USE_SYSTEM_EXTENSIONS
|
|
+
|
|
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 @@
|
|
+DOMAIN = $(PACKAGE)
|
|
+
|
|
+subdir = po
|
|
+top_builddir = ..
|
|
+
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -11,14 +11,12 @@
|
|
# * Created: 21.5.1999
|
|
# *************************************************************************
|
|
|
|
+ACLOCAL_AMFLAGS = -I m4
|
|
+
|
|
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:
|