summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Slebodnik <lslebodn@redhat.com>2015-01-16 16:45:21 +0100
committerSimo Sorce <simo@redhat.com>2015-01-16 12:22:05 -0500
commit3349c5a75225649114173529de180bd6d46a9c6e (patch)
treebdce1e38d83a887eaf70ef8a843574e0f760d9dd
parent5a99c4873bd79adf8359370869469f745eec8c35 (diff)
downloadgss-proxy-3349c5a75225649114173529de180bd6d46a9c6e.tar.gz
gss-proxy-3349c5a75225649114173529de180bd6d46a9c6e.tar.xz
gss-proxy-3349c5a75225649114173529de180bd6d46a9c6e.zip
BUILD: Fix building with automake 1.15
The macro AC_BUILD_AUX_DIR was used too late. As a result of this automake 1.15 generated configure script which ignored the directory build/ and was not able to find missing files. configure: error: cannot find install-sh, install.sh, or shtool in "." "./.." "./../..". After removing macro AC_BUILD_AUX_DIR, autoreconf will install auxiliary files into $srcdir. Signed-off-by: Lukas Slebodnik <lslebodn@redhat.com> Reviewed-by: Simo Sorce <simo@redhat.com>
-rw-r--r--.gitignore10
-rw-r--r--proxy/Makefile.am2
-rw-r--r--proxy/configure.ac1
3 files changed, 10 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index c8be862..a0dd379 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,13 @@ interposetest
gssproxy.service
t_accept
t_init
+ar-lib
+compile
+config.guess
+config.rpath
+config.sub
+depcomp
+install-sh
+ltmain.sh
+missing
+mkinstalldirs
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index b5ba2af..86b5933 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -79,8 +79,6 @@ AM_CPPFLAGS = \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DLOCALEDIR=\"$(localedir)\"
-EXTRA_DIST = build/config.rpath
-
GSS_PROXY_LIBS = $(POPT_LIBS) $(KRB5_LIBS) $(VERTO_LIBS) $(INI_LIBS) $(GSSAPI_LIBS) $(GSSRPC_LIBS)
if BUILD_SELINUX
diff --git a/proxy/configure.ac b/proxy/configure.ac
index a709d20..5e43c3b 100644
--- a/proxy/configure.ac
+++ b/proxy/configure.ac
@@ -12,7 +12,6 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
AC_CONFIG_SRCDIR([BUILD.txt])
-AC_CONFIG_AUX_DIR([build])
AM_INIT_AUTOMAKE([-Wall foreign subdir-objects tar-pax])
AM_PROG_CC_C_O