diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/Makefile.in | 7 | ||||
| -rwxr-xr-x | client/scripts/macos | 9 |
2 files changed, 11 insertions, 5 deletions
diff --git a/client/Makefile.in b/client/Makefile.in index 581398e..4ec0e80 100644 --- a/client/Makefile.in +++ b/client/Makefile.in @@ -105,6 +105,7 @@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ OBJEXT = @OBJEXT@ @@ -180,7 +181,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -205,9 +206,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) diff --git a/client/scripts/macos b/client/scripts/macos index cb467d1..bb94c81 100755 --- a/client/scripts/macos +++ b/client/scripts/macos @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: macos,v 1.2.108.1 2011-05-18 20:01:54 sar Exp $ +# $Id: macos,v 1.2.108.2 2011-09-20 17:04:03 sar Exp $ # # automous run of this script will commit the DNS setting # @@ -49,8 +49,13 @@ make_resolv_conf() { } # Try to commit /var/run/resolv.conf.dhclient6 contents to -# SystemConfiguration Dynamic Store +# System Configuration framework's Dynamic Store. # Note this will be cleared by the next location change +# or preempted by IPv4. +# +# The System Configuration agent "IPMonitor" gets the DNS configuration +# from the IPv4 or IPv6 primary service in the Dynamic Store +# (managed by configd). commit_resolv_conf() { if [ -f /var/run/resolv.conf.dhclient6 ]; then if [ -x /usr/sbin/scutil ]; then |