summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiza Sulistyo <riza@teluu.com>2016-07-20 07:03:49 +0000
committerRiza Sulistyo <riza@teluu.com>2016-07-20 07:03:49 +0000
commitee0387cd0466552c4109f9fdb0699c53c995039f (patch)
treeb44733119898c82a2837911d8f746477ae2a1c6a
parent589db6637e559d995708f29bbb5499dbf8f48740 (diff)
Re #1928 (misc): Remove trailing comma that might cause --disable-libyuv to not
work. Thanks to Kyle Kurz for the report. git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5393 74dad513-b988-da41-8d7b-12977e46ad98
-rwxr-xr-xaconfigure16
-rw-r--r--aconfigure.ac2
2 files changed, 15 insertions, 3 deletions
diff --git a/aconfigure b/aconfigure
index f2e722cd..78601ca3 100755
--- a/aconfigure
+++ b/aconfigure
@@ -751,6 +751,7 @@ infodir
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -873,6 +874,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1125,6 +1127,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1262,7 +1273,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+ libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1415,6 +1426,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -8379,7 +8391,7 @@ fi
# Check whether --enable-libyuv was given.
if test "${enable_libyuv+set}" = set; then :
enableval=$enable_libyuv; if test "$enable_libyuv" = "no"; then
- ac_no_yuv=1,
+ ac_no_yuv=1
$as_echo "#define PJMEDIA_HAS_LIBYUV 0" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if libyuv is disabled...yes" >&5
diff --git a/aconfigure.ac b/aconfigure.ac
index d51c2224..3c80efac 100644
--- a/aconfigure.ac
+++ b/aconfigure.ac
@@ -1792,7 +1792,7 @@ AC_ARG_ENABLE(libyuv,
AS_HELP_STRING([--disable-libyuv],
[Exclude libyuv in the build]),
[if test "$enable_libyuv" = "no"; then
- [ac_no_yuv=1],
+ [ac_no_yuv=1]
AC_DEFINE(PJMEDIA_HAS_LIBYUV,0)
AC_MSG_RESULT([Checking if libyuv is disabled...yes])
fi],