diff options
-rw-r--r-- | Makefile.in | 1 | ||||
-rw-r--r-- | client/Makefile.in | 1 | ||||
-rw-r--r-- | client/tests/Makefile.in | 1 | ||||
-rw-r--r-- | common/Makefile.in | 2 | ||||
-rw-r--r-- | common/tests/Makefile.in | 1 | ||||
-rwxr-xr-x | configure | 44 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | dhcpctl/Makefile.in | 2 | ||||
-rw-r--r-- | includes/Makefile.in | 1 | ||||
-rw-r--r-- | omapip/Makefile.in | 2 | ||||
-rw-r--r-- | relay/Makefile.in | 1 | ||||
-rw-r--r-- | server/Makefile.in | 1 | ||||
-rw-r--r-- | server/tests/Makefile.in | 1 | ||||
-rw-r--r-- | tests/Makefile.in | 2 |
14 files changed, 60 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 59b219c6..2a235812 100644 --- a/Makefile.in +++ b/Makefile.in @@ -235,6 +235,7 @@ distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ ATF_BIN = @ATF_BIN@ ATF_CFLAGS = @ATF_CFLAGS@ ATF_LDFLAGS = @ATF_LDFLAGS@ diff --git a/client/Makefile.in b/client/Makefile.in index cfc2f5cc..d1674686 100644 --- a/client/Makefile.in +++ b/client/Makefile.in @@ -243,6 +243,7 @@ am__relativize = \ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ ATF_BIN = @ATF_BIN@ ATF_CFLAGS = @ATF_CFLAGS@ ATF_LDFLAGS = @ATF_LDFLAGS@ diff --git a/client/tests/Makefile.in b/client/tests/Makefile.in index 840d85c9..1a741b12 100644 --- a/client/tests/Makefile.in +++ b/client/tests/Makefile.in @@ -215,6 +215,7 @@ am__relativize = \ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ ATF_BIN = @ATF_BIN@ ATF_CFLAGS = @ATF_CFLAGS@ ATF_LDFLAGS = @ATF_LDFLAGS@ diff --git a/common/Makefile.in b/common/Makefile.in index 0a60686f..82dff563 100644 --- a/common/Makefile.in +++ b/common/Makefile.in @@ -99,7 +99,6 @@ CONFIG_HEADER = $(top_builddir)/includes/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) -AR = ar ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) @@ -249,6 +248,7 @@ am__relativize = \ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ ATF_BIN = @ATF_BIN@ ATF_CFLAGS = @ATF_CFLAGS@ ATF_LDFLAGS = @ATF_LDFLAGS@ diff --git a/common/tests/Makefile.in b/common/tests/Makefile.in index 5bfe96cd..fa488a21 100644 --- a/common/tests/Makefile.in +++ b/common/tests/Makefile.in @@ -253,6 +253,7 @@ am__relativize = \ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ ATF_BIN = @ATF_BIN@ ATF_CFLAGS = @ATF_CFLAGS@ ATF_LDFLAGS = @ATF_LDFLAGS@ @@ -638,6 +638,7 @@ ATF_CFLAGS BIND_ATF_FALSE BIND_ATF_TRUE byte_order +AR RANLIB EGREP GREP @@ -5034,6 +5035,49 @@ else RANLIB="$ac_cv_prog_RANLIB" fi + +# Extract the first word of "ar", so it can be a program name with args. +set dummy ar; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $AR in + [\\/]* | ?:[\\/]*) + ac_cv_path_AR="$AR" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +AR=$ac_cv_path_AR +if test -n "$AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + ac_config_headers="$ac_config_headers includes/config.h" diff --git a/configure.ac b/configure.ac index 9fe247ca..64007f7d 100644 --- a/configure.ac +++ b/configure.ac @@ -48,6 +48,10 @@ AM_CONDITIONAL(CROSS_COMPILING, test "$cross_compiling" = "yes") AC_USE_SYSTEM_EXTENSIONS AC_PROG_RANLIB + +AC_PATH_PROG(AR, ar) +AC_SUBST(AR) + AC_CONFIG_HEADERS([includes/config.h]) # we sometimes need to know byte order for building packets diff --git a/dhcpctl/Makefile.in b/dhcpctl/Makefile.in index 37481015..763e80e9 100644 --- a/dhcpctl/Makefile.in +++ b/dhcpctl/Makefile.in @@ -131,7 +131,6 @@ am__uninstall_files_from_dir = { \ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" LIBRARIES = $(lib_LIBRARIES) -AR = ar ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) @@ -219,6 +218,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ ATF_BIN = @ATF_BIN@ ATF_CFLAGS = @ATF_CFLAGS@ ATF_LDFLAGS = @ATF_LDFLAGS@ diff --git a/includes/Makefile.in b/includes/Makefile.in index 1c1a590c..18942e75 100644 --- a/includes/Makefile.in +++ b/includes/Makefile.in @@ -172,6 +172,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ ATF_BIN = @ATF_BIN@ ATF_CFLAGS = @ATF_CFLAGS@ ATF_LDFLAGS = @ATF_LDFLAGS@ diff --git a/omapip/Makefile.in b/omapip/Makefile.in index ae49faac..9615daa7 100644 --- a/omapip/Makefile.in +++ b/omapip/Makefile.in @@ -129,7 +129,6 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" LIBRARIES = $(lib_LIBRARIES) -AR = ar ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) @@ -214,6 +213,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ ATF_BIN = @ATF_BIN@ ATF_CFLAGS = @ATF_CFLAGS@ ATF_LDFLAGS = @ATF_LDFLAGS@ diff --git a/relay/Makefile.in b/relay/Makefile.in index 9a0451fe..43033977 100644 --- a/relay/Makefile.in +++ b/relay/Makefile.in @@ -195,6 +195,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ ATF_BIN = @ATF_BIN@ ATF_CFLAGS = @ATF_CFLAGS@ ATF_LDFLAGS = @ATF_LDFLAGS@ diff --git a/server/Makefile.in b/server/Makefile.in index dc880e7d..25f39c08 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -259,6 +259,7 @@ am__relativize = \ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ ATF_BIN = @ATF_BIN@ ATF_CFLAGS = @ATF_CFLAGS@ ATF_LDFLAGS = @ATF_LDFLAGS@ diff --git a/server/tests/Makefile.in b/server/tests/Makefile.in index 9c37fc50..8a5049f2 100644 --- a/server/tests/Makefile.in +++ b/server/tests/Makefile.in @@ -275,6 +275,7 @@ am__relativize = \ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ ATF_BIN = @ATF_BIN@ ATF_CFLAGS = @ATF_CFLAGS@ ATF_LDFLAGS = @ATF_LDFLAGS@ diff --git a/tests/Makefile.in b/tests/Makefile.in index 792a2186..b09d23b1 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -97,7 +97,6 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/includes/config.h CONFIG_CLEAN_FILES = unittest.sh CONFIG_CLEAN_VPATH_FILES = -AR = ar ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) @@ -167,6 +166,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ ATF_BIN = @ATF_BIN@ ATF_CFLAGS = @ATF_CFLAGS@ ATF_LDFLAGS = @ATF_LDFLAGS@ |