Message ID | 1354894866-319-1-git-send-email-jlayton@samba.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Fri, 7 Dec 2012 10:41:06 -0500 Jeff Layton <jlayton@samba.org> wrote: > ...which is really only mount.cifs. > > Cc: Björn Jacke <bj@sernet.de> > Signed-off-by: Jeff Layton <jlayton@samba.org> > --- > Makefile.am | 2 +- > configure.ac | 3 ++- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > index 73f756f..ff7a726 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I aclocal > root_sbindir = $(ROOTSBINDIR) > root_sbin_PROGRAMS = mount.cifs > mount_cifs_SOURCES = mount.cifs.c mtab.c resolve_host.c util.c > -mount_cifs_LDADD = $(LIBCAP) $(CAPNG_LDADD) > +mount_cifs_LDADD = $(LIBCAP) $(CAPNG_LDADD) $(RT_LDADD) > > man_MANS = mount.cifs.8 > > diff --git a/configure.ac b/configure.ac > index 78acd43..b6791ab 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -94,9 +94,10 @@ AC_CHECK_FUNCS(clock_gettime, [], [ > AC_DEFINE(HAVE_CLOCK_GETTIME, 1) > AC_DEFINE(HAVE_CLOCK_GETTIME,1, > [Whether the clock_gettime func is there]) > - LIBS="$LIBS -lrt" > + RT_LDADD="-lrt" > ]) > ]) > +AC_SUBST(RT_LDADD) > > # Checks for header files. > AC_CHECK_HEADERS([arpa/inet.h ctype.h fcntl.h inttypes.h limits.h mntent.h netdb.h stddef.h stdint.h stdbool.h stdlib.h stdio.h errno.h string.h strings.h sys/mount.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h], , [AC_MSG_ERROR([necessary header(s) not found])]) Merged...
diff --git a/Makefile.am b/Makefile.am index 73f756f..ff7a726 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I aclocal root_sbindir = $(ROOTSBINDIR) root_sbin_PROGRAMS = mount.cifs mount_cifs_SOURCES = mount.cifs.c mtab.c resolve_host.c util.c -mount_cifs_LDADD = $(LIBCAP) $(CAPNG_LDADD) +mount_cifs_LDADD = $(LIBCAP) $(CAPNG_LDADD) $(RT_LDADD) man_MANS = mount.cifs.8 diff --git a/configure.ac b/configure.ac index 78acd43..b6791ab 100644 --- a/configure.ac +++ b/configure.ac @@ -94,9 +94,10 @@ AC_CHECK_FUNCS(clock_gettime, [], [ AC_DEFINE(HAVE_CLOCK_GETTIME, 1) AC_DEFINE(HAVE_CLOCK_GETTIME,1, [Whether the clock_gettime func is there]) - LIBS="$LIBS -lrt" + RT_LDADD="-lrt" ]) ]) +AC_SUBST(RT_LDADD) # Checks for header files. AC_CHECK_HEADERS([arpa/inet.h ctype.h fcntl.h inttypes.h limits.h mntent.h netdb.h stddef.h stdint.h stdbool.h stdlib.h stdio.h errno.h string.h strings.h sys/mount.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h], , [AC_MSG_ERROR([necessary header(s) not found])])
...which is really only mount.cifs. Cc: Björn Jacke <bj@sernet.de> Signed-off-by: Jeff Layton <jlayton@samba.org> --- Makefile.am | 2 +- configure.ac | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)