luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-10 11:14:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

build: also unset LIBS when LDFLAGS is unset

Browse Source 
On OpenBSD, libintl is installed under /usr/local/lib. When configure
checks unset LDFLAGS, LIBS should also be unset otherwise we end up with
-lintl which cannot be found resulting to the compile check to fail.

https://bugzilla.gnome.org/show_bug.cgi?id=727939
This commit is contained in:
Antoine Jacoutot
2014-04-10 11:16:44 +02:00
parent 2d96503898
commit 6c7972a05c
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@@ -3449,15 +3449,16 @@ dnl
AC_ARG_ENABLE(Bsymbolic, AC_ARG_ENABLE(Bsymbolic,
[AS_HELP_STRING([--disable-Bsymbolic], [AS_HELP_STRING([--disable-Bsymbolic],
[avoid linking with -Bsymbolic])],, [avoid linking with -Bsymbolic])],,
[SAVED_LDFLAGS="${LDFLAGS}" [SAVED_LDFLAGS="${LDFLAGS}" SAVED_LIBS="${LIBS}"
AC_MSG_CHECKING([for -Bsymbolic-functions linker flag]) AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
LDFLAGS=-Wl,-Bsymbolic-functions LDFLAGS=-Wl,-Bsymbolic-functions
LIBS=
AC_TRY_LINK([], [int main (void) { return 0; }], AC_TRY_LINK([], [int main (void) { return 0; }],
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
enable_Bsymbolic=yes, enable_Bsymbolic=yes,
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
enable_Bsymbolic=no) enable_Bsymbolic=no)
LDFLAGS="${SAVED_LDFLAGS}"]) LDFLAGS="${SAVED_LDFLAGS}" LIBS="${SAVED_LIBS}"])
if test "x${enable_Bsymbolic}" = "xyes"; then if test "x${enable_Bsymbolic}" = "xyes"; then
GLIB_LINK_FLAGS=-Wl,-Bsymbolic-functions GLIB_LINK_FLAGS=-Wl,-Bsymbolic-functions
@@ -3476,9 +3477,10 @@ dnl
AC_ARG_ENABLE([znodelete], AC_ARG_ENABLE([znodelete],
[AS_HELP_STRING([--disable-znodelete], [AS_HELP_STRING([--disable-znodelete],
[avoid linking with -z,nodelete])],, [avoid linking with -z,nodelete])],,
[SAVED_LDFLAGS="${LDFLAGS}" [SAVED_LDFLAGS="${LDFLAGS}" SAVED_LIBS="${LIBS}"
AC_MSG_CHECKING([for --fatal-warnings linker flag]) AC_MSG_CHECKING([for --fatal-warnings linker flag])
LDFLAGS=-Wl,--fatal-warnings LDFLAGS=-Wl,--fatal-warnings
LIBS=
AC_TRY_LINK([], [int main (void) { return 0; }], AC_TRY_LINK([], [int main (void) { return 0; }],
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
[ldflags_fatal=-Wl,--fatal-warnings], [ldflags_fatal=-Wl,--fatal-warnings],
@@ -3491,7 +3493,7 @@ AC_ARG_ENABLE([znodelete],
enable_znodelete=yes, enable_znodelete=yes,
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
enable_znodelete=no) enable_znodelete=no)
LDFLAGS="${SAVED_LDFLAGS}"]) LDFLAGS="${SAVED_LDFLAGS}" LIBS="${SAVED_LIBS}"])
if test "x${enable_znodelete}" = "xyes"; then if test "x${enable_znodelete}" = "xyes"; then
GOBJECT_LINK_FLAGS=-Wl,-z,nodelete GOBJECT_LINK_FLAGS=-Wl,-z,nodelete