summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/console-tools
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-17 12:18:12 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-18 11:13:44 (GMT)
commit9ecacde57dc80fb75dbe8be280a6b53e5d101d01 (patch)
tree082ba0abdfcbaa0e4130d074f38ee0e60cbc86ec /meta/recipes-core/console-tools
parent2ddf822049ffd654539253d4912445f773f90dd0 (diff)
downloadpoky-9ecacde57dc80fb75dbe8be280a6b53e5d101d01.tar.gz
console-tools: Clean up recipe
This cleans up various bits of nastiness in this recipe: * Drop unneeded m4 macros * Update to a recent version of gettext (needs addition of Makevars file) * Drop split do_compile and SUBDIRS hacks, just patch out the docs * Remove some of the configure.in hacks since they seem unneeded now and break gettext (the AC_OUTPUT change). * Wipe out acinclude.m4 since it has corrisive contents (From OE-Core rev: 87a9a3b3b2603516704a38fccc8c396e547ac101) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/console-tools')
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/Makevars41
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/config/codeset.m417
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/config/gettext.m4370
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/config/glibc21.m426
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/config/iconv.m469
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/config/progtest.m451
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch20
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/lcmessage.m4 (renamed from meta/recipes-core/console-tools/console-tools-0.3.2/config/lcmessage.m4)0
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/nodocs.patch19
-rw-r--r--meta/recipes-core/console-tools/console-tools_0.3.2.bb19
10 files changed, 68 insertions, 564 deletions
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/Makevars b/meta/recipes-core/console-tools/console-tools-0.3.2/Makevars
new file mode 100644
index 0000000..32692ab
--- /dev/null
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/Makevars
@@ -0,0 +1,41 @@
1# Makefile variables for PO directory in any package using GNU gettext.
2
3# Usually the message domain is the same as the package name.
4DOMAIN = $(PACKAGE)
5
6# These two variables depend on the location of this directory.
7subdir = po
8top_builddir = ..
9
10# These options get passed to xgettext.
11XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
12
13# This is the copyright holder that gets inserted into the header of the
14# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
15# package. (Note that the msgstr strings, extracted from the package's
16# sources, belong to the copyright holder of the package.) Translators are
17# expected to transfer the copyright for their translations to this person
18# or entity, or to disclaim their copyright. The empty string stands for
19# the public domain; in this case the translators are expected to disclaim
20# their copyright.
21COPYRIGHT_HOLDER = Free Software Foundation, Inc.
22
23# This is the email address or URL to which the translators shall report
24# bugs in the untranslated strings:
25# - Strings which are not entire sentences, see the maintainer guidelines
26# in the GNU gettext documentation, section 'Preparing Strings'.
27# - Strings which use unclear terms or require additional context to be
28# understood.
29# - Strings which make invalid assumptions about notation of date, time or
30# money.
31# - Pluralisation problems.
32# - Incorrect English spelling.
33# - Incorrect formatting.
34# It can be your email address, or a mailing list address where translators
35# can write to without being subscribed, or the URL of a web page through
36# which the translators can contact you.
37MSGID_BUGS_ADDRESS =
38
39# This is the list of locale categories, beyond LC_MESSAGES, for which the
40# message catalogs shall be used. It is usually empty.
41EXTRA_LOCALE_CATEGORIES =
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/config/codeset.m4 b/meta/recipes-core/console-tools/console-tools-0.3.2/config/codeset.m4
deleted file mode 100644
index 863c9cf..0000000
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/config/codeset.m4
+++ /dev/null
@@ -1,17 +0,0 @@
1#serial AM1
2
3dnl From Bruno Haible.
4
5AC_DEFUN([AM_LANGINFO_CODESET],
6[
7 AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
8 [AC_TRY_LINK([#include <langinfo.h>],
9 [char* cs = nl_langinfo(CODESET);],
10 am_cv_langinfo_codeset=yes,
11 am_cv_langinfo_codeset=no)
12 ])
13 if test $am_cv_langinfo_codeset = yes; then
14 AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
15 [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
16 fi
17])
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/config/gettext.m4 b/meta/recipes-core/console-tools/console-tools-0.3.2/config/gettext.m4
deleted file mode 100644
index e4d524c..0000000
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/config/gettext.m4
+++ /dev/null
@@ -1,370 +0,0 @@
1# Macro to add for using GNU gettext.
2# Ulrich Drepper <drepper@cygnus.com>, 1995.
3#
4# This file can be copied and used freely without restrictions. It can
5# be used in projects which are not available under the GNU General Public
6# License or the GNU Library General Public License but which still want
7# to provide support for the GNU gettext functionality.
8# Please note that the actual code of the GNU gettext library is covered
9# by the GNU Library General Public License, and the rest of the GNU
10# gettext package package is covered by the GNU General Public License.
11# They are *not* in the public domain.
12
13# serial 10
14
15dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR]).
16dnl If TOOLSYMBOL is specified and is 'use-libtool', then a libtool library
17dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
18dnl depending on --{enable,disable}-{shared,static} and on the presence of
19dnl AM-DISABLE-SHARED). Otherwise, a static library
20dnl $(top_builddir)/intl/libintl.a will be created.
21dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
22dnl implementations (in libc or libintl) without the ngettext() function
23dnl will be ignored.
24dnl LIBDIR is used to find the intl libraries. If empty,
25dnl the value `$(top_builddir)/intl/' is used.
26dnl
27dnl The result of the configuration is one of three cases:
28dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
29dnl and used.
30dnl Catalog format: GNU --> install in $(datadir)
31dnl Catalog extension: .mo after installation, .gmo in source tree
32dnl 2) GNU gettext has been found in the system's C library.
33dnl Catalog format: GNU --> install in $(datadir)
34dnl Catalog extension: .mo after installation, .gmo in source tree
35dnl 3) No internationalization, always use English msgid.
36dnl Catalog format: none
37dnl Catalog extension: none
38dnl The use of .gmo is historical (it was needed to avoid overwriting the
39dnl GNU format catalogs when building on a platform with an X/Open gettext),
40dnl but we keep it in order not to force irrelevant filename changes on the
41dnl maintainers.
42dnl
43AC_DEFUN([AM_WITH_NLS],
44 [AC_MSG_CHECKING([whether NLS is requested])
45 dnl Default is enabled NLS
46 AC_ARG_ENABLE(nls,
47 [ --disable-nls do not use Native Language Support],
48 USE_NLS=$enableval, USE_NLS=yes)
49 AC_MSG_RESULT($USE_NLS)
50 AC_SUBST(USE_NLS)
51
52 BUILD_INCLUDED_LIBINTL=no
53 USE_INCLUDED_LIBINTL=no
54 INTLLIBS=
55
56 dnl If we use NLS figure out what method
57 if test "$USE_NLS" = "yes"; then
58 AC_DEFINE(ENABLE_NLS, 1,
59 [Define to 1 if translation of program messages to the user's native language
60 is requested.])
61 AC_MSG_CHECKING([whether included gettext is requested])
62 AC_ARG_WITH(included-gettext,
63 [ --with-included-gettext use the GNU gettext library included here],
64 nls_cv_force_use_gnu_gettext=$withval,
65 nls_cv_force_use_gnu_gettext=no)
66 AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
67
68 nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
69 if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
70 dnl User does not insist on using GNU NLS library. Figure out what
71 dnl to use. If GNU gettext is available we use this. Else we have
72 dnl to fall back to GNU NLS library.
73 CATOBJEXT=NONE
74
75 dnl Add a version number to the cache macros.
76 define(gt_cv_func_gnugettext_libc, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libc])
77 define(gt_cv_func_gnugettext_libintl, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libintl])
78
79 AC_CHECK_HEADER(libintl.h,
80 [AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
81 [AC_TRY_LINK([#include <libintl.h>
82extern int _nl_msg_cat_cntr;],
83 [bindtextdomain ("", "");
84return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
85 gt_cv_func_gnugettext_libc=yes,
86 gt_cv_func_gnugettext_libc=no)])
87
88 if test "$gt_cv_func_gnugettext_libc" != "yes"; then
89 AC_CACHE_CHECK([for GNU gettext in libintl],
90 gt_cv_func_gnugettext_libintl,
91 [gt_save_LIBS="$LIBS"
92 LIBS="$LIBS -lintl $LIBICONV"
93 AC_TRY_LINK([#include <libintl.h>
94extern int _nl_msg_cat_cntr;],
95 [bindtextdomain ("", "");
96return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
97 gt_cv_func_gnugettext_libintl=yes,
98 gt_cv_func_gnugettext_libintl=no)
99 LIBS="$gt_save_LIBS"])
100 fi
101
102 dnl If an already present or preinstalled GNU gettext() is found,
103 dnl use it. But if this macro is used in GNU gettext, and GNU
104 dnl gettext is already preinstalled in libintl, we update this
105 dnl libintl. (Cf. the install rule in intl/Makefile.in.)
106 if test "$gt_cv_func_gnugettext_libc" = "yes" \
107 || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
108 && test "$PACKAGE" != gettext; }; then
109 AC_DEFINE(HAVE_GETTEXT, 1,
110 [Define if the GNU gettext() function is already present or preinstalled.])
111
112 if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
113 dnl If iconv() is in a separate libiconv library, then anyone
114 dnl linking with libintl{.a,.so} also needs to link with
115 dnl libiconv.
116 INTLLIBS="-lintl $LIBICONV"
117 fi
118
119 gt_save_LIBS="$LIBS"
120 LIBS="$LIBS $INTLLIBS"
121 AC_CHECK_FUNCS(dcgettext)
122 LIBS="$gt_save_LIBS"
123
124 dnl Search for GNU msgfmt in the PATH.
125 AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
126 [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :)
127 AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
128
129 dnl Search for GNU xgettext in the PATH.
130 AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
131 [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :)
132
133 CATOBJEXT=.gmo
134 fi
135 ])
136
137 if test "$CATOBJEXT" = "NONE"; then
138 dnl GNU gettext is not found in the C library.
139 dnl Fall back on GNU gettext library.
140 nls_cv_use_gnu_gettext=yes
141 fi
142 fi
143
144 if test "$nls_cv_use_gnu_gettext" = "yes"; then
145 dnl Mark actions used to generate GNU NLS library.
146 INTLOBJS="\$(GETTOBJS)"
147 AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
148 [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :)
149 AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
150 AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
151 [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :)
152 AC_SUBST(MSGFMT)
153 BUILD_INCLUDED_LIBINTL=yes
154 USE_INCLUDED_LIBINTL=yes
155 CATOBJEXT=.gmo
156 INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV"
157 LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
158 fi
159
160 dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
161 dnl Test whether we really found GNU msgfmt.
162 if test "$GMSGFMT" != ":"; then
163 dnl If it is no GNU msgfmt we define it as : so that the
164 dnl Makefiles still can work.
165 if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
166 : ;
167 else
168 AC_MSG_RESULT(
169 [found msgfmt program is not GNU msgfmt; ignore it])
170 GMSGFMT=":"
171 fi
172 fi
173
174 dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
175 dnl Test whether we really found GNU xgettext.
176 if test "$XGETTEXT" != ":"; then
177 dnl If it is no GNU xgettext we define it as : so that the
178 dnl Makefiles still can work.
179 if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
180 : ;
181 else
182 AC_MSG_RESULT(
183 [found xgettext program is not GNU xgettext; ignore it])
184 XGETTEXT=":"
185 fi
186 fi
187
188 dnl We need to process the po/ directory.
189 POSUB=po
190 fi
191 AC_OUTPUT_COMMANDS(
192 [for ac_file in $CONFIG_FILES; do
193 # Support "outfile[:infile[:infile...]]"
194 case "$ac_file" in
195 *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
196 esac
197 # PO directories have a Makefile.in generated from Makefile.in.in.
198 case "$ac_file" in */Makefile.in)
199 # Adjust a relative srcdir.
200 ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
201 ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
202 ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
203 # In autoconf-2.13 it is called $ac_given_srcdir.
204 # In autoconf-2.50 it is called $srcdir.
205 test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
206 case "$ac_given_srcdir" in
207 .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
208 /*) top_srcdir="$ac_given_srcdir" ;;
209 *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
210 esac
211 if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
212 rm -f "$ac_dir/POTFILES"
213 test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
214 sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES"
215 test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
216 sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
217 fi
218 ;;
219 esac
220 done])
221
222
223 dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
224 dnl to 'yes' because some of the testsuite requires it.
225 if test "$PACKAGE" = gettext; then
226 BUILD_INCLUDED_LIBINTL=yes
227 fi
228
229 dnl intl/plural.c is generated from intl/plural.y. It requires bison,
230 dnl because plural.y uses bison specific features. It requires at least
231 dnl bison-1.26 because earlier versions generate a plural.c that doesn't
232 dnl compile.
233 dnl bison is only needed for the maintainer (who touches plural.y). But in
234 dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
235 dnl the rule in general Makefile. Now, some people carelessly touch the
236 dnl files or have a broken "make" program, hence the plural.c rule will
237 dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
238 dnl present or too old.
239 AC_CHECK_PROGS([INTLBISON], [bison])
240 if test -z "$INTLBISON"; then
241 ac_verc_fail=yes
242 else
243 dnl Found it, now check the version.
244 AC_MSG_CHECKING([version of bison])
245changequote(<<,>>)dnl
246 ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
247 case $ac_prog_version in
248 '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
249 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
250changequote([,])dnl
251 ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
252 *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
253 esac
254 AC_MSG_RESULT([$ac_prog_version])
255 fi
256 if test $ac_verc_fail = yes; then
257 INTLBISON=:
258 fi
259
260 dnl These rules are solely for the distribution goal. While doing this
261 dnl we only have to keep exactly one list of the available catalogs
262 dnl in configure.in.
263 for lang in $ALL_LINGUAS; do
264 GMOFILES="$GMOFILES $lang.gmo"
265 POFILES="$POFILES $lang.po"
266 done
267
268 dnl Make all variables we use known to autoconf.
269 AC_SUBST(BUILD_INCLUDED_LIBINTL)
270 AC_SUBST(USE_INCLUDED_LIBINTL)
271 AC_SUBST(CATALOGS)
272 AC_SUBST(CATOBJEXT)
273 AC_SUBST(GMOFILES)
274 AC_SUBST(INTLLIBS)
275 AC_SUBST(INTLOBJS)
276 AC_SUBST(POFILES)
277 AC_SUBST(POSUB)
278
279 dnl For backward compatibility. Some configure.ins may be using this.
280 nls_cv_header_intl=
281 nls_cv_header_libgt=
282
283 dnl For backward compatibility. Some Makefiles may be using this.
284 DATADIRNAME=share
285 AC_SUBST(DATADIRNAME)
286
287 dnl For backward compatibility. Some Makefiles may be using this.
288 INSTOBJEXT=.mo
289 AC_SUBST(INSTOBJEXT)
290
291 dnl For backward compatibility. Some Makefiles may be using this.
292 GENCAT=gencat
293 AC_SUBST(GENCAT)
294 ])
295
296dnl Usage: Just like AM_WITH_NLS, which see.
297AC_DEFUN([AM_GNU_GETTEXT],
298 [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
299 AC_REQUIRE([AC_PROG_CC])dnl
300 AC_REQUIRE([AC_CANONICAL_HOST])dnl
301 AC_REQUIRE([AC_PROG_RANLIB])dnl
302 AC_REQUIRE([AC_ISC_POSIX])dnl
303 AC_REQUIRE([AC_HEADER_STDC])dnl
304 AC_REQUIRE([AC_C_CONST])dnl
305 AC_REQUIRE([AC_C_INLINE])dnl
306 AC_REQUIRE([AC_TYPE_OFF_T])dnl
307 AC_REQUIRE([AC_TYPE_SIZE_T])dnl
308 AC_REQUIRE([AC_FUNC_ALLOCA])dnl
309 AC_REQUIRE([AC_FUNC_MMAP])dnl
310 AC_REQUIRE([jm_GLIBC21])dnl
311
312 AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
313stdlib.h string.h unistd.h sys/param.h])
314 AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getcwd getegid geteuid \
315getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
316strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
317
318 AM_ICONV
319 AM_LANGINFO_CODESET
320 AM_LC_MESSAGES
321 AM_WITH_NLS([$1],[$2],[$3])
322
323 if test "x$CATOBJEXT" != "x"; then
324 if test "x$ALL_LINGUAS" = "x"; then
325 LINGUAS=
326 else
327 AC_MSG_CHECKING(for catalogs to be installed)
328 NEW_LINGUAS=
329 for presentlang in $ALL_LINGUAS; do
330 useit=no
331 for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do
332 # Use the presentlang catalog if desiredlang is
333 # a. equal to presentlang, or
334 # b. a variant of presentlang (because in this case,
335 # presentlang can be used as a fallback for messages
336 # which are not translated in the desiredlang catalog).
337 case "$desiredlang" in
338 "$presentlang"*) useit=yes;;
339 esac
340 done
341 if test $useit = yes; then
342 NEW_LINGUAS="$NEW_LINGUAS $presentlang"
343 fi
344 done
345 LINGUAS=$NEW_LINGUAS
346 AC_MSG_RESULT($LINGUAS)
347 fi
348
349 dnl Construct list of names of catalog files to be constructed.
350 if test -n "$LINGUAS"; then
351 for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
352 fi
353 fi
354
355 dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
356 dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
357 dnl Try to locate is.
358 MKINSTALLDIRS=
359 if test -n "$ac_aux_dir"; then
360 MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
361 fi
362 if test -z "$MKINSTALLDIRS"; then
363 MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
364 fi
365 AC_SUBST(MKINSTALLDIRS)
366
367 dnl Enable libtool support if the surrounding package wishes it.
368 INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], [])
369 AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
370 ])
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/config/glibc21.m4 b/meta/recipes-core/console-tools/console-tools-0.3.2/config/glibc21.m4
deleted file mode 100644
index 5b88ef2..0000000
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/config/glibc21.m4
+++ /dev/null
@@ -1,26 +0,0 @@
1#serial 2
2
3# Test for the GNU C Library, version 2.1 or newer.
4# From Bruno Haible.
5
6AC_DEFUN([jm_GLIBC21],
7 [
8 AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
9 ac_cv_gnu_library_2_1,
10 [AC_EGREP_CPP([Lucky GNU user],
11 [
12#include <features.h>
13#ifdef __GNU_LIBRARY__
14 #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
15 Lucky GNU user
16 #endif
17#endif
18 ],
19 ac_cv_gnu_library_2_1=yes,
20 ac_cv_gnu_library_2_1=no)
21 ]
22 )
23 AC_SUBST(GLIBC21)
24 GLIBC21="$ac_cv_gnu_library_2_1"
25 ]
26)
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/config/iconv.m4 b/meta/recipes-core/console-tools/console-tools-0.3.2/config/iconv.m4
deleted file mode 100644
index 1723734..0000000
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/config/iconv.m4
+++ /dev/null
@@ -1,69 +0,0 @@
1#serial AM2
2
3dnl From Bruno Haible.
4
5AC_DEFUN([AM_ICONV],
6[
7 dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
8 dnl those with the standalone portable GNU libiconv installed).
9
10 AC_ARG_WITH([libiconv-prefix],
11[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [
12 for dir in `echo "$withval" | tr : ' '`; do
13 if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
14 if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
15 done
16 ])
17
18 AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
19 am_cv_func_iconv="no, consider installing GNU libiconv"
20 am_cv_lib_iconv=no
21 AC_TRY_LINK([#include <stdlib.h>
22#include <iconv.h>],
23 [iconv_t cd = iconv_open("","");
24 iconv(cd,NULL,NULL,NULL,NULL);
25 iconv_close(cd);],
26 am_cv_func_iconv=yes)
27 if test "$am_cv_func_iconv" != yes; then
28 am_save_LIBS="$LIBS"
29 LIBS="$LIBS -liconv"
30 AC_TRY_LINK([#include <stdlib.h>
31#include <iconv.h>],
32 [iconv_t cd = iconv_open("","");
33 iconv(cd,NULL,NULL,NULL,NULL);
34 iconv_close(cd);],
35 am_cv_lib_iconv=yes
36 am_cv_func_iconv=yes)
37 LIBS="$am_save_LIBS"
38 fi
39 ])
40 if test "$am_cv_func_iconv" = yes; then
41 AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
42 AC_MSG_CHECKING([for iconv declaration])
43 AC_CACHE_VAL(am_cv_proto_iconv, [
44 AC_TRY_COMPILE([
45#include <stdlib.h>
46#include <iconv.h>
47extern
48#ifdef __cplusplus
49"C"
50#endif
51#if defined(__STDC__) || defined(__cplusplus)
52size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
53#else
54size_t iconv();
55#endif
56], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
57 am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
58 am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
59 AC_MSG_RESULT([$]{ac_t:-
60 }[$]am_cv_proto_iconv)
61 AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
62 [Define as const if the declaration of iconv() needs const.])
63 fi
64 LIBICONV=
65 if test "$am_cv_lib_iconv" = yes; then
66 LIBICONV="-liconv"
67 fi
68 AC_SUBST(LIBICONV)
69])
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/config/progtest.m4 b/meta/recipes-core/console-tools/console-tools-0.3.2/config/progtest.m4
deleted file mode 100644
index 35dc3da..0000000
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/config/progtest.m4
+++ /dev/null
@@ -1,51 +0,0 @@
1# Search path for a program which passes the given test.
2# Ulrich Drepper <drepper@cygnus.com>, 1996.
3#
4# This file can be copied and used freely without restrictions. It can
5# be used in projects which are not available under the GNU General Public
6# License or the GNU Library General Public License but which still want
7# to provide support for the GNU gettext functionality.
8# Please note that the actual code of the GNU gettext library is covered
9# by the GNU Library General Public License, and the rest of the GNU
10# gettext package package is covered by the GNU General Public License.
11# They are *not* in the public domain.
12
13# serial 2
14
15dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
16dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
17AC_DEFUN([AM_PATH_PROG_WITH_TEST],
18[# Extract the first word of "$2", so it can be a program name with args.
19set dummy $2; ac_word=[$]2
20AC_MSG_CHECKING([for $ac_word])
21AC_CACHE_VAL(ac_cv_path_$1,
22[case "[$]$1" in
23 /*)
24 ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
25 ;;
26 *)
27 IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
28 for ac_dir in ifelse([$5], , $PATH, [$5]); do
29 test -z "$ac_dir" && ac_dir=.
30 if test -f $ac_dir/$ac_word; then
31 if [$3]; then
32 ac_cv_path_$1="$ac_dir/$ac_word"
33 break
34 fi
35 fi
36 done
37 IFS="$ac_save_ifs"
38dnl If no 4th arg is given, leave the cache variable unset,
39dnl so AC_PATH_PROGS will keep looking.
40ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
41])dnl
42 ;;
43esac])dnl
44$1="$ac_cv_path_$1"
45if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
46 AC_MSG_RESULT([$]$1)
47else
48 AC_MSG_RESULT(no)
49fi
50AC_SUBST($1)dnl
51])
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch
index 60ee8ff..15c100c 100644
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch
@@ -1,9 +1,5 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3#
4# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
5#
6
7--- console-tools-0.3.2/configure.in~configure 3--- console-tools-0.3.2/configure.in~configure
8+++ console-tools-0.3.2/configure.in 4+++ console-tools-0.3.2/configure.in
9@@ -2,13 +2,14 @@ 5@@ -2,13 +2,14 @@
@@ -23,25 +19,11 @@ Upstream-Status: Pending
23 AM_INIT_AUTOMAKE(console-tools, 0.3.2) 19 AM_INIT_AUTOMAKE(console-tools, 0.3.2)
24 20
25 # Defaults 21 # Defaults
26@@ -25,7 +26,7 @@ 22@@ -25,7 +26,6 @@
27 # i18n stuff 23 # i18n stuff
28 ALL_LINGUAS="cs de ru ga fr" 24 ALL_LINGUAS="cs de ru ga fr"
29 AM_GNU_GETTEXT 25 AM_GNU_GETTEXT
30-AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile]) 26-AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
31+AC_CONFIG_COMMANDS([default-1],[[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile]],[[]])
32 27
33 AC_DEFINE_UNQUOTED(LOCALEDIR, "/usr/share/locale") 28 AC_DEFINE_UNQUOTED(LOCALEDIR, "/usr/share/locale")
34 29
35@@ -172,10 +173,11 @@
36 AC_SUBST(CHARMAPDIR)
37
38 # Output
39-AC_OUTPUT([Makefile lib/Makefile lib/console/Makefile lib/cfont/Makefile
40+AC_CONFIG_FILES([Makefile lib/Makefile lib/console/Makefile lib/cfont/Makefile
41 lib/ctutils/Makefile lib/ctlocal/Makefile lib/generic/Makefile
42 fontfiletools/Makefile vttools/Makefile
43 kbdtools/Makefile screenfonttools/Makefile contrib/Makefile
44 include/Makefile include/lct/Makefile compat/Makefile
45 doc/Makefile doc/man/Makefile examples/Makefile
46 po/Makefile.in intl/Makefile])
47+AC_OUTPUT
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/config/lcmessage.m4 b/meta/recipes-core/console-tools/console-tools-0.3.2/lcmessage.m4
index 18d47a9..18d47a9 100644
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/config/lcmessage.m4
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/lcmessage.m4
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/nodocs.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/nodocs.patch
new file mode 100644
index 0000000..60b5ffd
--- /dev/null
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/nodocs.patch
@@ -0,0 +1,19 @@
1The docs need tools we don't have to build so disable them.
2
3Upstream-Status: Inappropriate [configuration]
4RP 2012/10/17
5
6Index: console-tools-0.3.2/Makefile.am
7===================================================================
8--- console-tools-0.3.2.orig/Makefile.am 1999-04-15 01:33:24.000000000 +0000
9+++ console-tools-0.3.2/Makefile.am 2012-10-17 11:48:14.107069145 +0000
10@@ -1,7 +1,7 @@
11 # -*- makefile -*-
12 AUTOMAKE_OPTIONS = foreign
13
14-SUBDIRS = lib fontfiletools vttools kbdtools screenfonttools contrib doc \
15- compat include examples po intl
16+SUBDIRS = lib fontfiletools vttools kbdtools screenfonttools contrib \
17+ compat include examples po intl
18
19 EXTRA_DIST = BUGS RELEASE CREDITS COPYING.kbd local-scripts/* debian/* *.lsm
diff --git a/meta/recipes-core/console-tools/console-tools_0.3.2.bb b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
index 8bcc90a..d62c0bd 100644
--- a/meta/recipes-core/console-tools/console-tools_0.3.2.bb
+++ b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
@@ -11,23 +11,18 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \
11 file://compile.patch \ 11 file://compile.patch \
12 file://kbdrate.patch \ 12 file://kbdrate.patch \
13 file://uclibc-fileno.patch \ 13 file://uclibc-fileno.patch \
14 file://config" 14 file://nodocs.patch \
15 file://lcmessage.m4 \
16 file://Makevars"
15 17
16SRC_URI[md5sum] = "bf21564fc38b3af853ef724babddbacd" 18SRC_URI[md5sum] = "bf21564fc38b3af853ef724babddbacd"
17SRC_URI[sha256sum] = "eea6b441672dacd251079fc85ed322e196282e0e66c16303ec64c3a2b1c126c2" 19SRC_URI[sha256sum] = "eea6b441672dacd251079fc85ed322e196282e0e66c16303ec64c3a2b1c126c2"
18 20
19export SUBDIRS = "fontfiletools vttools kbdtools screenfonttools contrib \
20 examples po intl compat"
21
22acpaths = "-I config"
23do_configure_prepend () { 21do_configure_prepend () {
24 mkdir -p config 22 mkdir -p ${S}/m4
25 cp ${WORKDIR}/config/*.m4 config/ 23 cp ${WORKDIR}/lcmessage.m4 ${S}/m4/
26} 24 rm -f ${S}/acinclude.m4
27 25 cp ${WORKDIR}/Makevars ${S}/po/
28do_compile () {
29 oe_runmake -C lib
30 oe_runmake 'SUBDIRS=${SUBDIRS}'
31} 26}
32 27
33inherit autotools gettext update-alternatives 28inherit autotools gettext update-alternatives