summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlanfer <lanfer@17b73243-c579-4c4c-a9d2-2d5706c11dac>2000-08-31 11:45:09 +0000
committerlanfer <lanfer@17b73243-c579-4c4c-a9d2-2d5706c11dac>2000-08-31 11:45:09 +0000
commite75b2e42e552abe968c6c16892138aa85ec405e4 (patch)
treeaf2890bd26d0d50c572ab850d51c6c8600ec080b /lib
parent558770fce2170c583b5f000490396055430ed7aa (diff)
bug fix for the misconfiguration, saving LIB in a different variable and restoring value later
git-svn-id: http://svn.cactuscode.org/flesh/trunk@1803 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib')
-rw-r--r--lib/make/aclocal.m44
-rwxr-xr-xlib/make/configure4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/make/aclocal.m4 b/lib/make/aclocal.m4
index 01032d73..61bed733 100644
--- a/lib/make/aclocal.m4
+++ b/lib/make/aclocal.m4
@@ -201,7 +201,7 @@ AC_LANG_C
dnl Save old libs
dnl Add the socket and nsl libs if they exist (sun)
-ac_save_LIBS="$LIBS"
+my_LIBS="$LIBS"
AC_CHECK_LIB(socket,main)
AC_CHECK_LIB(nsl,main)
@@ -235,7 +235,7 @@ try="int"
AC_DEFINE_UNQUOTED(CCTK_SOCKLEN_T, $try)
echo checking third arg to getsockname: is pointer to $try
rm socketHdrs.h
-LIBS="$ac_save_LIBS"
+LIBS="$my_LIBS"
AC_LANG_RESTORE
])
diff --git a/lib/make/configure b/lib/make/configure
index 89fccd3b..1214798f 100755
--- a/lib/make/configure
+++ b/lib/make/configure
@@ -3036,7 +3036,7 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
cross_compiling=$ac_cv_prog_cc_cross
-ac_save_LIBS="$LIBS"
+my_LIBS="$LIBS"
echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
echo "configure:3042: checking for main in -lsocket" >&5
ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'`
@@ -3304,7 +3304,7 @@ EOF
echo checking third arg to getsockname: is pointer to $try
rm socketHdrs.h
-LIBS="$ac_save_LIBS"
+LIBS="$my_LIBS"
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'