Index: gettext-0.14.1/gettext-tools/configure.ac =================================================================== --- gettext-0.14.1.orig/gettext-tools/configure.ac 2004-01-16 11:49:06.0000 00000 +0100 +++ gettext-0.14.1/gettext-tools/configure.ac 2005-03-24 13:14:54.572839168 +0 100 @@ -214,7 +214,6 @@ esac dnl Check for Emacs and where to install .elc files. -AM_PATH_LISPDIR aclocaldir='${datadir}/aclocal' AC_SUBST(aclocaldir) Index: gettext-0.14.1/gettext-tools/aclocal.m4 =================================================================== --- gettext-0.14.1.orig/gettext-tools/aclocal.m4 2005-03-23 17:36:27.0000 00000 +0100 +++ gettext-0.14.1/gettext-tools/aclocal.m4 2005-03-24 13:22:00.125391653 +0 100 @@ -6580,68 +6580,6 @@ AC_MSG_RESULT([$SED]) ]) - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -# Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 8 - -# AM_PATH_LISPDIR -# --------------- -AC_DEFUN([AM_PATH_LISPDIR], -[ # If set to t, that means we are running in a shell under Emacs. - # If you have an Emacs named "t", then use the full path. - test x"$EMACS" = xt && EMACS= - AC_CHECK_PROGS([EMACS], [emacs xemacs], [no]) - AC_ARG_VAR([EMACS], [the Emacs editor command]) - AC_ARG_VAR([EMACSLOADPATH], [the Emacs library search path]) - AC_ARG_WITH([lispdir], - [ --with-lispdir override the default lisp directory], - [ lispdir="$withval" - AC_MSG_CHECKING([where .elc files should go]) - AC_MSG_RESULT([$lispdir])], - [ - AC_CACHE_CHECK([where .elc files should go], [am_cv_lispdir], [ - if test $EMACS != "no"; then - if test x${lispdir+set} != xset; then - # If $EMACS isn't GNU Emacs or XEmacs, this can blow up pretty badly - # Some emacsen will start up in interactive mode, requiring C-x C-c to exit, - # which is non-obvious for non-emacs users. - # Redirecting /dev/null should help a bit; pity we can't detect "broken" - # emacsen earlier and avoid running this altogether. - AC_RUN_LOG([$EMACS -batch -q -eval '(while load-path (princ (concat (car load -path) "\n")) (setq load-path (cdr load-path)))' conftest.out]) - am_cv_lispdir=`sed -n \ - -e 's,/$,,' \ - -e '/.*\/lib\/x*emacs\/site-lisp$/{s,.*/lib/\(x*emacs/site-lisp\)$,${lib dir}/\1,;p;q;}' \ - -e '/.*\/share\/x*emacs\/site-lisp$/{s,.*/share/\(x*emacs/site-lisp\),${ datadir}/\1,;p;q;}' \ - conftest.out` - rm conftest.out - fi - fi - test -z "$am_cv_lispdir" && am_cv_lispdir='${datadir}/emacs/site-lisp' - ]) - lispdir="$am_cv_lispdir" -]) -AC_SUBST([lispdir]) -])# AM_PATH_LISPDIR - -AU_DEFUN([ud_PATH_LISPDIR], [AM_PATH_LISPDIR]) - # Check to see how 'make' treats includes. -*- Autoconf -*- # Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. Index: gettext-0.14.1/gettext-tools/misc/Makefile.am =================================================================== --- gettext-0.14.1.orig/gettext-tools/misc/Makefile.am 2003-04-11 13:54:50.0000 00000 +0200 +++ gettext-0.14.1/gettext-tools/misc/Makefile.am 2005-03-24 13:20:42.1764 66567 +0100 @@ -39,13 +39,6 @@ cp -p $(gettextsrcdir)/archive.tar.gz $@ -# Emacs Lisp code. - -lisp_LISP = po-mode.el po-compat.el - -EXTRA_DIST += $(lisp_LISP) - - # Old sh interface. EXTRA_DIST += gettext-sh freyther@stabilo:~/programming/builds/i686-qd/patches/openembedded/packages/gettext$ cat files/fix-emacs.patch Index: gettext-0.14.1/gettext-tools/configure.ac =================================================================== --- gettext-0.14.1.orig/gettext-tools/configure.ac 2004-01-16 11:49:06.000000000 +0100 +++ gettext-0.14.1/gettext-tools/configure.ac 2005-03-24 13:14:54.572839168 +0100 @@ -214,7 +214,6 @@ esac dnl Check for Emacs and where to install .elc files. -AM_PATH_LISPDIR aclocaldir='${datadir}/aclocal' AC_SUBST(aclocaldir) Index: gettext-0.14.1/gettext-tools/aclocal.m4 =================================================================== --- gettext-0.14.1.orig/gettext-tools/aclocal.m4 2005-03-23 17:36:27.000000000 +0100 +++ gettext-0.14.1/gettext-tools/aclocal.m4 2005-03-24 13:22:00.125391653 +0100 @@ -6580,68 +6580,6 @@ AC_MSG_RESULT([$SED]) ]) - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -# Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 8 - -# AM_PATH_LISPDIR -# --------------- -AC_DEFUN([AM_PATH_LISPDIR], -[ # If set to t, that means we are running in a shell under Emacs. - # If you have an Emacs named "t", then use the full path. - test x"$EMACS" = xt && EMACS= - AC_CHECK_PROGS([EMACS], [emacs xemacs], [no]) - AC_ARG_VAR([EMACS], [the Emacs editor command]) - AC_ARG_VAR([EMACSLOADPATH], [the Emacs library search path]) - AC_ARG_WITH([lispdir], - [ --with-lispdir override the default lisp directory], - [ lispdir="$withval" - AC_MSG_CHECKING([where .elc files should go]) - AC_MSG_RESULT([$lispdir])], - [ - AC_CACHE_CHECK([where .elc files should go], [am_cv_lispdir], [ - if test $EMACS != "no"; then - if test x${lispdir+set} != xset; then - # If $EMACS isn't GNU Emacs or XEmacs, this can blow up pretty badly - # Some emacsen will start up in interactive mode, requiring C-x C-c to exit, - # which is non-obvious for non-emacs users. - # Redirecting /dev/null should help a bit; pity we can't detect "broken" - # emacsen earlier and avoid running this altogether. - AC_RUN_LOG([$EMACS -batch -q -eval '(while load-path (princ (concat (car load-path) "\n")) (setq load-path (cdr load-path)))' conftest.out]) - am_cv_lispdir=`sed -n \ - -e 's,/$,,' \ - -e '/.*\/lib\/x*emacs\/site-lisp$/{s,.*/lib/\(x*emacs/site-lisp\)$,${libdir}/\1,;p;q;}' \ - -e '/.*\/share\/x*emacs\/site-lisp$/{s,.*/share/\(x*emacs/site-lisp\),${datadir}/\1,;p;q;}' \ - conftest.out` - rm conftest.out - fi - fi - test -z "$am_cv_lispdir" && am_cv_lispdir='${datadir}/emacs/site-lisp' - ]) - lispdir="$am_cv_lispdir" -]) -AC_SUBST([lispdir]) -])# AM_PATH_LISPDIR - -AU_DEFUN([ud_PATH_LISPDIR], [AM_PATH_LISPDIR]) - # Check to see how 'make' treats includes. -*- Autoconf -*- # Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. Index: gettext-0.14.1/gettext-tools/misc/Makefile.am =================================================================== --- gettext-0.14.1.orig/gettext-tools/misc/Makefile.am 2003-04-11 13:54:50.000000000 +0200 +++ gettext-0.14.1/gettext-tools/misc/Makefile.am 2005-03-24 13:20:42.176466567 +0100 @@ -39,13 +39,6 @@ cp -p $(gettextsrcdir)/archive.tar.gz $@ -# Emacs Lisp code. - -lisp_LISP = po-mode.el po-compat.el - -EXTRA_DIST += $(lisp_LISP) - - # Old sh interface. EXTRA_DIST += gettext-sh