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