[vlc-devel] [PATCH 5/7] configure: Consistently quote AC_SUBST argument
Marvin Scholz
epirat07 at gmail.com
Sun Jul 15 01:28:15 CEST 2018
---
configure.ac | 92 ++++++++++++++++++++++++++++++------------------------------
1 file changed, 46 insertions(+), 46 deletions(-)
diff --git a/configure.ac b/configure.ac
index d9cd471e71..66f4f88072 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ VERSION_EXTRA=0
VERSION_DEV=dev
PKGDIR="vlc"
-AC_SUBST(PKGDIR)
+AC_SUBST([PKGDIR])
CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
CODENAME="Otto Chriek"
@@ -260,8 +260,8 @@ case "${host_os}" in
PROGRAMFILES="PROGRAMFILES"
;;
esac
- AC_SUBST(WINDOWS_ARCH)
- AC_SUBST(PROGRAMFILES)
+ AC_SUBST([WINDOWS_ARCH])
+ AC_SUBST([PROGRAMFILES])
fi
;;
@@ -307,7 +307,7 @@ AS_IF([test "${SYS}" = "mingw32"],[
VLC_ADD_LIBS([libvlccore], [-lruntimeobject])
AC_LIBOBJ([gai_strerror])
],[])
- AC_SUBST(LIBCOM)
+ AC_SUBST([LIBCOM])
])
AC_DEFINE_UNQUOTED(VLC_WINSTORE_APP, ${vlc_winstore_app}, [Define to 1 if you want to build for Windows Store apps])
@@ -341,7 +341,7 @@ case "${build_os}" in
*)
;;
esac
-AC_SUBST(BUILDEXEEXT)
+AC_SUBST([BUILDEXEEXT])
dnl Android is linux, but a bit different
AS_IF([test "$SYS" = linux],[
@@ -443,7 +443,7 @@ AS_IF([test -n "${CONTRIB_DIR}"], [
AC_MSG_ERROR([Third party libraries not found!])
])
])
-AC_SUBST(CONTRIB_DIR)
+AC_SUBST([CONTRIB_DIR])
dnl Add extras/tools to the PATH
TOOLS_DIR="${srcdir}/extras/tools/build/bin"
@@ -675,7 +675,7 @@ AC_LINK_IFELSE([
])],[AC_DEFINE([HAVE_INET_PTON],[1],[Define to 1 if you have inet_pton function])],[AC_LIBOBJ([inet_pton])])
AC_CHECK_FUNCS([if_nameindex])
VLC_RESTORE_FLAGS
-AC_SUBST(SOCKET_LIBS)
+AC_SUBST([SOCKET_LIBS])
dnl Check for socklen_t
AH_TEMPLATE(socklen_t, [Define to `int' if <sys/socket.h> does not define.])
@@ -719,14 +719,14 @@ AC_CHECK_FUNC(getopt_long,, [
GNUGETOPT_LIBS="-lgnugetopt"
])
])
-AC_SUBST(GNUGETOPT_LIBS)
+AC_SUBST([GNUGETOPT_LIBS])
AC_CHECK_LIB(m,cos,[
LIBM="-lm"
], [
LIBM=""
])
-AC_SUBST(LIBM)
+AC_SUBST([LIBM])
AC_CHECK_LIB(m,lrintf, [
AC_DEFINE(HAVE_LRINTF, 1, [Define to 1 if you have the lrintf function])
@@ -791,7 +791,7 @@ AS_IF([test "${enable_shared}" = "no"], [
])
AM_CONDITIONAL([HAVE_DYNAMIC_PLUGINS], [test "${have_dynamic_objects}" != "no"])
-AC_SUBST(LIBDL)
+AC_SUBST([LIBDL])
AC_SEARCH_LIBS([clock_nanosleep], [rt pthread], [
AS_IF([test "$ac_cv_search_clock_nanosleep" != "none required"], [
@@ -804,7 +804,7 @@ AC_SEARCH_LIBS([clock_nanosleep], [rt pthread], [
])
])
])
-AC_SUBST(LIBRT)
+AC_SUBST([LIBRT])
dnl
dnl Check for headers
@@ -1141,7 +1141,7 @@ AC_CACHE_CHECK([if linker supports -Bsymbolic], [ac_cv_ld_bsymbolic], [
])
VLC_RESTORE_FLAGS
SYMBOLIC_LDFLAGS="${ac_cv_ld_bsymbolic}"
-AC_SUBST(SYMBOLIC_LDFLAGS)
+AC_SUBST([SYMBOLIC_LDFLAGS])
VLC_SAVE_FLAGS
LDFLAGS="${LDFLAGS} -Wl,-z,defs"
@@ -1570,7 +1570,7 @@ AS_IF([test "${enable_altivec}" = "yes"], [
VLC_ADD_LIBS([libvlccore],[-Wl,-framework,vecLib])
])
])
-AC_SUBST(ALTIVEC_CFLAGS)
+AC_SUBST([ALTIVEC_CFLAGS])
AM_CONDITIONAL([HAVE_ALTIVEC], [test "$have_altivec" = "yes"])
dnl
@@ -2025,7 +2025,7 @@ fi
dnl
dnl AVFoundation
-AC_SUBST(have_avfoundation, ["no"])
+AC_SUBST([have_avfoundation], ["no"])
AC_ARG_ENABLE([macosx-avfoundation],
AS_HELP_STRING([--enable-macosx-avfoundation], [Mac OS X avcapture (video) module (default enabled on Mac OS X)]))
if test "x${enable_macosx_avfoundation}" != "xno" &&
@@ -2279,8 +2279,8 @@ AS_IF([test "${enable_mad}" != "no"], [
AC_MSG_ERROR([Could not find libmad. Install it or pass --disable-mad to disable it.])
])
])
-AC_SUBST(MAD_CFLAGS)
-AC_SUBST(MAD_LIBS)
+AC_SUBST([MAD_CFLAGS])
+AC_SUBST([MAD_LIBS])
AM_CONDITIONAL([HAVE_MAD], [test "${have_mad}" = "yes"])
dnl mpg123 plugin
@@ -3406,7 +3406,7 @@ AS_IF([test "$enable_kva" != "no"], [
])
])
])
-AC_SUBST(KVA_LIBS)
+AC_SUBST([KVA_LIBS])
AM_CONDITIONAL([HAVE_KVA], [test "${have_kva}" = "yes"])
dnl
@@ -3504,7 +3504,7 @@ AS_IF([test "$enable_oss" != "no"], [
])
])
])
-AC_SUBST(OSS_LIBS)
+AC_SUBST([OSS_LIBS])
AM_CONDITIONAL([HAVE_OSS], [test "${have_oss}" = "yes"])
dnl
@@ -3627,7 +3627,7 @@ AS_IF([test "$enable_kai" != "no"], [
])
])
])
-AC_SUBST(KAI_LIBS)
+AC_SUBST([KAI_LIBS])
AM_CONDITIONAL([HAVE_KAI], [test "${have_kai}" = "yes"])
dnl
@@ -3707,7 +3707,7 @@ AS_IF([test "${enable_qt}" != "no"], [
AS_IF([test "${enable_qt}" != "no"], [
ALIASES="${ALIASES} qvlc"
])
-AC_SUBST(QT_VERSION)
+AC_SUBST([QT_VERSION])
AM_CONDITIONAL([ENABLE_QT], [test "$enable_qt" != "no"])
AM_CONDITIONAL([HAVE_QT5_X11], [test "${have_qt5_x11}" = "yes"])
@@ -3862,7 +3862,7 @@ AS_IF([test "$with_breakpad" != "no"], [
AM_CONDITIONAL([HAVE_BREAKPAD], [test "$with_breakpad" != "no"])
AS_IF([test "$with_breakpad" != "no"], [
- AC_SUBST(BREAKPAD_URL, ["${with_breakpad}"])
+ AC_SUBST([BREAKPAD_URL], ["${with_breakpad}"])
])
dnl
@@ -4048,8 +4048,8 @@ AS_IF([test -z "$GCRYPT_LIBS"], [
GCRYPT_LIBS="-lgcrypt -lgpg-error"
])
-AC_SUBST(GCRYPT_CFLAGS)
-AC_SUBST(GCRYPT_LIBS)
+AC_SUBST([GCRYPT_CFLAGS])
+AC_SUBST([GCRYPT_LIBS])
AM_CONDITIONAL([HAVE_GCRYPT], [test "${ac_cv_lib_gcrypt}" = "yes"])
dnl
@@ -4153,7 +4153,7 @@ AS_IF([test "${ac_cv_c_bigendian}" = "yes"], [
], [
DEFS_BIGENDIAN=""
])
-AC_SUBST(DEFS_BIGENDIAN)
+AC_SUBST([DEFS_BIGENDIAN])
dnl
dnl Where to install KDE solid .desktop
@@ -4176,7 +4176,7 @@ AS_IF([test "${with_kde_solid}" != "no"], [
soliddatadir="${with_kde_solid}"
])
])
-AC_SUBST(soliddatadir)
+AC_SUBST([soliddatadir])
AM_CONDITIONAL([KDE_SOLID], [test "x${soliddatadir}" != "x"])
dnl
@@ -4266,13 +4266,13 @@ AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MINOR,${VERSION_MINOR}, [version minor number
AC_DEFINE_UNQUOTED(PACKAGE_VERSION_REVISION,${VERSION_REVISION}, [version revision number])
AC_DEFINE_UNQUOTED(PACKAGE_VERSION_EXTRA,${VERSION_EXTRA}, [version extra number])
AC_DEFINE_UNQUOTED(PACKAGE_VERSION_DEV,"${VERSION_DEV}", [version development string])
-AC_SUBST(COPYRIGHT_MESSAGE)
-AC_SUBST(VERSION_MESSAGE)
-AC_SUBST(VERSION_MAJOR)
-AC_SUBST(VERSION_MINOR)
-AC_SUBST(VERSION_REVISION)
-AC_SUBST(VERSION_EXTRA)
-AC_SUBST(COPYRIGHT_YEARS)
+AC_SUBST([COPYRIGHT_MESSAGE])
+AC_SUBST([VERSION_MESSAGE])
+AC_SUBST([VERSION_MAJOR])
+AC_SUBST([VERSION_MINOR])
+AC_SUBST([VERSION_REVISION])
+AC_SUBST([VERSION_EXTRA])
+AC_SUBST([COPYRIGHT_YEARS])
AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami|sed -e 's/\\\/\\\\\\\/g'`", [user who ran configure])
AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname -f 2>/dev/null || hostname`", [host which ran configure])
AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1 | sed -e 's/ *$//'`", [compiler])
@@ -4284,20 +4284,20 @@ CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/include ${CPPFLAGS}"
dnl
dnl Configuration is finished
dnl
-AC_SUBST(SYS)
-AC_SUBST(ARCH)
-AC_SUBST(ALIASES)
-AC_SUBST(ASM)
-AC_SUBST(MOC)
-AC_SUBST(RCC)
-AC_SUBST(UIC)
-AC_SUBST(WINDRES)
-AC_SUBST(WINE_SDK_PATH)
-AC_SUBST(LIBEXT)
-AC_SUBST(AM_CPPFLAGS)
-AC_SUBST(MACOSX_DEPLOYMENT_TARGET)
-AC_SUBST(FILE_LIBVLCCORE_DLL)
-AC_SUBST(FILE_LIBVLC_DLL)
+AC_SUBST([SYS])
+AC_SUBST([ARCH])
+AC_SUBST([ALIASES])
+AC_SUBST([ASM])
+AC_SUBST([MOC])
+AC_SUBST([RCC])
+AC_SUBST([UIC])
+AC_SUBST([WINDRES])
+AC_SUBST([WINE_SDK_PATH])
+AC_SUBST([LIBEXT])
+AC_SUBST([AM_CPPFLAGS])
+AC_SUBST([MACOSX_DEPLOYMENT_TARGET])
+AC_SUBST([FILE_LIBVLCCORE_DLL])
+AC_SUBST([FILE_LIBVLC_DLL])
AC_CONFIG_FILES([
Makefile
--
2.15.1 (Apple Git-101)
More information about the vlc-devel
mailing list