diff options
| author | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2000-04-17 16:58:27 +0000 |
|---|---|---|
| committer | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2000-04-17 16:58:27 +0000 |
| commit | 35d080e5c7656f463db1d4f79b0e7207966f4e10 (patch) | |
| tree | ded7f47071e54af0399ba082d3b547032d2e2b7a /lib/make | |
| parent | ffa73bdf03aa81df1b04b8205fadcca7e20206c3 (diff) | |
Fix for PR316 - can now use LIBS=... in configuration process.
Removed checking for wchan.h, as we don't need it after all.
Tom
git-svn-id: http://svn.cactuscode.org/flesh/trunk@1551 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make')
| -rw-r--r-- | lib/make/configure.in | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/lib/make/configure.in b/lib/make/configure.in index 6380c427..edc3d422 100644 --- a/lib/make/configure.in +++ b/lib/make/configure.in @@ -37,6 +37,19 @@ else echo " and we'll include it in the next release." fi +# Save these for future use. + +if test -n "$LIBS" ; then + KNOWN_LIBS="$LIBS" + unset LIBS +fi + +if test -n "$LDFLAGS" ; then + KNOWN_LDFLAGS="$LDFLAGS" + unset LDFLAGS +fi + + dnl Checks for programs. AC_PROG_MAKE_SET @@ -87,6 +100,18 @@ AC_SUBST(LD) LD=$CXX fi +# Restore the values we saved earlier + +if test -n "$KNOWN_LIBS" ; then + LIBS="$KNOWN_LIBS" + unset KNOWN_LIBS +fi + +if test -n "$KNOWN_LDFLAGS" ; then + LDFLAGS="$KNOWN_LDFLAGS" + unset KNOWN_LDFLAGS +fi + # Include some CCTK auxiliary functions . $srcdir/CCTK_Functions.sh @@ -174,10 +199,10 @@ fi # rest of the configure stuff. KNOWN_LIBS="$LIBS" -LIBS= +unset LIBS KNOWN_LDFLAGS="$LDFLAGS" -LDFLAGS= +unset LDFLAGS dnl Checks for libraries. @@ -247,7 +272,6 @@ dnl Include file stuff CCTK_CHECK_HEADERS(sys/time.h) CCTK_CHECK_HEADERS(unistd.h) CCTK_CHECK_HEADERS(string.h) -CCTK_CHECK_HEADERS(wchan.h) AC_HEADER_TIME |