diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-03-22 20:14:57 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-03-22 20:37:01 +0000 |
| commit | 33850025caa10189ae37c8c0b00f45915114f634 (patch) | |
| tree | 56e7f50a59feb55377c2e36ffe448d4b5b84aa3e /acinclude.m4 | |
| parent | 46be2049f366125c5320fb8a14e5662ecf25376f (diff) | |
| download | wireshark-33850025caa10189ae37c8c0b00f45915114f634.tar.gz | |
Reorder some linker flags from most dependent to least dependent
Change-Id: I949a01cc6a8d56c4aac65b54f45e6ab6cc918d29
Reviewed-on: https://code.wireshark.org/review/14563
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 2e3c1ed46c..667929bd33 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -659,7 +659,7 @@ AC_DEFUN([AC_WIRESHARK_ZLIB_CHECK], WS_CPPFLAGS="$WS_CPPFLAGS -I$zlib_dir/include" AC_WIRESHARK_ADD_DASH_L(WS_LDFLAGS, $zlib_dir/lib) fi - LIBS="$LIBS -lz" + LIBS="-lz $LIBS" AC_DEFINE(HAVE_LIBZ, 1, [Define to use libz library]) # # Check for "inflatePrime()" in zlib, which we need @@ -818,12 +818,11 @@ AC_DEFUN([AC_WIRESHARK_LIBLUA_CHECK],[ AC_SEARCH_LIBS(luaL_openlibs, [lua-${lua_ver} lua${lua_ver} lua], [ LUA_LIBS="-L$lua_dir/lib $ac_cv_search_luaL_openlibs -lm" - LIBS="$wireshark_save_LIBS" have_lua=yes ],[ - LIBS="$wireshark_save_LIBS" have_lua=no ], -lm) + LIBS="$wireshark_save_LIBS" fi fi fi @@ -856,7 +855,7 @@ AC_DEFUN([AC_WIRESHARK_LIBPORTAUDIO_CHECK],[ CPPFLAGS="$CPPFLAGS -I$portaudio_dir/include" LDFLAGS="$LDFLAGS -L$portaudio_dir/lib" fi - LIBS="$LIBS -lportaudio" + LIBS="-lportaudio $LIBS" # # Make sure we have "portaudio.h". If we don't, it means we probably |