dnl
AC_ARG_WITH(contrib,
[ --without-contrib do not use the libraries in CONTRIB_DIR],[],[])
- AS_IF([test "${with_contrib}" != "no"],[
- AC_ARG_VAR([CONTRIB_DIR], [directory containing pre-built contrib, overriding extras/contrib])
- if test -z "$CONTRIB_DIR"
- then
+AC_ARG_VAR([CONTRIB_DIR], [directory containing pre-built contrib, overriding extras/contrib])
+AS_IF([test "${with_contrib}" != "no"],[
+ AS_IF([test -z "$CONTRIB_DIR"], [
topdir="`dirname $0`"
if test "`echo \"$topdir\" | cut -c 1`" != "/"; then
topdir="`pwd`/$topdir"
fi
- CONTRIB_DIR=${topdir}/extras/contrib/hosts/${host}
+ CONTRIB_DIR="${topdir}/extras/contrib/hosts/${host}"
if ! test -d "$CONTRIB_DIR"
then
gccmachine=`$CC -dumpmachine`
- CONTRIB_DIR=${topdir}/extras/contrib/hosts/${gccmachine}
+ CONTRIB_DIR="${topdir}/extras/contrib/hosts/${gccmachine}"
fi
- fi
- AC_MSG_CHECKING([for libs in ${CONTRIB_DIR}])
- AS_IF([test -d ${CONTRIB_DIR}/lib],[
+ ])
+ AC_MSG_CHECKING([for libs in ${CONTRIB_DIR}])
+ AS_IF([test -d "${CONTRIB_DIR}/lib"],[
AC_MSG_RESULT([yes])
AC_SUBST(CONTRIB_DIR)
export PATH=${CONTRIB_DIR}/bin:$PATH
CXXFLAGS_save="${CXXFLAGS_save} -I${CONTRIB_DIR}/include"
OBJCFLAGS="${OBJCFLAGS} -I${CONTRIB_DIR}/include"
OBJCFLAGS_save="${OBJCFLAGS_save} -I${CONTRIB_DIR}/include"
- if test $build = $host -o "$PKG_CONFIG_LIBDIR"; then
- export PKG_CONFIG_PATH=${CONTRIB_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH
+ if test "$build" = "$host" -o "$PKG_CONFIG_LIBDIR"; then
+ export PKG_CONFIG_PATH="${CONTRIB_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH"
else
- export PKG_CONFIG_LIBDIR=${CONTRIB_DIR}/lib/pkgconfig
+ export PKG_CONFIG_LIBDIR="${CONTRIB_DIR}/lib/pkgconfig"
fi
LDFLAGS="${LDFLAGS} -L${CONTRIB_DIR}/lib"
LDFLAGS_save="${LDFLAGS_save} -L${CONTRIB_DIR}/lib"
- if test -z $with_mozilla_sdk_path; then
- with_mozilla_sdk_path=${CONTRIB_DIR}/gecko-sdk
+ if test -z "$with_mozilla_sdk_path"; then
+ with_mozilla_sdk_path="${CONTRIB_DIR}/gecko-sdk"
fi
- if test -z $with_cyberlink_tree; then
- with_cyberlink_tree=${CONTRIB_DIR}/src/clinkcc
+ if test -z "$with_cyberlink_tree"; then
+ with_cyberlink_tree="${CONTRIB_DIR}/src/clinkcc"
fi
if test "${SYS}" = "darwin"; then
- export LD_LIBRARY_PATH=${CONTRIB_DIR}/lib:$LD_LIBRARY_PATH
- export DYLD_LIBRARY_PATH=${CONTRIB_DIR}/lib:$DYLD_LIBRARY_PATH
+ export LD_LIBRARY_PATH="${CONTRIB_DIR}/lib:$LD_LIBRARY_PATH"
+ export DYLD_LIBRARY_PATH="${CONTRIB_DIR}/lib:$DYLD_LIBRARY_PATH"
elif test "${SYS}" = "beos"; then
- export LIBRARY_PATH=${CONTRIB_DIR}/lib:$LIBRARY_PATH
- export BELIBRARIES=${CONTRIB_DIR}/lib:$BELIBRARIES
+ export LIBRARY_PATH="${CONTRIB_DIR}/lib:$LIBRARY_PATH"
+ export BELIBRARIES="${CONTRIB_DIR}/lib:$BELIBRARIES"
fi
- ],[
- AC_MSG_RESULT([no])
- ])
+ ],[
+ AC_MSG_RESULT([no])
+ CONTRIB_DIR=""
+ ])
])
dnl
dnl Set default values
need_libc=false
dnl Check for usual libc functions
-AC_CHECK_FUNCS([ctime_r daemon fcntl fdopendir fork getenv getpwuid_r gettimeofday isatty lstat memalign posix_fadvise posix_madvise posix_memalign putenv setenv setlocale stricmp strnicmp tdestroy uselocale])
-AC_REPLACE_FUNCS([asprintf atof atoll getcwd getpid gmtime_r lldiv localtime_r nrand48 rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab vasprintf])
+AC_CHECK_FUNCS([ctime_r daemon fcntl fdopendir fork getenv getpwuid_r gettimeofday isatty lstat memalign openat posix_fadvise posix_madvise posix_memalign putenv setenv setlocale stricmp strnicmp tdestroy uselocale])
+AC_REPLACE_FUNCS([asprintf atof atoll getcwd getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab vasprintf])
AC_CHECK_FUNCS(fdatasync,,
[AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
])
fi
# Only test for dlopen() if the others didn't work
+LIBDL=""
if test "${ac_cv_have_plugins}" = "no" -o "${SYS}" = "darwin"; then
AC_CHECK_HEADERS(dlfcn.h sys/dl.h)
ac_cv_my_have_dlopen=no
- AC_CHECK_FUNC(dlopen,
- ac_cv_my_have_dlopen=yes,
- AC_CHECK_LIB(dl, dlopen,
+ AC_CHECK_FUNC(dlopen, [
+ ac_cv_my_have_dlopen=yes
+ ], [
+ AC_CHECK_LIB(dl, dlopen, [
ac_cv_my_have_dlopen=yes
- VLC_ADD_LIBS([libvlccore realvideo lua],[-ldl]),
- AC_CHECK_LIB(svld, dlopen,
+ LIBDL="-ldl"
+ ], [
+ AC_CHECK_LIB(svld, dlopen, [
ac_cv_my_have_dlopen=yes
- VLC_ADD_LIBS([libvlccore],[-lsvld]))))
+ LIBDL="-lsvld"
+ ])
+ ])
+ ])
if test "${ac_cv_my_have_dlopen}" = "yes"; then
AC_DEFINE(HAVE_DL_DLOPEN, 1, [Define if you have the dlopen API])
ac_cv_have_plugins=yes
+ VLC_ADD_LIBS([libvlccore realvideo lua],[$LIBDL])
fi
fi
+AC_SUBST(LIBDL)
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
dnl Check for pthreads - borrowed from XMMS
else
AC_MSG_ERROR([Could not find lua. Lua is needed for some interfaces (rc, telnet, http) as well as many other custom scripts. Use --disable-lua to ignore this error.])
fi
- AC_PATH_PROG(LUAC, luac)
+ AC_ARG_VAR([LUAC], [LUA byte compiler])
+ AC_PATH_PROG(LUAC, luac, [
+ AC_MSG_ERROR([Could not find the LUA byte compiler.])
+ ])
fi
AM_CONDITIONAL(BUILD_LUA, [test "${have_lua}" = "yes"])
if test "${enable_omxil}" = "yes"
then
VLC_ADD_PLUGIN([omxil])
- VLC_ADD_LIBS([omxil], [-ldl])
+ VLC_ADD_LIBS([omxil], [$LIBDL])
fi
dnl
LIBS="${LIBS_save}"
if test "${have_directfb}" = "true"; then
- LIBS_mydirectfb="${LIBS_new} -lz -ldl -ldirectfb -lfusion -ldirect -lpthread"
+ LIBS_mydirectfb="${LIBS_new} -lz $LIBDL -ldirectfb -lfusion -ldirect -lpthread"
CPPFLAGS_mydirectfb="${CPPFLAGS_new}"
fi
else
AC_ARG_VAR([MOZILLA_LIBS], [linker flags for Mozilla, overriding pkg-config])
AC_MSG_NOTICE([Checking for Mozilla])
found=0
- if test -n "$MOZILLA_CFLAGS" -a -n "$MOZILLA_LIBS"
+ if test -n "$MOZILLA_CFLAGS" -o -n "$MOZILLA_LIBS"
then
found=1
else
if test -n "$PKG_CONFIG"; then
for i in "${with_mozilla_pkg}" libxul {seamonkey,iceape,xulrunner,firefox,iceweasel,mozilla}-plugin; do
- echo "Trying to find $i.pc files" >&5
- if $PKG_CONFIG --exists --print-errors "$i" 2>&5
- then
- echo "Using $i.pc files." >&5
- echo "Using $i.pc files." >&6
- found=1
- MOZILLA_CFLAGS=$(eval $PKG_CONFIG --cflags "$i" )
- MOZILLA_LIBS=$(eval $PKG_CONFIG --libs "$i" )
- break
- fi
+ if test -n "$i"
+ then
+ echo "Trying to find $i package" >&AS_MESSAGE_LOG_FD
+ AC_MSG_CHECKING([for $i >= 1.9.2])
+ if $PKG_CONFIG --exists --print-errors "$i >= 1.9.2" 2>&AS_MESSAGE_LOG_FD
+ then
+ echo "Using $i pkg-config package." >&AS_MESSAGE_LOG_FD
+ echo "Using $i package." >&AS_MESSAGE_FD
+ found=1
+ MOZILLA_CFLAGS=$(eval $PKG_CONFIG --cflags "$i" )
+ MOZILLA_LIBS=$(eval $PKG_CONFIG --libs "$i" )
+ AC_MSG_RESULT([yes])
+ break
+ fi
+ AC_MSG_RESULT([no])
+ fi
done
fi
fi
#endif
])
if test "${MOZILLA_REQUIRED_HEADERS}" = "0"; then
- AC_MSG_ERROR([Please install the Firefox development tools; mozilla-config.h, plugin/npapi.h and plugin/npruntime.h were not found.])
+ AC_MSG_ERROR([Please install the Firefox development tools; plugin/npapi.h and/or plugin/npruntime.h were not found.])
fi
MOZILLA_REQUIRED_HEADERS=
mozilla=:
AC_PATH_PROGS(MOZILLA_CONFIG,
[mozilla-config seamonkey-config xulrunner-config],
[no])
- test "${MOZILLA_CONFIG}" = "no" && AC_MSG_ERROR([Please install the Mozilla development tools. mozilla-config was not found.])
+ test "${MOZILLA_CONFIG}" = "no" && AC_MSG_ERROR([Please install the Mozilla development tools (version 1.9.2 or higher) or use --disable-mozilla.])
]
)
dnl pkg-config failed but we might have found a mozilla-config
projects / vlc / blobdiff