-- trunk/c++/src/build-system/configure 2012/12/27 15:43:29 56694 +++ trunk/c++/src/build-system/configure 2013/01/03 03:16:14 56754 @@ -3125,7 +3125,8 @@ fi case "$with_projects" in - "") if test -r projects; then + ""|yes) + if test -r projects; then { echo "$as_me:$LINENO: using default projects file \"projects\"." >&5 echo "$as_me: using default projects file \"projects\"." >&6;} with_projects=projects @@ -3151,6 +3152,18 @@ ;; esac +if test -n "$with_projects"; then + case "$with_projects" in + /* ) abs_projects=$with_projects ;; + yes) abs_projects=$srcdir/projects ;; + * ) abs_projects=$srcdir/$with_projects ;; + esac + test -r "$abs_projects" || \ + { { echo "$as_me:$LINENO: error: unable to read requested projects file \"$abs_projects\"." >&5 +echo "$as_me: error: unable to read requested projects file \"$abs_projects\"." >&2;} + { (exit 1); exit 1; }; } +fi + # Check for custom optimization flags before potentially going with defaults. skip_fast_flags=no if test -z "${DEF_FAST_FLAGS}${FAST_CXXFLAGS}"; then @@ -33825,7 +33838,7 @@ sep=", " fi if test -n "$reason" -a "$with_internal" = "yes"; then - if test -z "$with_projects" -o "$with_projects" = "no"; then + if test -z "$with_projects"; then { { echo "$as_me:$LINENO: error: --with-internal: Cannot build INTERNAL projects: missing $reason" >&5 echo "$as_me: error: --with-internal: Cannot build INTERNAL projects: missing $reason" >&2;} { (exit 1); exit 1; }; } @@ -36062,11 +36075,9 @@ else cfm_flags='-remoteptb' fi - case "$with_projects" in - yes ) cfm_flags="$cfm_flags -p projects" ;; - no | '' ) ;; - * ) cfm_flags="$cfm_flags -p $with_projects" ;; - esac + if test -n "$with_projects"; then + cfm_flags="$cfm_flags -p $with_projects" + fi if test "$with_configure_dialog" = yes; then cfm_flags="$cfm_flags -cfg" fi @@ -36110,7 +36121,8 @@ esac if test -n "$with_projects"; then - build_proj="To build selected projects: cd $builddir && make all_p" + build_proj="To build selected projects (as listed in \"$with_projects\"): + cd $builddir && make all_p" fi cat << EOCONF