andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build: Make building of glupy more obvious

Browse Source 
Yet again glupy..!!

Core changes:
* Provide --disable-glupy(instead of --enable-glupy) since we try to
  build it by default.
* AC_SUBST macro is considered/executed even if it is inside an if
  condition. As a result GLUPY_SUBDIR was always substituted which in
  turn would make compilation enter glupy/ translator sources in absence
  of python{2/3}-devel and fails.

Miscellaneous changes:
* Remove an explicit echo for printing PYTHON version.
* Replace hard coded python version in warning message displayed in
  absence of python{2/3}-devel.
* Redirect pushd and popd output to /dev/null

Change-Id: If1ba30a12a8bda5763ef528787fccb2f7946b136
Updates: bz#1193929
Signed-off-by: Anoop C S <anoopcs@redhat.com>
This commit is contained in:
Anoop C S 2018-09-07 13:50:47 +05:30 committed by Amar Tumballi
parent cfecc7b3df
commit 05e64dab56
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
configure.ac
View File

@ -659,8 +659,6 @@ if test -n "${PYTHON}"; then
have_python=yes
fi
echo "PYTHON = ${PYTHON} ${PYTHON_VERSION}"
dnl Use pkg-config to get runtime search path missing from ${PYTHON}-config
dnl Just do "true" on failure so that configure does not bail out
dnl Note: python 2.6's devel pkg (e.g. in CentOS/RHEL 6) does not have
@ -1440,14 +1438,9 @@ fi
dnl glupy section
BUILD_GLUPY=no
AC_ARG_ENABLE([glupy], AS_HELP_STRING([--enable-glupy], [build glupy]))
if test "x$enable_glupy" != "xno"; then enable_glupy=yes; fi
if test "x$enable_glupy" = "xyes"; then
GLUPY_SUBDIR=glupy
GLUPY_SUBDIR_MAKEFILE=xlators/features/glupy/Makefile
GLUPY_SUBDIR_SRC_MAKEFILE=xlators/features/glupy/src/Makefile
AC_ARG_ENABLE([glupy], AS_HELP_STRING([--disable-glupy], [disable building glupy]))
if test "x$enable_glupy" != "xno"; then
if test "x${have_python}" = "xyes" -a -n "${PYTHON_CFLAGS}"; then
case $host_os in
darwin*)
@ -1460,11 +1453,14 @@ if test "x$enable_glupy" = "xyes"; then
else
AC_MSG_WARN([
---------------------------------------------------------------------------------
cannot build glupy. python 2.x and python-devel/python-dev package are required.
cannot build glupy. python ${PYTHON_VERSION} and python-devel/python-dev package are required.
---------------------------------------------------------------------------------])
fi
if test "x$BUILD_GLUPY" = "xyes"; then
GLUPY_SUBDIR=glupy
GLUPY_SUBDIR_MAKEFILE=xlators/features/glupy/Makefile
GLUPY_SUBDIR_SRC_MAKEFILE=xlators/features/glupy/src/Makefile
echo "building glupy with -isystem ${PYTHON_CFLAGS} ${PYTHON_LIBS}"
@ -1717,7 +1713,7 @@ AC_SUBST(GFAPI_EXTRA_LDFLAGS)
GFAPI_LIBS="${ACL_LIBS}"
AC_SUBST(GFAPI_LIBS)
pushd $(dirname $0)
pushd $(dirname $0) &> /dev/null
if test ! -e python-shebangs; then
touch python-shebangs
if test "x${PYTHON}" = "x/usr/bin/python2"; then
@ -1728,7 +1724,7 @@ if test ! -e python-shebangs; then
echo "...done"
fi
fi
popd
popd &> /dev/null
dnl this change necessary for run-tests.sh
AC_CONFIG_FILES([tests/env.rc],[ln -s ${ac_abs_builddir}/env.rc ${ac_abs_srcdir}/env.rc 2>/dev/null])