Skip to content
This repository was archived by the owner on Mar 1, 2023. It is now read-only.

Commit 068f7ae

Browse files
committed
build: prevent global LIBS from influencing src and lib build targets
Currently, LIBS is already used through other macros.
1 parent 68d2830 commit 068f7ae

File tree

6 files changed

+153
-140
lines changed

6 files changed

+153
-140
lines changed

acinclude.m4

+1-4
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ int main (void)
130130
]])
131131
],[
132132
tst_lib_xnet_required="yes"
133-
LIBS="$LIBS -lxnet"
133+
LIBS="-lxnet $LIBS"
134134
])
135135
AC_MSG_RESULT([$tst_lib_xnet_required])
136136
])
@@ -2103,7 +2103,6 @@ AC_DEFUN([CURL_CHECK_LIBS_CLOCK_GETTIME_MONOTONIC], [
21032103
#
21042104
curl_cv_save_LIBS="$LIBS"
21052105
curl_cv_gclk_LIBS="unknown"
2106-
curl_cv_save_CURL_LIBS="$CURL_LIBS"
21072106
#
21082107
for x_xlibs in '' '-lrt' '-lposix4' ; do
21092108
if test "$curl_cv_gclk_LIBS" = "unknown"; then
@@ -2155,7 +2154,6 @@ AC_DEFUN([CURL_CHECK_LIBS_CLOCK_GETTIME_MONOTONIC], [
21552154
else
21562155
LIBS="$curl_cv_gclk_LIBS $curl_cv_save_LIBS"
21572156
fi
2158-
CURL_LIBS="$CURL_LIBS $curl_cv_gclk_LIBS"
21592157
AC_MSG_RESULT([$curl_cv_gclk_LIBS])
21602158
ac_cv_func_clock_gettime="yes"
21612159
;;
@@ -2197,7 +2195,6 @@ AC_DEFUN([CURL_CHECK_LIBS_CLOCK_GETTIME_MONOTONIC], [
21972195
AC_MSG_WARN([HAVE_CLOCK_GETTIME_MONOTONIC will not be defined])
21982196
ac_cv_func_clock_gettime="no"
21992197
LIBS="$curl_cv_save_LIBS"
2200-
CURL_LIBS="$curl_cv_save_CURL_LIBS"
22012198
])
22022199
fi
22032200
#

0 commit comments

Comments
 (0)