Skip to content

Commit

Permalink
Fix building with separate source and build directories
Browse files Browse the repository at this point in the history
Also make sure we pass `--without-libuv` to configure when we run
`make distcheck` to build in Travis-CI.
  • Loading branch information
jaharkes committed Sep 20, 2017
1 parent 74cf724 commit f09268f
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ before_script:
- ./bootstrap.sh
- ./configure --prefix=/usr --with-lua --without-libuv
script:
- make -j2 distcheck
- DISTCHECK_CONFIGURE_FLAGS=--without-libuv make -j2 distcheck
6 changes: 3 additions & 3 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ EXTRA_DIST = LICENSE README.BSD README.Solaris README.nt \
distcleancheck_listfiles = \
find -type f -exec sh -c 'test -f $(srcdir)/{} || echo {}' ';'

DISTCHECK_CONFIGURE_FLAGS =\
--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) \
--with-modulesloaddir=$$dc_install_base/$(modulesloaddir)
AM_DISTCHECK_CONFIGURE_FLAGS =\
--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) \
--with-modulesloaddir=$$dc_install_base/$(modulesloaddir)
2 changes: 1 addition & 1 deletion lib-src/rpc2/rpc2-src/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in

AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include \
$(LUA_CFLAGS) $(LWP_CFLAGS) \
-I$(top_srcdir) $(LUA_CFLAGS) $(LWP_CFLAGS) \
-DRPC2DEBUG -DERRORTR -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
LDADD = librpc2.la libse.la $(LWP_LIBS)

Expand Down
3 changes: 2 additions & 1 deletion lib-src/rpc2/secure/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## Process this file with automake to produce Makefile.in

AM_CPPFLAGS = -I$(top_srcdir)/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir) \
-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
LDADD = libsecure.la

noinst_LTLIBRARIES = libsecure.la
Expand Down

0 comments on commit f09268f

Please sign in to comment.