[brlcad-commits] CVS: brlcad configure.ac,14.368,14.369
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: Sean M. <br...@us...> - 2007-06-30 21:32:28
|
Update of /cvsroot/brlcad/brlcad In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26453 Modified Files: configure.ac Log Message: include the configure flags in the summary report, remove surrounding whitespace on the FLAGS variables and only print them if they're not empty Index: configure.ac =================================================================== RCS file: /cvsroot/brlcad/brlcad/configure.ac,v retrieving revision 14.368 retrieving revision 14.369 diff -w -u -r14.368 -r14.369 --- configure.ac 29 Jun 2007 04:22:59 -0000 14.368 +++ configure.ac 30 Jun 2007 21:32:28 -0000 14.369 @@ -99,6 +99,12 @@ AC_CONFIG_AUX_DIR(misc) +# keep track of cmd-line options for later +BC_ARG0="$0" +AC_SUBST(BC_ARG0) +BC_ARGS="$*" +AC_SUBST(BC_ARGS) + dnl just in case PACKAGE_NAME="BRL-CAD" AC_SUBST(PACKAGE_NAME) @@ -3469,7 +3475,7 @@ dnl search the BRL-CAD include directory (required for non-srcdir builds). dnl should come after the system services checks otherwise or our headers dnl may conflict. -CPPFLAGS="$CPPFLAGS -DBRLCADBUILD=1 -I\$(top_srcdir)/include" +CPPFLAGS="$CPPFLAGS -DBRLCADBUILD=1 -I\${top_srcdir}/include" # make sure ECHO and ECHO_N got defined and substituted if test "x$ECHO" = "x" ; then @@ -3486,6 +3492,13 @@ BC_CONFIGURE_STAGE([output], [9 of 9]) +# remove surrounding whitspace +CFLAGS="`echo $CFLAGS`" +CXXFLAGS="`echo $CXXFLAGS`" +CPPFLAGS="`echo $CPPFLAGS`" +LDFLAGS="`echo $LDFLAGS`" +LIBS="`echo $LIBS`" + AM_CONDITIONAL(BUILD_TCL, [test "x$build_brlcad_tcl" = "xyes"]) AM_CONDITIONAL(BUILD_TK, [test "x$build_brlcad_tk" = "xyes"]) AM_CONDITIONAL(BUILD_ITCL, [test "x$build_brlcad_itcl" = "xyes"]) @@ -3654,7 +3667,7 @@ AM_CONDITIONAL(HAVE_DOXYGEN, false) dnl sample applications -SAMPLE_APPLICATIONS_DIR='$(BRLCAD_DATA)/sample_applications' +SAMPLE_APPLICATIONS_DIR='${BRLCAD_DATA}/sample_applications' AC_SUBST(SAMPLE_APPLICATIONS_DIR) # stash the top builddir before configuring subdirectories @@ -4036,6 +4049,7 @@ touch include/brlcad_config.h.in fi + dnl ********************** dnl *** Report Summary *** dnl ********************** @@ -4051,14 +4065,27 @@ AC_MSG_RESULT([ Manual pages: ${mandir}]) AC_MSG_RESULT([Configuration files: ${sysconfdir}]) AC_MSG_RESULT([Data resource files: ${bc_data_dir}]) +if test ! "x$BC_ARGS" = "x" ; then +AC_MSG_RESULT([Options & variables: $BC_ARGS]) +fi AC_MSG_RESULT([]) AC_MSG_RESULT([CC = ${CC}]) AC_MSG_RESULT([CXX = ${CXX}]) +if test ! "x$CFLAGS" = "x" ; then AC_MSG_RESULT([CFLAGS = ${CFLAGS}]) +fi +if test ! "x$CXXFLAGS" = "x" ; then AC_MSG_RESULT([CXXFLAGS = ${CXXFLAGS}]) +fi +if test ! "x$CPPFLAGS" = "x" ; then AC_MSG_RESULT([CPPFLAGS = ${CPPFLAGS}]) +fi +if test ! "x$LDFLAGS" = "x" ; then AC_MSG_RESULT([LDFLAGS = ${LDFLAGS}]) +fi +if test ! "x$LIBS" = "x" ; then AC_MSG_RESULT([LIBS = ${LIBS}]) +fi AC_MSG_RESULT([]) AC_MSG_RESULT([Build Tcl ............................: $build_brlcad_tcl]) AC_MSG_RESULT([Build Tk .............................: $build_brlcad_tk]) |