blob: 5d34ce7c0ebfe119b2ae626322b10e1c9c8a7afe (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
It adds the variables that are needed
for autoconf 2.65 to reconfigure libiconv and delete the m4 macros
directory. Its imported from OE.
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: libiconv-1.13.1/configure.ac
===================================================================
--- libiconv-1.13.1.orig/configure.ac
+++ libiconv-1.13.1/configure.ac
@@ -23,7 +23,7 @@ AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([libiconv], [1.13.1])
AC_CONFIG_HEADERS([config.h lib/config.h])
AC_PROG_MAKE_SET
-
+AC_CONFIG_MACRO_DIR([m4])
dnl checks for basic programs
AC_PROG_CC
Index: libiconv-1.13.1/libcharset/configure.ac
===================================================================
--- libiconv-1.13.1.orig/libcharset/configure.ac
+++ libiconv-1.13.1/libcharset/configure.ac
@@ -16,17 +16,17 @@ dnl along with the GNU CHARSET Library;
dnl write to the Free Software Foundation, Inc., 51 Franklin Street,
dnl Fifth Floor, Boston, MA 02110-1301, USA.
-AC_PREREQ([2.13])
+AC_PREREQ(2.61)
+AC_INIT([libcharset],[1.4] )
+AC_CONFIG_SRCDIR([lib/localcharset.c])
-PACKAGE=libcharset
-VERSION=1.4
-
-AC_INIT([lib/localcharset.c])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADER([config.h])
AC_PROG_MAKE_SET
-AC_SUBST([PACKAGE])
-AC_SUBST([VERSION])
+dnl AC_SUBST(PACKAGE)
+dnl AC_SUBST(VERSION)
+
+AC_CONFIG_MACRO_DIR([m4])
dnl checks for basic programs
|
