Changeset 6f50b235de1c17808ddafbbe68b2c10205b109a3
- 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
| ra4b4861 |
r6f50b23 |
|
| 1 | 1 | dnl Autoconf settings for vlc |
|---|
| 2 | | dnl $Id: configure.ac,v 1.170 2004/02/05 22:56:12 gbazin Exp $ |
|---|
| | 2 | dnl $Id: configure.ac,v 1.171 2004/02/08 20:19:03 jpsaman Exp $ |
|---|
| 3 | 3 | |
|---|
| 4 | 4 | AC_INIT(vlc,0.7.1-cvs) |
|---|
| … | … | |
| 1033 | 1033 | fi |
|---|
| 1034 | 1034 | else |
|---|
| 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" |
|---|
| 1036 | 1037 | else |
|---|
| 1037 | 1038 | if test "${target_cpu}" = "powerpc"; then CFLAGS_TUNING="-mtune=750"; fi |
|---|
| … | … | |
| 1119 | 1120 | dnl test for --with-livedotcom-tree |
|---|
| 1120 | 1121 | 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 |
|---|
| 1122 | 1123 | AC_MSG_CHECKING(for liveMedia/libliveMedia.a in ${with_livedotcom_tree}) |
|---|
| 1123 | 1124 | real_livedotcom_tree="`cd ${with_livedotcom_tree} 2>/dev/null && pwd`" |
|---|
| … | … | |
| 1519 | 1520 | [ --enable-vcdx VCD support with Navigation (default enabled)]) |
|---|
| 1520 | 1521 | |
|---|
| | 1522 | AC_ARG_ENABLE(cdda, |
|---|
| | 1523 | [ --enable-cdda CDDA plugin support (default enabled)]) |
|---|
| | 1524 | |
|---|
| 1521 | 1525 | if test "${enable_cddax}" != "no" |
|---|
| 1522 | 1526 | then |
|---|
| … | … | |
| 1797 | 1801 | dnl test for !(--with-ffmpeg-tree) |
|---|
| 1798 | 1802 | 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 |
|---|
| 1800 | 1804 | CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_ffmpeg}" |
|---|
| 1801 | 1805 | LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}" |
|---|
| … | … | |
| 1819 | 1823 | dnl test for --with-ffmpeg-tree |
|---|
| 1820 | 1824 | 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 |
|---|
| 1822 | 1826 | AC_MSG_CHECKING(for libavcodec.a in ${with_ffmpeg_tree}) |
|---|
| 1823 | 1827 | real_ffmpeg_tree="`cd ${with_ffmpeg_tree} 2>/dev/null && pwd`" |
|---|
| … | … | |
| 3261 | 3265 | dnl test for --with-goom-tree |
|---|
| 3262 | 3266 | 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 |
|---|
| 3264 | 3268 | AC_MSG_CHECKING(for libgoom.a in ${with_goom_tree}) |
|---|
| 3265 | 3269 | real_goom_tree="`cd ${with_goom_tree} 2>/dev/null && pwd`" |
|---|