diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-03-22 21:03:18 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-03-23 02:15:32 +0000 |
| commit | 125989780ba8e658ad0d1f1c71ec01e6d36a2266 (patch) | |
| tree | fe4427342ea7c8be5292c3a9e2ab060eb2d25bc3 /acinclude.m4 | |
| parent | ed350dd350e7b02a53d305d4330aa0b545d2eea3 (diff) | |
configure.ac: Remove --enable-usr-local
Let the compiler and linker handle the system default search path.
Generally give priority to /usr/local when doing "manual" searches.
Change-Id: I3bde7af1226305d94ddb4bc96cefe9ef91e26769
Reviewed-on: https://code.wireshark.org/review/14564
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 667929bd33..6b04c4b7f3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -343,10 +343,7 @@ AC_DEFUN([AC_WIRESHARK_PCAP_CHECK], # AC_MSG_CHECKING(for extraneous pcap header directories) found_pcap_dir="" - pcap_dir_list="/usr/include/pcap $prefix/include/pcap $prefix/include" - if test "x$ac_cv_enable_usr_local" = "xyes" ; then - pcap_dir_list="$pcap_dir_list /usr/local/include/pcap" - fi + pcap_dir_list="/usr/local/include/pcap /usr/include/pcap $prefix/include/pcap $prefix/include" for pcap_dir in $pcap_dir_list do if test -d $pcap_dir ; then @@ -751,7 +748,7 @@ AC_DEFUN([AC_WIRESHARK_LIBLUA_CHECK],[ then # The user didn't tell us where to look so we'll look in some # standard locations. - want_lua_dir="/usr /usr/local $prefix" + want_lua_dir="/usr/local /usr $prefix" fi for dir in $want_lua_dir do @@ -990,12 +987,6 @@ AC_DEFUN([AC_WIRESHARK_C_ARES_CHECK], if test "x$want_c_ares" = "xdefaultyes"; then want_c_ares=yes - if test "x$ac_cv_enable_usr_local" = "xyes" ; then - withval=/usr/local - if test -d "$withval"; then - AC_WIRESHARK_ADD_DASH_L(WS_LDFLAGS, ${withval}/lib) - fi - fi fi if test "x$want_c_ares" = "xyes"; then @@ -1021,12 +1012,6 @@ AC_DEFUN([AC_WIRESHARK_LIBCAP_CHECK], if test "x$want_libcap" = "xdefaultyes"; then want_libcap=yes - if test "x$ac_cv_enable_usr_local" = "xyes" ; then - withval=/usr/local - if test -d "$withval"; then - AC_WIRESHARK_ADD_DASH_L(WS_LDFLAGS, ${withval}/lib) - fi - fi fi if test "x$want_libcap" = "xyes"; then @@ -1307,12 +1292,6 @@ AC_DEFUN([AC_WIRESHARK_GEOIP_CHECK], if test "x$want_geoip" = "xdefaultyes"; then want_geoip=yes - if test "x$ac_cv_enable_usr_local" = "xyes" ; then - withval=/usr/local - if test -d "$withval"; then - AC_WIRESHARK_ADD_DASH_L(WS_LDFLAGS, ${withval}/lib) - fi - fi fi if test "x$want_geoip" = "xyes"; then @@ -1344,12 +1323,6 @@ AC_DEFUN([AC_WIRESHARK_LIBSSH_CHECK], if test "x$want_libssh" = "xdefaultyes"; then want_libssh=yes - if test "x$ac_cv_enable_usr_local" = "xyes" ; then - withval=/usr/local - if test -d "$withval"; then - AC_WIRESHARK_ADD_DASH_L(WS_LDFLAGS, ${withval}/lib) - fi - fi fi if test "x$want_libssh" = "xyes"; then |