From 80caa56cad7d89a566640b1dce6c6962b523ee76 Mon Sep 17 00:00:00 2001
From: Likun Zhang <zlkzhy@gmail.com>
Date: Wed, 19 May 2010 09:26:01 +0000
Subject: [PATCH] Redo revision 1853: Make xfrout works well in source code
 tree(for details, please see comments of ticket 151), now the
 UNIX_SOCKET_FILE shared by auth srv and xfrout locates in @localstatedir@,
 (Jeremy had reviewed this patch. then give some fix suggestion in email.)

git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@1855 e5f2f494-b856-4b98-b285-d166d9295462
---
 configure.ac                  |  2 +-
 src/bin/auth/Makefile.am      |  6 +++++-
 src/bin/auth/spec_config.h.in | 16 ----------------
 src/bin/xfrout/xfrout.py.in   |  2 +-
 4 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 src/bin/auth/spec_config.h.in

diff --git a/configure.ac b/configure.ac
index 8e4a8e4e3..b441ed5f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -431,7 +431,7 @@ AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr.py
            src/bin/msgq/tests/msgq_test
            src/bin/msgq/run_msgq.sh
            src/bin/auth/auth.spec.pre
-           src/bin/auth/spec_config.h
+           src/bin/auth/spec_config.h.pre
            src/lib/config/tests/data_def_unittests_config.h
            src/lib/python/isc/config/tests/config_test
            src/lib/python/isc/cc/tests/cc_test
diff --git a/src/bin/auth/Makefile.am b/src/bin/auth/Makefile.am
index e97663427..d9e5114e7 100644
--- a/src/bin/auth/Makefile.am
+++ b/src/bin/auth/Makefile.am
@@ -8,7 +8,7 @@ endif
 
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 
-CLEANFILES = *.gcno *.gcda auth.spec
+CLEANFILES = *.gcno *.gcda auth.spec spec_config.h
 
 man_MANS = b10-auth.8
 EXTRA_DIST = $(man_MANS) b10-auth.xml
@@ -23,10 +23,14 @@ endif
 auth.spec: auth.spec.pre
 	$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" auth.spec.pre >$@
 
+spec_config.h: spec_config.h.pre
+	$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" spec_config.h.pre >$@
+
 pkglibexec_PROGRAMS = b10-auth
 b10_auth_SOURCES = auth_srv.cc auth_srv.h
 b10_auth_SOURCES += common.h
 b10_auth_SOURCES += main.cc
+b10_auth_SOURCES += spec_config.h 
 b10_auth_LDADD =  $(top_builddir)/src/lib/datasrc/.libs/libdatasrc.a
 b10_auth_LDADD += $(top_builddir)/src/lib/dns/.libs/libdns.a
 b10_auth_LDADD += $(top_builddir)/src/lib/config/.libs/libcfgclient.a
diff --git a/src/bin/auth/spec_config.h.in b/src/bin/auth/spec_config.h.in
deleted file mode 100644
index da9d025cd..000000000
--- a/src/bin/auth/spec_config.h.in
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
-//
-// Permission to use, copy, modify, and/or distribute this software for any
-// purpose with or without fee is hereby granted, provided that the above
-// copyright notice and this permission notice appear in all copies.
-//
-// THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-// AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-// PERFORMANCE OF THIS SOFTWARE.
-
-#define AUTH_SPECFILE_LOCATION "@prefix@/share/@PACKAGE@/auth.spec"
-#define UNIX_SOCKET_FILE "@prefix@/var/auth_xfrout_conn"
diff --git a/src/bin/xfrout/xfrout.py.in b/src/bin/xfrout/xfrout.py.in
index 7099bf1e9..dc5f43d4b 100644
--- a/src/bin/xfrout/xfrout.py.in
+++ b/src/bin/xfrout/xfrout.py.in
@@ -44,7 +44,7 @@ else:
     DATAROOTDIR = "@datarootdir@"
     SPECFILE_PATH = "@datadir@/@PACKAGE@".replace("${datarootdir}", DATAROOTDIR).replace("${prefix}", PREFIX)
 SPECFILE_LOCATION = SPECFILE_PATH + "/xfrout.spec"
-UNIX_SOCKET_FILE = "@localstatedir@".replace("${prefix}", PREFIX) + "/auth_xfrout_conn"
+UNIX_SOCKET_FILE = "@@LOCALSTATEDIR@@/auth_xfrout_conn"
 
 MAX_TRANSFERS_OUT = 10
 verbose_mode = False
-- 
GitLab