Changeset 0001dd31afce7dea20762c2e3a683ee05e936c16

Show
Ignore:
Timestamp:
07/17/03 16:54:26 (5 years ago)
Author:
Sam Hocevar <sam@videolan.org>
git-committer:
Sam Hocevar <sam@videolan.org> 1058453666 +0000
git-parent:

[0878dc57d541b93055dd3c1e14a26b16acf563bc]

git-author:
Sam Hocevar <sam@videolan.org> 1058453666 +0000
Message:
  • configure.ac vlc-config.in.in: Oops, vlc-config needs top_builddir, not
    top_srcdir.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • configure.ac

    r8bbbcc3 r0001dd3  
    11dnl Autoconf settings for vlc 
    2 dnl $Id: configure.ac,v 1.32 2003/07/17 12:06:10 sam Exp $ 
     2dnl $Id: configure.ac,v 1.33 2003/07/17 14:54:26 sam Exp $ 
    33 
    44AC_INIT(vlc,0.6.0) 
    …… 
    31943194dnl  Handle substvars that use $(top_srcdir) 
    31953195dnl 
    3196 VLC_CONFIG="top_srcdir=\"\$(top_srcdir)\" \$(top_builddir)/vlc-config" 
     3196VLC_CONFIG="top_builddir=\"\$(top_builddir)\" \$(top_builddir)/vlc-config" 
    31973197AC_SUBST(VLC_CONFIG) 
    31983198CPPFLAGS_save="${CPPFLAGS_save} -I\$(top_srcdir)/include" 

  • vlc-config.in.in

    r8bbbcc3 r0001dd3  
    8181  includes="-I@includedir@" 
    8282fi 
    83 if test "${top_srcdir}" != ""; then 
    84   top_srcdir="${top_srcdir}/" 
     83if test "${top_builddir}" != ""; then 
     84  top_builddir="${top_builddir}/" 
    8585fi 
    8686cppflags="${includes}" 
    …… 
    247247      register_targets "${module}" 
    248248    done 
    249     for target in `echo "${list}"`; do printf "${top_srcdir}modules/${target}_plugin "; done 
     249    for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}_plugin "; done 
    250250    printf '\n' 
    251251  fi 
    …… 
    255255    done 
    256256    if test "${echo_pic}" = yes; then 
    257       for target in `echo "${list}"`; do printf "${top_srcdir}modules/${target}_pic.a "; done 
     257      for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}_pic.a "; done 
    258258    else 
    259       for target in `echo "${list}"`; do printf "${top_srcdir}modules/${target}.a "; done 
     259      for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}.a "; done 
    260260    fi 
    261261    printf '\n' 
    …… 
    289289    done 
    290290    if test "${echo_pic}" = yes; then 
    291       for target in `echo "${list}"`; do printf "${top_srcdir}modules/${target}_pic.a "; done 
     291      for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}_pic.a "; done 
    292292    else 
    293       for target in `echo "${list}"`; do printf "${top_srcdir}modules/${target}.a "; done 
     293      for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}.a "; done 
    294294    fi 
    295295  fi