Fix initial build from svn without golang support installe

git-svn-id: http://svn.fedorahosted.org/svn/audit/trunk@1206 03a675c2-f56d-4096-908f-63dba836b7e4

ChangeLog

@@ -6,6 +6,7 @@
 - Re-allow the retry to distribute events in auditd
 - New aggregate only mode for auditd
 - Cleanup tmp file left by augenrules --check
+- Fix initial build from svn without golang support installed
 
 2.5
 - Make augenrules the default method to load audit rules

bindings/Makefile.am

@@ -1,5 +1,5 @@
 # Makefile.am --
-# Copyright 2007,2014,2015 Red Hat Inc., Durham, North Carolina.
+# Copyright 2007,2014-16 Red Hat Inc., Durham, North Carolina.
 # All Rights Reserved.
 #
 # This library is free software; you can redistribute it and/or
@@ -22,4 +22,4 @@
 
 CONFIG_CLEAN_FILES = *.loT *.rej *.orig
 
-SUBDIRS = @pybind_dir@ @gobind_dir@ swig
+SUBDIRS = python golang swig

bindings/golang/Makefile.am

@@ -1,5 +1,5 @@
 # Makefile.am --
-# Copyright 2014 Red Hat Inc., Durham, North Carolina.
+# Copyright 2014,16 Red Hat Inc., Durham, North Carolina.
 # All Rights Reserved.
 #
 # This library is free software; you can redistribute it and/or
@@ -22,10 +22,11 @@
 
 CONFIG_CLEAN_FILES = *.loT *.rej *.orig
 EXTRA_DIST = audit.go
+dist_check_SCRIPTS = test.go
 
+if HAVE_GOLANG
 LIBDIR = lib
 GODIR = $(LIBDIR)/golang/src/pkg/redhat.com/audit
-dist_check_SCRIPTS = test.go
 
 install:
 	[ -d $(DESTDIR)${prefix}/$(GODIR) ] || mkdir -p $(DESTDIR)${prefix}/$(GODIR)
@@ -42,4 +43,6 @@ check:
 	## paths from the command line.
 	##[ -f test.go ] || cp ${top_srcdir}/bindings/golang/test.go .
 	##PKG_CONFIG_PATH=${abs_top_builddir}/lib/:$(PKG_CONFIG_PATH) GOPATH=$(pwd) $(GOLANG) run test.go
-	@rm -rf audit 
+	@rm -rf audit
+endif
+

configure.ac

@@ -180,8 +180,6 @@ else
         # Substitute some golang environment.
         GOROOT=`$GOLANG env GOROOT`
         AC_SUBST([GOROOT])
-        gobind_dir="golang"
-        AC_SUBST([gobind_dir])
     ], [
 	if test "x$use_golang" = xyes ; then
 		AC_MSG_ERROR([Go language explicitly requested and program not found])