Changeset 6f50b235de1c17808ddafbbe68b2c10205b109a3

Show
Ignore:
Timestamp:
08/02/04 21:19:03 (5 years ago)
Author:
Jean-Paul Saman <jpsaman@videolan.org>
git-committer:
Jean-Paul Saman <jpsaman@videolan.org> 1076271543 +0000
git-parent:

[2ef754d001f5f50297e77cfa035a04971c2f47fb]

git-author:
Jean-Paul Saman <jpsaman@videolan.org> 1076271543 +0000
Message:

Fixed several things with configure.ac script:
- Always have a space between ";then" the configure script does not like this. It should be "; then" or better put "then" on the next line.
- Add a AC_ARG_ENABLE for cdda

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • configure.ac

    ra4b4861 r6f50b23  
    11dnl Autoconf settings for vlc 
    2 dnl $Id: configure.ac,v 1.170 2004/02/05 22:56:12 gbazin Exp $ 
     2dnl $Id: configure.ac,v 1.171 2004/02/08 20:19:03 jpsaman Exp $ 
    33 
    44AC_INIT(vlc,0.7.1-cvs) 
     
    10331033    fi 
    10341034else 
    1035     if test "${target_cpu}" = "i686" -o "${target_cpu}" = "i586" -o "${target_cpu}" = "i486" -o "${target_cpu}" = "i386"; then CFLAGS_TUNING="-mcpu=pentiumpro" 
     1035    if test "${target_cpu}" = "i686" -o "${target_cpu}" = "i586" -o "${target_cpu}" = "i486" -o "${target_cpu}" = "i386"; then 
     1036        CFLAGS_TUNING="-mcpu=pentiumpro" 
    10361037    else 
    10371038        if test "${target_cpu}" = "powerpc"; then CFLAGS_TUNING="-mtune=750"; fi 
     
    11191120  dnl test for --with-livedotcom-tree 
    11201121  dnl 
    1121   if test "${with_livedotcom_tree}" != "no" -a -n "${with_livedotcom_tree}";then 
     1122  if test "${with_livedotcom_tree}" != "no" -a -n "${with_livedotcom_tree}"; then 
    11221123    AC_MSG_CHECKING(for liveMedia/libliveMedia.a in ${with_livedotcom_tree}) 
    11231124    real_livedotcom_tree="`cd ${with_livedotcom_tree} 2>/dev/null && pwd`" 
     
    15191520  [  --enable-vcdx           VCD support with Navigation (default enabled)]) 
    15201521 
     1522AC_ARG_ENABLE(cdda,            
     1523  [  --enable-cdda            CDDA plugin support (default enabled)]) 
     1524 
    15211525if test "${enable_cddax}" != "no" 
    15221526then 
     
    17971801  dnl test for !(--with-ffmpeg-tree) 
    17981802  dnl 
    1799   if test "${with_ffmpeg_tree}" = "no" -o -z "${with_ffmpeg_tree}";then 
     1803  if test "${with_ffmpeg_tree}" = "no" -o -z "${with_ffmpeg_tree}"; then 
    18001804    CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_ffmpeg}" 
    18011805    LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}" 
     
    18191823  dnl test for --with-ffmpeg-tree 
    18201824  dnl 
    1821   if test "${with_ffmpeg_tree}" != "no" -a -n "${with_ffmpeg_tree}";then 
     1825  if test "${with_ffmpeg_tree}" != "no" -a -n "${with_ffmpeg_tree}"; then 
    18221826    AC_MSG_CHECKING(for libavcodec.a in ${with_ffmpeg_tree}) 
    18231827    real_ffmpeg_tree="`cd ${with_ffmpeg_tree} 2>/dev/null && pwd`" 
     
    32613265  dnl test for --with-goom-tree 
    32623266  dnl 
    3263   if test "${with_goom_tree}" != "no" -a -n "${with_goom_tree}";then 
     3267  if test "${with_goom_tree}" != "no" -a -n "${with_goom_tree}"; then 
    32643268    AC_MSG_CHECKING(for libgoom.a in ${with_goom_tree}) 
    32653269    real_goom_tree="`cd ${with_goom_tree} 2>/dev/null && pwd`"