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
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_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.])
])