From: <ca...@us...> - 2008-08-10 00:07:35
|
Revision: 1640 http://ganglia.svn.sourceforge.net/ganglia/?rev=1640&view=rev Author: carenas Date: 2008-08-10 00:07:43 +0000 (Sun, 10 Aug 2008) Log Message: ----------- build: clear test and assignment for undefined values or spaces Modified Paths: -------------- trunk/monitor-core/configure.in Modified: trunk/monitor-core/configure.in =================================================================== --- trunk/monitor-core/configure.in 2008-08-09 23:30:32 UTC (rev 1639) +++ trunk/monitor-core/configure.in 2008-08-10 00:07:43 UTC (rev 1640) @@ -59,7 +59,7 @@ LIBGANGLIA_BINARY_AGE=0 ### END RELEASE VARIABLES ############################# -if test "$GANGLIA_SNAPSHOT" != yes; +if test x"$GANGLIA_SNAPSHOT" != xyes; then GANGLIA_VERSION=$GANGLIA_MAJOR_VERSION.$GANGLIA_MINOR_VERSION.$GANGLIA_MICRO_VERSION else @@ -136,7 +136,7 @@ cd $ganglia_popdir modpathstart="" -if test x"$enable_static_build" = xyes ; then +if test x"$enable_static_build" = xyes; then modpathstart="#" fi @@ -146,29 +146,29 @@ AC_ARG_WITH( gmetad, [ --with-gmetad compile and install the Ganglia Meta Daemon], -if test "$withval" = yes; then gmetad=yes; fi) +if test x"$withval" = xyes; then gmetad="yes"; fi) -AM_CONDITIONAL(BUILD_GMETAD, test x$gmetad = xyes) +AM_CONDITIONAL(BUILD_GMETAD, test x"$gmetad" = xyes) AC_ARG_WITH( python, [ --with-python=PATH Specify prefix for python or full path to interpreter], -[if test x"$withval" != xno; then enable_python="yes"; PYTHON_BIN=$withval; fi]) +[if test x"$withval" != xno; then enable_python="yes"; PYTHON_BIN="$withval"; fi]) AC_ARG_WITH( librrd, [ --with-librrd=DIR Specify location for librrd], -[if test x"$withval" != xno; then librrd=yes; librrdpath=$withval; fi]) +[if test x"$withval" != xno; then librrd="yes"; librrdpath="$withval"; fi]) AC_ARG_WITH( libapr, [ --with-libapr=PATH Specify location for libapr-1 or full path to apr-1-config], -[if test x"$withval" != xno; then libapr=yes; libaprpath=$withval; fi]) +[if test x"$withval" != xno; then libapr="yes"; libaprpath="$withval"; fi]) AC_ARG_WITH( libexpat, [ --with-libexpat=DIR Specify location for libexpat], -[if test x"$withval" != xno; then libexpat=yes; libexpatpath=$withval; fi]) +[if test x"$withval" != xno; then libexpat="yes"; libexpatpath="$withval"; fi]) AC_ARG_WITH( libconfuse, [ --with-libconfuse=DIR Specify location for libconfuse], -[if test x"$withval" != xno; then libconfuse=yes; libconfusepath=$withval; fi]) +[if test x"$withval" != xno; then libconfuse="yes"; libconfusepath="$withval"; fi]) AC_ARG_WITH( moduledir, [ --with-moduledir=DIR Base directory for dynamically loadable modules], @@ -208,7 +208,7 @@ AC_DEFINE(GSTATUS, 1, GSTATUS)], [ enable_status="no" ] ) -AM_CONDITIONAL(BUILD_STATUS, test "$enable_status" = yes) +AM_CONDITIONAL(BUILD_STATUS, test x"$enable_status" = xyes) dnl ################################################################## dnl Checks for libraries. @@ -226,12 +226,12 @@ dnl fi dnl fi -if test x"$librrdpath" != x && test x"$librrdpath" != xyes ; then +if test x"$librrdpath" != x && test x"$librrdpath" != xyes; then CFLAGS="$CFLAGS -I$librrdpath/include" LDFLAGS="$LDFLAGS -L$librrdpath/lib" fi -if test x"$gmetad" = xyes ; then +if test x"$gmetad" = xyes; then AC_CHECK_HEADERS(rrd.h) AC_CHECK_LIB(rrd, rrd_create, [echo "The ganglia graphs are created using RRDTool (http://www.rrdtool.org/)"], [], [-lm]) if test x"$ac_cv_lib_rrd_rrd_create" != xyes; then @@ -251,7 +251,7 @@ fi fi -if test "$enable_python" = yes ; then +if test x"$enable_python" = xyes; then echo echo Checking for python @@ -259,7 +259,7 @@ if test -z "$PYTHON_BIN"; then AC_PATH_PROG(PYTHON_BIN, python) else - if test -d $PYTHON_BIN; then + if test -d "$PYTHON_BIN"; then PYTHON_BIN="$PYTHON_BIN/bin/python" fi fi @@ -292,11 +292,11 @@ AC_MSG_CHECKING(Python support) AC_MSG_RESULT($enable_python) -AM_CONDITIONAL(BUILD_PYTHON, test "$enable_python" = "yes") +AM_CONDITIONAL(BUILD_PYTHON, test x"$enable_python" = xyes) echo echo Checking for apr -if test x"$libaprpath" != x && test x"$libaprpath" != xyes ; then +if test x"$libaprpath" != x && test x"$libaprpath" != xyes; then if test -f "$libaprpath" ; then APR_INCLUDES=`$libaprpath --includes` AC_SUBST(APR_INCLUDES) @@ -319,13 +319,13 @@ AC_SUBST(APR_INCLUDES) APR_LIBPATH=`$APR_CONFIG --link-ld` APR_LIBPATH=`expr "x$APR_LIBPATH" : '.*-L\(.*\) '` - if test x$APR_LIBPATH != x; then + if test x"$APR_LIBPATH" != x; then LDFLAGS="$LDFLAGS -L$APR_LIBPATH" fi AC_CHECK_LIB(apr-1, apr_socket_send,,,[`$APR_CONFIG --libs`]) fi -if test $ac_cv_lib_apr_1_apr_socket_send = yes; then +if test x"$ac_cv_lib_apr_1_apr_socket_send" = xyes; then echo "The ganglia utilities use the Apache Portable Runtime functions (http://www.apache.org/)" echo "Found a suitable libapr1 library" else @@ -335,43 +335,43 @@ echo echo Checking for confuse -if test x"$libconfusepath" != x && test x"$libconfusepath" != xyes ; then +if test x"$libconfusepath" != x && test x"$libconfusepath" != xyes; then CFLAGS="$CFLAGS -I$libconfusepath/include" LDFLAGS="$LDFLAGS -L$libconfusepath/lib" echo "Added -I$libconfusepath/include to CFLAGS" echo "Added -L$libconfusepath/lib to LDFLAGS" fi AC_CHECK_LIB(confuse, cfg_parse) -if test $ac_cv_lib_confuse_cfg_parse = no; then +if test x"$ac_cv_lib_confuse_cfg_parse" = xno; then echo Trying harder including gettext unset ac_cv_lib_confuse_cfg_parse LDFLAGS="$LDFLAGS -lintl" AC_CHECK_LIB(confuse, cfg_parse) - if test $ac_cv_lib_confuse_cfg_parse = no; then + if test x"$ac_cv_lib_confuse_cfg_parse" = xno; then echo Trying harder including iconv unset ac_cv_lib_confuse_cfg_parse LDFLAGS="$LDFLAGS -liconv" AC_CHECK_LIB(confuse, cfg_parse) - if test $ac_cv_lib_confuse_cfg_parse = no; then + if test x"$ac_cv_lib_confuse_cfg_parse" = xno; then echo "libconfuse not found" exit fi fi fi -if test $ac_cv_lib_confuse_cfg_parse = yes; then +if test x"$ac_cv_lib_confuse_cfg_parse" = xyes; then echo "Found a suitable Confuse library" fi echo echo Checking for expat -if test x"$libexpatpath" != x && test x"$libexpatpath" != xyes ; then +if test x"$libexpatpath" != x && test x"$libexpatpath" != xyes; then CFLAGS="$CFLAGS -I$libexpatpath/include" LDFLAGS="$LDFLAGS -L$libexpatpath/lib" echo "Added -I$libexpatpath/include to CFLAGS" echo "Added -L$libexpatpath/lib to LDFLAGS" fi AC_CHECK_LIB(expat, XML_ParserCreate) -if test $ac_cv_lib_expat_XML_ParserCreate = yes; then +if test x"$ac_cv_lib_expat_XML_ParserCreate" = xyes; then echo "Found a suitable Expat library" else echo "libexpat not found" @@ -466,17 +466,17 @@ dnl dnl Add "-Wcast-qual again later"... dnl if test "$ac_cv_prog_gcc" = yes; then -if test "$ac_cv_gcc" = yes; then +if test x"$ac_cv_gcc" = xyes; then CFLAGS="$CFLAGS -Wall -Wshadow -Wpointer-arith -Wcast-align -Wstrict-prototypes" fi dnl disable type punning optimization until verified safe -if test "$ac_cv_c_compiler_gnu" = yes; then +if test x"$ac_cv_c_compiler_gnu" = xyes; then SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fno-strict-aliasing" AC_MSG_CHECKING([whether disabling type punning in gcc is possible]) - AC_TRY_COMPILE([], [], type_punning=yes, type_punning=no) - if test $type_punning = no; then + AC_TRY_COMPILE([], [], type_punning="yes", type_punning="no") + if test x"$type_punning" = xno; then CFLAGS="$SAVE_CFLAGS" fi AC_MSG_RESULT($type_punning) @@ -485,7 +485,7 @@ CFLAGS="$CFLAGS -Wall" fi -if test "$enable_memcheck" = yes; then +if test x"$enable_memcheck" = xyes; then echo "Setting up for memory checking via mpatrol" CFLAGS="$CFLAGS -fcheck-memory-usage " LDFLAGS="$LDFLAGS -lmpatrol -lbfd -liberty " @@ -547,7 +547,7 @@ *aix*) CFLAGS="$CFLAGS -D_ALL_SOURCE -DAIX" EXPORT_SYMBOLS="-Wl,-bexpfull" AC_DEFINE(SUPPORT_GEXEC, 0, SUPPORT_GEXEC) - if test "$ac_cv_lib_perfstat_perfstat_cpu_total" = yes ; then + if test x"$ac_cv_lib_perfstat_perfstat_cpu_total" = xyes; then CFLAGS="$CFLAGS -DHAVE_PERFSTAT" else echo "libperfstat not detected." @@ -574,7 +574,7 @@ ;; *solaris*) AC_DEFINE(SUPPORT_GEXEC, 0, SUPPORT_GEXEC) CFLAGS="$CFLAGS -D__EXTENSIONS__ -D_POSIX_C_SOURCE=200112L -DHAVE_STRERROR" - if test "$ac_cv_prog_gcc" != yes; then + if test x"$ac_cv_prog_gcc" != xyes; then CFLAGS="$CFLAGS -xc99" LIBS="-lm $LIBS" fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |