*** aclocal.m4 1997/10/24 18:48:24 1.4 --- aclocal.m4 1997/11/20 21:43:00 1.6 *************** *** 297,298 **** --- 297,301 ---- if test -n "$motif_libraries"; then + for motif_library in $motif_libraries; do + MOTIF_LDFLAGS="$MOTIF_LDFLAGS -L$motif_library" + done dnl FIXME banish uname from this macro! *************** *** 306,308 **** AC_TRY_LINK(, , ac_R_nospace=yes, ac_R_nospace=no) ! if test $ac_R_nospace = yes; then AC_MSG_RESULT(no) --- 309,311 ---- AC_TRY_LINK(, , ac_R_nospace=yes, ac_R_nospace=no) ! if test "$ac_R_nospace" = yes; then AC_MSG_RESULT(no) *************** *** 311,313 **** AC_TRY_LINK(, , ac_R_space=yes, ac_R_space=no) ! if test $ac_R_space = yes; then AC_MSG_RESULT(yes) --- 314,316 ---- AC_TRY_LINK(, , ac_R_space=yes, ac_R_space=no) ! if test "$ac_R_space" = yes; then AC_MSG_RESULT(yes) *************** *** 321,334 **** done ! ;; ! esac ! for motif_library in $motif_libraries; do ! MOTIF_LDFLAGS="$MOTIF_LDFLAGS -L$motif_library" ! if test $ac_R_nospace = yes; then ! MOTIF_LDFLAGS="$MOTIF_LDFLAGS -R$motif_library" ! else ! if test $ac_R_space = yes; then MOTIF_LDFLAGS="$MOTIF_LDFLAGS -R $motif_library" fi ! fi ! done fi --- 324,334 ---- done ! for motif_library in $motif_libraries; do ! if test "$ac_R_nospace" = yes; then ! MOTIF_LDFLAGS="$MOTIF_LDFLAGS -R$motif_library" ! elif test "$ac_R_space" = yes; then MOTIF_LDFLAGS="$MOTIF_LDFLAGS -R $motif_library" fi ! done ! ;; ! esac fi *** configure 1997/10/27 18:38:09 1.5 --- configure 1997/11/20 21:43:51 1.8 *************** *** 649,652 **** VERSION_DATE='October 21, 1997' ! MV_PATCH=1 ! MV_PATCH_DATE=`echo October 27, 1997 ` --- 649,652 ---- VERSION_DATE='October 21, 1997' ! MV_PATCH=2 ! MV_PATCH_DATE=`echo November 20, 1997 ` *************** *** 2380,2381 **** --- 2380,2384 ---- if test -n "$motif_libraries"; then + for motif_library in $motif_libraries; do + MOTIF_LDFLAGS="$MOTIF_LDFLAGS -L$motif_library" + done # For Solaris; some versions of Sun CC require a space after -R and *************** *** 2386,2391 **** echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 ! echo "configure:2388: checking whether -R must be followed by a space" >&5 ac_motifsave_LIBS="$LIBS"; LIBS="$LIBS -R$motif_library" cat > conftest.$ac_ext <&6 ! echo "configure:2391: checking whether -R must be followed by a space" >&5 ac_motifsave_LIBS="$LIBS"; LIBS="$LIBS -R$motif_library" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* --- 2399,2401 ---- EOF ! if { (eval echo configure:2401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* *************** *** 2406,2408 **** rm -f conftest* ! if test $ac_R_nospace = yes; then echo "$ac_t""no" 1>&6 --- 2409,2411 ---- rm -f conftest* ! if test "$ac_R_nospace" = yes; then echo "$ac_t""no" 1>&6 *************** *** 2411,2413 **** cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* --- 2421,2423 ---- EOF ! if { (eval echo configure:2423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* *************** *** 2428,2430 **** rm -f conftest* ! if test $ac_R_space = yes; then echo "$ac_t""yes" 1>&6 --- 2431,2433 ---- rm -f conftest* ! if test "$ac_R_space" = yes; then echo "$ac_t""yes" 1>&6 *************** *** 2438,2451 **** done ! ;; ! esac ! for motif_library in $motif_libraries; do ! MOTIF_LDFLAGS="$MOTIF_LDFLAGS -L$motif_library" ! if test $ac_R_nospace = yes; then ! MOTIF_LDFLAGS="$MOTIF_LDFLAGS -R$motif_library" ! else ! if test $ac_R_space = yes; then MOTIF_LDFLAGS="$MOTIF_LDFLAGS -R $motif_library" fi ! fi ! done fi --- 2441,2451 ---- done ! for motif_library in $motif_libraries; do ! if test "$ac_R_nospace" = yes; then ! MOTIF_LDFLAGS="$MOTIF_LDFLAGS -R$motif_library" ! elif test "$ac_R_space" = yes; then MOTIF_LDFLAGS="$MOTIF_LDFLAGS -R $motif_library" fi ! done ! ;; ! esac fi *** configure.in 1997/10/27 18:37:31 1.5 --- configure.in 1997/11/19 21:46:40 1.6 *************** *** 8,10 **** VERSION_DATE='October 21, 1997' ! MV_PATCH=1 MV_PATCH_DATE=`echo esyscmd([date '+%B %d, %Y'])` --- 8,10 ---- VERSION_DATE='October 21, 1997' ! MV_PATCH=2 MV_PATCH_DATE=`echo esyscmd([date '+%B %d, %Y'])`