Changeset 3eb8eefdd2d1fc8ffa75bf9f8fa9e3e8dc308b93

Show
Ignore:
Timestamp:
28/08/02 17:30:57 (6 years ago)
Author:
Sam Hocevar <sam@videolan.org>
git-committer:
Sam Hocevar <sam@videolan.org> 1030548657 +0000
git-parent:

[91b31c88351be190108dd35ec32c8956fe1b1e29]

git-author:
Sam Hocevar <sam@videolan.org> 1030548657 +0000
Message:
  • ./m4/*: added gettext m4 macros so that the configure behaviour is
    always the same.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • bootstrap

    r91b31c8 r3eb8eef  
    22 
    33##  bootstrap.sh file for vlc, the VideoLAN Client 
    4 ##  $Id: bootstrap,v 1.10 2002/08/28 14:22:17 sam Exp $ 
     4##  $Id: bootstrap,v 1.11 2002/08/28 15:30:57 sam Exp $ 
    55## 
    66##  Authors: Samuel Hocevar <sam@zoy.org> 
     
    4141  # We have gettext, and a recent version! Everything is cool. 
    4242  autopoint --force 
    43   rm -f m4/Makefile.am 
    44   echo 'EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4' > m4/Makefile.am 
    4543  GETTEXT=yes 
    4644else 
     
    4846  # cheat a bit, then. 
    4947  rm -f po/ChangeLog~ 
    50   aclocaldir=`gettextize --copy --force | grep '^from the' | cut -f3 -d' '` 
     48  gettextize --copy --force | grep '^from the' | cut -f3 -d' ' 
    5149  # Yuck! 
    5250  test -f po/ChangeLog~ && mv po/ChangeLog~ po/ChangeLog 
    53   mkdir -p m4 
    54   # Yuck! - don't copy anything, it makes old autoconf barf. 
    55   #for file in codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 \ 
    56   #            lcmessage.m4 progtest.m4 
    57   #  do cp ${aclocaldir}/${file} m4/ 
    58   #done 
    5951  # Yuck! 
    60   echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' > m4/gettext.m4 
     52  echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' > m4/oldgettext.m4 
    6153  GETTEXT=old 
    6254fi;else 
     
    6456  mkdir -p intl 
    6557  echo > intl/Makefile.am 
    66   mkdir -p m4 
    67   echo > m4/Makefile.am 
    68   echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' > m4/gettext.m4 
    69   echo 'AC_DEFUN([AM_GNU_GETTEXT], [])' >> m4/gettext.m4 
     58  echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' > m4/oldgettext.m4 
    7059  GETTEXT=no 
    7160fi 
     
    8170  set +x 
    8271  echo "you need automake version 1.5 or later" 
     72  exit 1 
    8373fi;fi 
    8474