projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MatN needed updates and additional information
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
configure.ac
diff --git
a/cinelerra-5.1/configure.ac
b/cinelerra-5.1/configure.ac
index 6fb52bd54d4cd0ffcb3e5f79ccbd608f8f587262..c7394b7b217ad80b331d4bc176ef8b3610639f1b 100644
(file)
--- a/
cinelerra-5.1/configure.ac
+++ b/
cinelerra-5.1/configure.ac
@@
-1,11
+1,15
@@
AC_PREREQ([2.69])
AC_PREREQ([2.69])
-AC_INIT([cinelerra], [5.1], [mail@lists.cinelerra-gg.org])
+AC_INIT([cinelerra],[5.1],[mail@lists.cinelerra-gg.org])
+
+# Put autogenerated stuff in subdir m4, which must be created
+# externally. This macro must be set before calling AC_INIT_AUTOMAKE
+AC_CONFIG_AUX_DIR(m4)
AM_INIT_AUTOMAKE([foreign])
AM_PROG_AS
AM_INIT_AUTOMAKE([foreign])
AM_PROG_AS
-AC_LANG
_CPLUSPLUS
-AC_LANG
_C
+AC_LANG
([C++])
+AC_LANG
([C])
AC_PROG_CXX
CFG_CFLAGS+=" -fno-omit-frame-pointer -fno-math-errno -fno-signed-zeros"
AC_PROG_CXX
CFG_CFLAGS+=" -fno-omit-frame-pointer -fno-math-errno -fno-signed-zeros"
@@
-33,7
+37,7
@@
CFG_CFLAGS+=" -I/usr/include/mjpegtools -I/usr/local/include/mjpegtools"
AC_DEFUN([CHECK_WITH], [
AC_ARG_WITH([$1],
AC_DEFUN([CHECK_WITH], [
AC_ARG_WITH([$1],
- A
C_HELP_STRING([--with-[$1]],
[$2 ($4)]),
+ A
S_HELP_STRING([--with-[$1]],
[$2 ($4)]),
[WANT_$3=$withval], [WANT_$3='$4'])
AC_SUBST([WANT_$3])
])
[WANT_$3=$withval], [WANT_$3='$4'])
AC_SUBST([WANT_$3])
])
@@
-156,7
+160,7
@@
inc_$1="$4"
AC_DEFUN([PKG_3RD],[
AC_ARG_ENABLE([$1],
AC_DEFUN([PKG_3RD],[
AC_ARG_ENABLE([$1],
- A
C
_HELP_STRING([--enable-$1],[build $1 ($2)]),
+ A
S
_HELP_STRING([--enable-$1],[build $1 ($2)]),
[PKG_$1=$enableval], [PKG_$1=$2])
PKG_DEF([$1],[$3],[$4],[$5])
])
[PKG_$1=$enableval], [PKG_$1=$2])
PKG_DEF([$1],[$3],[$4],[$5])
])
@@
-196,7
+200,6
@@
PKG_3RD([ffmpeg],[yes],
[ libavutil/libavutil.a \
libavcodec/libavcodec.a \
libpostproc/libpostproc.a \
[ libavutil/libavutil.a \
libavcodec/libavcodec.a \
libpostproc/libpostproc.a \
- libavdevice/libavdevice.a \
libavformat/libavformat.a \
libswscale/libswscale.a \
libavfilter/libavfilter.a \
libavformat/libavformat.a \
libswscale/libswscale.a \
libavfilter/libavfilter.a \
@@
-208,7
+211,7
@@
if test "x$WANT_GIT_FFMPEG" != "xno" ; then
fi
PKG_3RD([fftw],[auto],
fi
PKG_3RD([fftw],[auto],
- [fftw-3.3.
8
],
+ [fftw-3.3.
10
],
[ .libs/libfftw3.a \
libbench2/libbench2.a \
rdft/scalar/r2cb/.libs/librdft_scalar_r2cb.a \
[ .libs/libfftw3.a \
libbench2/libbench2.a \
rdft/scalar/r2cb/.libs/librdft_scalar_r2cb.a \
@@
-398,7
+401,7
@@
PKG_3RD([x265],[auto],
[ . source ])
PKG_3RD([libvpx],[auto],
[ . source ])
PKG_3RD([libvpx],[auto],
- [libvpx-1.
8.2
],
+ [libvpx-1.
11.0
],
[ libvpx.a ],
[ . ])
[ libvpx.a ],
[ . ])
@@
-465,7
+468,7
@@
AC_SUBST(STATIC_PKGS)
AC_DEFUN([CHECK_ENABLE], [
AC_ARG_ENABLE([$1],
AC_DEFUN([CHECK_ENABLE], [
AC_ARG_ENABLE([$1],
- A
C_HELP_STRING([--enable-[$1]],
[$3 ([$4])]),
+ A
S_HELP_STRING([--enable-[$1]],
[$3 ([$4])]),
[WANT_$2=$enableval], [WANT_$2=[$4]])
])
[WANT_$2=$enableval], [WANT_$2=[$4]])
])
@@
-652,7
+655,7
@@
AC_DEFUN([CHECK_WANT], [
RESULT=yes
# WANT_$1
AC_ARG_WITH(m4_tolower([$1]),
RESULT=yes
# WANT_$1
AC_ARG_WITH(m4_tolower([$1]),
- A
C_HELP_STRING([m4_join([-],[--with],m4_tolower([$1]))], [$3] (auto)
),
+ A
S_HELP_STRING([m4_join([-],[--with],m4_tolower([$1]))],[$3 (auto)]
),
[WANT_$1=$withval],[WANT_$1=$2])
m4_quote($4)
if test "x$WANT_$1" = "xauto" ; then
[WANT_$1=$withval],[WANT_$1=$2])
m4_quote($4)
if test "x$WANT_$1" = "xauto" ; then
@@
-858,14
+861,14
@@
HAVE_ilmbase=no \
OBJDIR=`uname -m`
AC_SUBST(OBJDIR)
OBJDIR=`uname -m`
AC_SUBST(OBJDIR)
-echo "A
C
_HELP_STRING([Reason],[Package])"
-echo "A
C
_HELP_STRING([------],[-------])"
+echo "A
S
_HELP_STRING([Reason],[Package])"
+echo "A
S
_HELP_STRING([------],[-------])"
AC_DEFUN([PKG_DISABLED],[
PKG_$1="no"
BUILD_$1=0
AC_SUBST(BUILD_$1)
AC_DEFUN([PKG_DISABLED],[
PKG_$1="no"
BUILD_$1=0
AC_SUBST(BUILD_$1)
- echo "A
C
_HELP_STRING([disabled],[$1])"
+ echo "A
S
_HELP_STRING([disabled],[$1])"
])
AC_DEFUN([PKG_SHARED],[
PKG_$1="shared"
])
AC_DEFUN([PKG_SHARED],[
PKG_$1="shared"
@@
-880,7
+883,7
@@
AC_DEFUN([PKG_STATIC],[
BUILD_$1=1
AC_SUBST(BUILD_$1)
STATIC_BLDS+=" [$1]"
BUILD_$1=1
AC_SUBST(BUILD_$1)
STATIC_BLDS+=" [$1]"
- echo "A
C
_HELP_STRING([$2],[$1])"
+ echo "A
S
_HELP_STRING([$2],[$1])"
fi
])
fi
])
@@
-975,11
+978,11
@@
fi
AC_SUBST(STATIC_BLDS)
for f in $SHARED_LIBS; do
AC_SUBST(STATIC_BLDS)
for f in $SHARED_LIBS; do
- echo "A
C
_HELP_STRING([shared],[$f])"
+ echo "A
S
_HELP_STRING([shared],[$f])"
done
AC_SUBST(SHARED_LIBS)
for f in $SYSTEM_LIBS; do
done
AC_SUBST(SHARED_LIBS)
for f in $SYSTEM_LIBS; do
- echo "A
C
_HELP_STRING([system],[$f])"
+ echo "A
S
_HELP_STRING([system],[$f])"
done
AC_SUBST(SYSTEM_LIBS)
done
AC_SUBST(SYSTEM_LIBS)
@@
-1055,7
+1058,7
@@
fi
if test [ "$(uname -o)"] = "Android" ; then
# termux
if test [ "$(uname -o)"] = "Android" ; then
# termux
-EXTRA_LIBS+=' -liconv'
+EXTRA_LIBS+=' -liconv
-landroid-shmem
'
fi
# intel lock elision bugs
fi
# intel lock elision bugs