Changeset 9542cc88a8e24d615d9461ab33c89470f508a14a

Show
Ignore:
Timestamp:
06/21/03 19:04:20 (5 years ago)
Author:
Sam Hocevar <sam@videolan.org>
git-committer:
Sam Hocevar <sam@videolan.org> 1056215060 +0000
git-parent:

[00aa8b77e2e8e6250b48c39b9790f09477926e3e]

git-author:
Sam Hocevar <sam@videolan.org> 1056215060 +0000
Message:
  • configure.ac.in is no more, we can now use configure.ac like normal people,
    bootstrap generates the proper magic for us.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • HACKING

    r0e24796 r9542cc8  
    1 $Id: HACKING,v 1.6 2002/10/07 21:58:40 massiot Exp $ 
     1$Id: HACKING,v 1.7 2003/06/21 17:04:20 sam Exp $ 
    22 
    33Hacking vlc 
    …… 
    4444   Modules.am files that were found in modules/ 
    4545 
    46  - create a top-level configure.ac file from configure.ac.in, generating 
    47    the AC_SUBST and AM_CONDITIONAL rules that will be needed. 
     46 - create an m4/vlc.m4 from configure.ac, generating the AC_SUBST and 
     47   AM_CONDITIONAL rules that will be needed by configure.ac. 
    4848 
    4949 - run autopoint (previously gettextize) to create an intl/ directory, 

  • Makefile.am

    r8e9d90a r9542cc8  
    1818    README.MacOSX.rtf \ 
    1919    bootstrap \ 
    20     configure.ac.in \ 
    2120    install-win32 \ 
    2221    src/extras/COPYING \ 
    …… 
    4443ACLOCAL_AMFLAGS = -I m4 
    4544 
    46 # XXX: these flags could be set in configure.ac.in, but we set them here 
     45# XXX: these flags could be set in configure.ac, but we set them here 
    4746# because old versions of automake don't support them in configure.ac. 
    4847AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 

  • bootstrap

    rf4fabf9 r9542cc8  
    22 
    33##  bootstrap file for the VLC media player 
    4 ##  $Id: bootstrap,v 1.48 2003/05/25 22:36:33 titer Exp $ 
     4##  $Id: bootstrap,v 1.49 2003/06/21 17:04:20 sam Exp $ 
    55## 
    66##  Authors: Samuel Hocevar <sam@zoy.org> 
    …… 
    4444## 
    4545 
    46 printf "generating Modules.am and configure.ac" 
    47  
    48 rm -f Modules.am configure.ac 
    49  
    50 echo > Modules.am 
    51 echo > configure.ac 
    52  
    53 ALL_FLAGS="`sed -n -e '/^[^=A-Z]*[A-Z]*FLAGS_[^=]*=/s/[^=A-Z]*\([A-Z]*FLAGS_[^=]*=\).*/\1/p' < configure.ac.in | sort | uniq`" 
    54  
    55 cat >> configure.ac << EOF 
    56 dnl ################################################################ 
    57 dnl # Do not edit this file, it was generated from configure.ac.in # 
    58 dnl ################################################################ 
    59  
    60 EOF 
    61 sed -n -e '/dnl do not touch this line/q;p' < configure.ac.in >> configure.ac 
     46printf "generating Modules.am and vlc.m4" 
     47 
     48# Prepare Modules.am and m4/vlc.m4 
     49rm -f Modules.am && echo > Modules.am 
     50rm -f m4/vlc.m4 && cat > m4/vlc.m4 << EOF 
     51dnl  Private VLC macros - generated by bootstrap 
     52 
     53dnl  The required AM_CONDITIONAL an AC_SUBST calls 
     54AC_DEFUN([VLC_VARIABLES], [ 
     55EOF 
     56 
     57ALL_FLAGS="`sed -n -e '/^[^=A-Z]*[A-Z]*FLAGS_[^=]*=/s/[^=A-Z]*\([A-Z]*FLAGS_[^=]*=\).*/\1/p' < configure.ac | sort | uniq`" 
    6258 
    6359modules="" 
    …… 
    7874    LINKER="LINK" 
    7975    if echo "$ALL_FLAGS" | grep '^CPPFLAGS_'${mod}'=$' >/dev/null 2>&1; then 
    80         echo "AC_SUBST(CPPFLAGS_${mod})" >> configure.ac; fi 
     76        echo "AC_SUBST(CPPFLAGS_${mod})" >> m4/vlc.m4; fi 
    8177    if echo "$ALL_FLAGS" | grep '^CFLAGS_'${mod}'=$' >/dev/null 2>&1; then 
    82         echo "AC_SUBST(CFLAGS_${mod})" >> configure.ac; fi 
     78        echo "AC_SUBST(CFLAGS_${mod})" >> m4/vlc.m4; fi 
    8379    if echo "$ALL_FLAGS" | grep '^CXXFLAGS_'${mod}'=$' >/dev/null 2>&1; then 
    8480        LINKER="CXXLINK" 
    85         echo "AC_SUBST(CXXFLAGS_${mod})" >> configure.ac; fi 
     81        echo "AC_SUBST(CXXFLAGS_${mod})" >> m4/vlc.m4; fi 
    8682    if echo "$ALL_FLAGS" | grep '^OBJCFLAGS_'${mod}'=$' >/dev/null 2>&1; then 
    8783        LINKER="OBJCLINK" 
    88         echo "AC_SUBST(OBJCFLAGS_${mod})" >> configure.ac; fi 
     84        echo "AC_SUBST(OBJCFLAGS_${mod})" >> m4/vlc.m4; fi 
    8985    if echo "$ALL_FLAGS" | grep '^LDFLAGS_'${mod}'=$' >/dev/null 2>&1; then 
    90         echo "AC_SUBST(LDFLAGS_${mod})" >> configure.ac; fi 
     86        echo "AC_SUBST(LDFLAGS_${mod})" >> m4/vlc.m4; fi 
    9187    if grep '^SOURCES_'${mod}'.*=.*PRIVATE' < ${mf} >/dev/null 2>&1; then 
    9288        PRIVATE='#'; else 
    …… 
    9591        NODIST=''; else 
    9692        NODIST='#'; fi 
    97     cat >> configure.ac << EOF 
     93    cat >> m4/vlc.m4 << EOF 
    9894AM_CONDITIONAL(${mod}_plugin, test x\$${mod}_plugin = xyes) 
    9995AM_CONDITIONAL(${mod}_builtin, test x\$${mod}_builtin = xyes) 
    …… 
    165161done 
    166162 
    167 echo "AM_CONDITIONAL(UNTRUE, false)" >> configure.ac 
    168 sed -n -e '/dnl do not touch this line/,//p' < configure.ac.in >> configure.ac 
     163cat >> m4/vlc.m4 << EOF 
     164AM_CONDITIONAL(UNTRUE, false) 
     165]) 
     166EOF 
    169167 
    170168echo "done." 
    …… 
    176174 
    177175# remove autotools cruft 
    178 rm -f aclocal.m4 configure config.log 
     176rm -f aclocal.m4 configure configure.ac.in config.log 
    179177# remove old autotools extra cruft 
    180178rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh 
    …… 
    186184rm -f m4/oldgettext.m4 ABOUT-NLS 
    187185rm -Rf intl 
    188 # update m4 local macros 
    189 rm -f m4/vlc.m4 && echo "dnl  Private VLC macros" > m4/vlc.m4 
    190186 
    191187# Check for gettext 
    …… 
    203199  mkdir -p intl 
    204200  echo > intl/Makefile.am 
    205   echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' >> m4/vlc.m4 
     201  cat >> m4/vlc.m4 << EOF 
     202dnl  User's gettext is too old, so this is a no-op 
     203AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) 
     204 
     205EOF 
    206206  GETTEXT=old 
    207207fi;else 
    …… 
    210210  mkdir -p intl 
    211211  echo > intl/Makefile.am 
    212   echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' >> m4/vlc.m4 
     212  cat >> m4/vlc.m4 << EOF 
     213dnl  User does not have gettext, so this is a no-op 
     214AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) 
     215 
     216EOF 
    213217  GETTEXT=no 
    214218fi 
    …… 
    221225else 
    222226  # Not present, use a workaround. 
    223   echo 'AC_DEFUN([PKG_CHECK_MODULES], [])' > m4/vlc.m4 
     227  cat >> m4/vlc.m4 << EOF 
     228dnl  User does not have pkg-config, so this is a no-op 
     229AC_DEFUN([PKG_CHECK_MODULES], []) 
     230 
     231EOF 
    224232  PKGCONFIG=no 
    225233fi 

  • doc/release-howto.txt

    r9534c1b r9542cc8  
    1111  - g�rer un timestamp de release (par exemple avec 822-date) 
    1212  - updater le num� de version partout o�st n�ssaire 
    13      � configure.ac.in (relancer autoconf) 
     13     � configure.ac (relancer autoconf) 
    1414     � vlc.spec 
    1515     � ipkg/control 

  • toolbox

    r23455b3 r9542cc8  
    22 
    33##  toolbox for the VLC media player 
    4 ##  $Id: toolbox,v 1.25 2003/05/24 12:34:31 sam Exp $ 
     4##  $Id: toolbox,v 1.26 2003/06/21 17:04:20 sam Exp $ 
    55## 
    66##  Authors: Samuel Hocevar <sam@zoy.org> 
    …… 
    111111' 
    112112 
    113   #  Variables we get from configure.ac.in 
    114   LIBVLC_VERSION=`sed -ne '/AC_INIT/s/.*,\(.*\))/\1/p' < configure.ac.in` 
    115   LIBVLC_CODENAME=`sed -ne '/CODENAME=/s/.*"\(.*\)"/\1/p' < configure.ac.in` 
     113  #  Variables we get from configure.ac 
     114  LIBVLC_VERSION=`sed -ne '/AC_INIT/s/.*,\(.*\))/\1/p' < configure.ac` 
     115  LIBVLC_CODENAME=`sed -ne '/CODENAME=/s/.*"\(.*\)"/\1/p' < configure.ac` 
    116116  LIBVLC_SYMBOL=`echo $LIBVLC_VERSION | sed -e 'y/.-/__/'` 
    117117 
    …… 
    520520  #find . -type d -name '.deps' -exec rm -Rf '{}' ';' 
    521521  # there's some more cruft all around 
    522   rm -f configure.ac config.h config.log config.status 
     522  rm -f config.h config.log config.status 
    523523  rm -f vlc vlc-config Makefile Modules.am 
    524524  rm -Rf autom4te.cache 

  • vlc.ebuild

    r59b5fa5 r9542cc8  
    33############################################################################### 
    44# Copyright (C) 2003 VideoLAN 
    5 # $Id: vlc.ebuild,v 1.6 2003/06/20 01:27:55 hartman Exp $ 
     5# $Id: vlc.ebuild,v 1.7 2003/06/21 17:04:20 sam Exp $ 
    66# 
    77# Authors: Derk-Jan Hartman <thedj at users.sf.net> 
    …… 
    101101        sed "s:-lkfile::" \ 
    102102            configure.ac.orig > configure.ac 
    103         # adding configure.ac.in 
    104         cp configure.ac.in configure.ac.in.orig 
    105         sed "s:-lkfile::" \ 
    106             configure.ac.in.orig > configure.ac.in 
    107103 
    108104        cd ${S}/modules/gui/kde