diff --git a/ChangeLog b/ChangeLog index c14c691b..8848a256 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Nov 25 16:25:09 1998 Adam Fedor + + * configure.in (ac_cv_library_combo): Take old value if not set. + Mon Nov 23 14:00:00 1998 Richard Frith-Macdonald GNUmakefile.in: mod for services diff --git a/configure b/configure index 7c03fd72..4ac87acd 100755 --- a/configure +++ b/configure @@ -1538,7 +1538,7 @@ if test "${with_library_combo+set}" = set; then withval="$with_library_combo" ac_cv_library_combo=$withval else - ac_cv_library_combo=$withval + ac_cv_library_combo=$ac_cv_library_combo fi @@ -1562,7 +1562,7 @@ objc_thread_lib="" if test $host_os = linux-gnu; then LIBS="-lobjc -lpthread" if test "$cross_compiling" = yes; then - objc_threaded=-lpthread + objc_threaded="-lpthread" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then - objc_threaded=-lpthread + objc_threaded="-lpthread" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -1581,10 +1581,10 @@ fi rm -fr conftest* fi - if test "$objc_threaded" = ""; then + if test x"$objc_threaded" = x""; then LIBS="-lobjc -lpcthread" if test "$cross_compiling" = yes; then - objc_threaded=-lpcthread + objc_threaded="-lpcthread" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then - objc_threaded=-lpcthread + objc_threaded="-lpcthread" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -1607,7 +1607,7 @@ fi else LIBS="-lobjc $LIBS" if test "$cross_compiling" = yes; then - objc_threaded=-lthread + objc_threaded="-lthread" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then - objc_threaded=-lthread + objc_threaded="-lthread" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -1628,7 +1628,7 @@ fi fi LIBS="$saved_LIBS" -if test "$objc_threaded" = ""; then +if test x"$objc_threaded" = x""; then echo "$ac_t""no" 1>&6 else echo "$ac_t""yes" 1>&6 diff --git a/configure.in b/configure.in index 633b2e00..b65f4f4d 100644 --- a/configure.in +++ b/configure.in @@ -134,7 +134,7 @@ by specifying the 'library_combo' make variable. For example: $ make library_combo=nx-pdo-nx-nil ], ac_cv_library_combo=$withval, -ac_cv_library_combo=$withval +ac_cv_library_combo=$ac_cv_library_combo ) if test "$ac_cv_library_combo" = ""; then