[brlcad-commits] CVS: brlcad configure.ac,14.354,14.355
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: Sean M. <br...@us...> - 2007-05-25 01:51:26
|
Update of /cvsroot/brlcad/brlcad In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9136 Modified Files: configure.ac Log Message: fix anonymous report of configure failure on 7.10.0 where turning off urt would result in a configure failure. the problem was a variety of checks for configure settings that checked for the wrong value (!no instead of !yes, where default is "auto"). so the default worked, but not when the 3rd party lib was disabled. Index: configure.ac =================================================================== RCS file: /cvsroot/brlcad/brlcad/configure.ac,v retrieving revision 14.354 retrieving revision 14.355 diff -w -u -r14.354 -r14.355 --- configure.ac 18 May 2007 16:04:28 -0000 14.354 +++ configure.ac 25 May 2007 01:51:25 -0000 14.355 @@ -1281,14 +1281,14 @@ dnl check if zlib library links z_link_works=no LIBZLIB="" -if test "x$bc_build_zlib" != "xno" ; then +if test "x$bc_build_zlib" != "xyes" ; then AC_CHECK_LIB(z, deflate, z_link_works=yes ; LIBZLIB="-lz") fi dnl check if utahrle library links utahrle_link_works=no UTAHRLE="" -if test "x$bc_build_urt" != "xno" ; then +if test "x$bc_build_urt" != "xyes" ; then # checking for rle_hdr_init is NOT sufficient to get urt 3.x PRELIBS="$LIBS" LIBS="$LIBS $LIBM" @@ -1301,7 +1301,7 @@ dnl check if openNURBS library links opennurbs_link_works=no LIBOPENNURBS="" -if test "x$bc_build_opennurbs" != "xno" ; then +if test "x$bc_build_opennurbs" != "xyes" ; then AC_CHECK_LIB(openNURBS, onmalloc, opennurbs_link_works=yes ; LIBOPENNURBS="-lopenNURBS") fi @@ -1470,9 +1470,7 @@ dnl library is needed when linking c++ code against c code (e.g. openNURBS) stdcxx_link_works=no LIBSTDCXX="" -if test "x$bc_build_opennurbs" != "xno" ; then AC_CHECK_LIB(stdc++, main, stdcxx_link_works=yes ; LIBSTDCXX="-lstdc++") -fi dnl check for java JAVA_CFLAGS= @@ -1627,7 +1625,7 @@ GL_CFLAGS=$GL_CPPFLAGS AC_SUBST(GL_CFLAGS) -# optionally check for vectorization headers for opennurbs +# optionally (yes or auto) check for vectorization headers for opennurbs if test "x$bc_build_opennurbs" != "xno" ; then AC_CHECK_HEADERS( \ emmintrin.h \ @@ -1821,7 +1819,7 @@ dnl check for -fno-common (libtcl needs it on darwin) BC_COMPILER_AND_LINKER_RECOGNIZES([-fno-common]) - dnl check for -fexceptions + dnl check for -fexceptions (if yes or auto). dnl this is needed to resolve __Unwind_Resume when compiling and dnl linking against openNURBS in librt for some binaries, for dnl example rttherm (i.e. any -static binaries) @@ -1960,7 +1958,7 @@ fi fi -dnl verbose warning flags +dnl verbose warning flags (if yes or auto) if test "x$bc_build_warnings" != "xno" ; then BC_COMPILER_AND_LINKER_RECOGNIZES([-W -Wall -Wundef -Wfloat-equal -Wshadow -Wunreachable-code -Winline -Wconversion], [warning]) # XXX also of interest |