Commit ee88921f authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Fix contrib automatic non-detection

parent 907a6c23
...@@ -108,10 +108,9 @@ dnl Check for the contrib directory ...@@ -108,10 +108,9 @@ dnl Check for the contrib directory
dnl dnl
AC_ARG_WITH(contrib, AC_ARG_WITH(contrib,
[ --without-contrib do not use the libraries in CONTRIB_DIR],[],[]) [ --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])
AC_ARG_VAR([CONTRIB_DIR], [directory containing pre-built contrib, overriding extras/contrib]) AS_IF([test "${with_contrib}" != "no"],[
if test -z "$CONTRIB_DIR" AS_IF([test -z "$CONTRIB_DIR"], [
then
topdir="`dirname $0`" topdir="`dirname $0`"
if test "`echo \"$topdir\" | cut -c 1`" != "/"; then if test "`echo \"$topdir\" | cut -c 1`" != "/"; then
topdir="`pwd`/$topdir" topdir="`pwd`/$topdir"
...@@ -122,7 +121,7 @@ AC_ARG_WITH(contrib, ...@@ -122,7 +121,7 @@ AC_ARG_WITH(contrib,
gccmachine=`$CC -dumpmachine` gccmachine=`$CC -dumpmachine`
CONTRIB_DIR="${topdir}/extras/contrib/hosts/${gccmachine}" CONTRIB_DIR="${topdir}/extras/contrib/hosts/${gccmachine}"
fi fi
fi ])
AC_MSG_CHECKING([for libs in ${CONTRIB_DIR}]) AC_MSG_CHECKING([for libs in ${CONTRIB_DIR}])
AS_IF([test -d "${CONTRIB_DIR}/lib"],[ AS_IF([test -d "${CONTRIB_DIR}/lib"],[
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
...@@ -160,6 +159,7 @@ AC_ARG_WITH(contrib, ...@@ -160,6 +159,7 @@ AC_ARG_WITH(contrib,
fi fi
],[ ],[
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
CONTRIB_DIR=""
]) ])
]) ])
dnl dnl
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment