diff options
author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-03-22 22:41:58 +0000 |
---|---|---|
committer | João Valverde <j@v6e.pt> | 2016-03-23 02:33:56 +0000 |
commit | 759fc8cf705fba74aabb6df59c916efe7204898a (patch) | |
tree | db34040f10ce02d7697795609e548453577586f9 | |
parent | c57b3777f814f4f4108abcf111ee873acb60a91c (diff) |
Rename 'aclocal-fallback' directory to 'm4'
Change-Id: Icac1c43264b6c6fd426d3c5146863a491b48b4ff
Reviewed-on: https://code.wireshark.org/review/14569
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
-rw-r--r-- | Makefile.am | 16 | ||||
-rwxr-xr-x | autogen.sh | 2 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | m4/ax_append_flag.m4 (renamed from aclocal-fallback/ax_append_flag.m4) | 0 | ||||
-rw-r--r-- | m4/ax_check_compile_flag.m4 (renamed from aclocal-fallback/ax_check_compile_flag.m4) | 0 | ||||
-rw-r--r-- | m4/ax_compiler_vendor.m4 (renamed from aclocal-fallback/ax_compiler_vendor.m4) | 0 | ||||
-rw-r--r-- | m4/ax_lib_socket_nsl.m4 | 40 | ||||
-rw-r--r-- | m4/ax_prog_cc_for_build.m4 (renamed from aclocal-fallback/ax_prog_cc_for_build.m4) | 0 | ||||
-rw-r--r-- | m4/libgcrypt.m4 (renamed from aclocal-fallback/libgcrypt.m4) | 0 | ||||
-rw-r--r-- | m4/libsmi.m4 (renamed from aclocal-fallback/libsmi.m4) | 0 | ||||
-rw-r--r-- | m4/pkg.m4 (renamed from aclocal-fallback/pkg.m4) | 0 |
11 files changed, 50 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 57af9bf0b9..b2df0eb0b4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ include ./Makefile.am.inc AM_DISTCHECK_CONFIGURE_FLAGS=@GUI_CONFIGURE_FLAGS@ # Make sure to keep ACLOCAL_AMFLAGS in Makefile.am and AC_CONFIG_MACRO_DIRS # in configure.ac in sync, otherwise there will be an error running autogen.sh. -ACLOCAL_AMFLAGS = -I ./aclocal-fallback +ACLOCAL_AMFLAGS = -I m4 # Common headers COMMONCPPFLAGS = @@ -703,13 +703,13 @@ EXTRA_DIST = \ README.vmware \ README.windows \ abi-descriptor.template \ - aclocal-fallback/ax_append_flag.m4 \ - aclocal-fallback/ax_check_compile_flag.m4 \ - aclocal-fallback/ax_compiler_vendor.m4 \ - aclocal-fallback/ax_prog_cc_for_build.m4 \ - aclocal-fallback/libsmi.m4 \ - aclocal-fallback/libgcrypt.m4 \ - aclocal-fallback/pkg.m4 \ + m4/ax_append_flag.m4 \ + m4/ax_check_compile_flag.m4 \ + m4/ax_compiler_vendor.m4 \ + m4/ax_prog_cc_for_build.m4 \ + m4/libsmi.m4 \ + m4/libgcrypt.m4 \ + m4/pkg.m4 \ autogen.sh \ capinfos.c \ captype.c \ diff --git a/autogen.sh b/autogen.sh index c1b0a549cc..5092e7685d 100755 --- a/autogen.sh +++ b/autogen.sh @@ -135,7 +135,7 @@ fi $DIE -aclocal_flags="-I ./aclocal-fallback" +aclocal_flags="-I m4" aclocalinclude="$ACLOCAL_FLAGS $aclocal_flags"; echo $ACLOCAL $aclocalinclude $ACLOCAL $aclocalinclude || exit 1 diff --git a/configure.ac b/configure.ac index 1411aa7183..cf3a5384d5 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ AC_SUBST(AC_MIN_VERSION) dnl Make sure to keep ACLOCAL_AMFLAGS in Makefile.am and AC_CONFIG_MACRO_DIRS dnl in configure.ac in sync, otherwise there will be an error running autogen.sh. -m4_ifdef([AC_CONFIG_MACRO_DIRS],[AC_CONFIG_MACRO_DIRS([./aclocal-fallback])]) +m4_ifdef([AC_CONFIG_MACRO_DIRS],[AC_CONFIG_MACRO_DIRS([m4])]) dnl Check for CPU / vendor / OS dnl The user is encouraged to use either `AC_CANONICAL_BUILD', or diff --git a/aclocal-fallback/ax_append_flag.m4 b/m4/ax_append_flag.m4 index 08f2e07ec6..08f2e07ec6 100644 --- a/aclocal-fallback/ax_append_flag.m4 +++ b/m4/ax_append_flag.m4 diff --git a/aclocal-fallback/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 index 51df0c09a7..51df0c09a7 100644 --- a/aclocal-fallback/ax_check_compile_flag.m4 +++ b/m4/ax_check_compile_flag.m4 diff --git a/aclocal-fallback/ax_compiler_vendor.m4 b/m4/ax_compiler_vendor.m4 index ee24c12f7f..ee24c12f7f 100644 --- a/aclocal-fallback/ax_compiler_vendor.m4 +++ b/m4/ax_compiler_vendor.m4 diff --git a/m4/ax_lib_socket_nsl.m4 b/m4/ax_lib_socket_nsl.m4 new file mode 100644 index 0000000000..058e975157 --- /dev/null +++ b/m4/ax_lib_socket_nsl.m4 @@ -0,0 +1,40 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_lib_socket_nsl.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_SOCKET_NSL +# +# DESCRIPTION +# +# This macro figures out what libraries are required on this platform to +# link sockets programs. +# +# The common cases are not to need any extra libraries, or to need +# -lsocket and -lnsl. We need to avoid linking with libnsl unless we need +# it, though, since on some OSes where it isn't necessary it will totally +# break networking. Unisys also includes gethostbyname() in libsocket but +# needs libnsl for socket(). +# +# LICENSE +# +# Copyright (c) 2008 Russ Allbery <rra@stanford.edu> +# Copyright (c) 2008 Stepan Kasal <kasal@ucw.cz> +# Copyright (c) 2008 Warren Young <warren@etr-usa.com> +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AU_ALIAS([LIB_SOCKET_NSL], [AX_LIB_SOCKET_NSL]) +AC_DEFUN([AX_LIB_SOCKET_NSL], +[ + AC_SEARCH_LIBS([gethostbyname], [nsl]) + AC_SEARCH_LIBS([socket], [socket], [], [ + AC_CHECK_LIB([socket], [socket], [LIBS="-lsocket -lnsl $LIBS"], + [], [-lnsl])]) +]) diff --git a/aclocal-fallback/ax_prog_cc_for_build.m4 b/m4/ax_prog_cc_for_build.m4 index 77fd346a79..77fd346a79 100644 --- a/aclocal-fallback/ax_prog_cc_for_build.m4 +++ b/m4/ax_prog_cc_for_build.m4 diff --git a/aclocal-fallback/libgcrypt.m4 b/m4/libgcrypt.m4 index d8c2007547..d8c2007547 100644 --- a/aclocal-fallback/libgcrypt.m4 +++ b/m4/libgcrypt.m4 diff --git a/aclocal-fallback/libsmi.m4 b/m4/libsmi.m4 index d719438edc..d719438edc 100644 --- a/aclocal-fallback/libsmi.m4 +++ b/m4/libsmi.m4 diff --git a/aclocal-fallback/pkg.m4 b/m4/pkg.m4 index fb6f48c47e..fb6f48c47e 100644 --- a/aclocal-fallback/pkg.m4 +++ b/m4/pkg.m4 |