[svn] commit: r1854 - in /trunk: configure.ac src/bin/auth/Makefile.am src/bin/auth/spec_config.h.in src/bin/auth/spec_config.h.pre.in src/bin/xfrout/xfrout.py.in

[BIND 10 source code commits]

Author: zhanglikun
Date: Wed May 19 04:23:48 2010
New Revision: 1854

Log:
Revert the revision 1853 which make trunk fail to build.

Added:
    trunk/src/bin/auth/spec_config.h.in
      - copied unchanged from r1852, trunk/src/bin/auth/spec_config.h.in
Removed:
    trunk/src/bin/auth/spec_config.h.pre.in
Modified:
    trunk/configure.ac
    trunk/src/bin/auth/Makefile.am
    trunk/src/bin/xfrout/xfrout.py.in

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Wed May 19 04:23:48 2010
@@ -431,7 +431,7 @@
            src/bin/msgq/tests/msgq_test
            src/bin/msgq/run_msgq.sh
            src/bin/auth/auth.spec.pre
-           src/bin/auth/spec_config.h.pre
+           src/bin/auth/spec_config.h
            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

Modified: trunk/src/bin/auth/Makefile.am
==============================================================================
--- trunk/src/bin/auth/Makefile.am (original)
+++ trunk/src/bin/auth/Makefile.am Wed May 19 04:23:48 2010
@@ -23,9 +23,6 @@
 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

Modified: trunk/src/bin/xfrout/xfrout.py.in
==============================================================================
--- trunk/src/bin/xfrout/xfrout.py.in (original)
+++ trunk/src/bin/xfrout/xfrout.py.in Wed May 19 04:23:48 2010
@@ -44,7 +44,7 @@
     DATAROOTDIR = "@datarootdir@"
     SPECFILE_PATH = "@datadir@/@PACKAGE@".replace("${datarootdir}", DATAROOTDIR).replace("${prefix}", PREFIX)
 SPECFILE_LOCATION = SPECFILE_PATH + "/xfrout.spec"
-UNIX_SOCKET_FILE = "@@LOCALSTATEDIR@@/auth_xfrout_conn"
+UNIX_SOCKET_FILE = "@localstatedir@".replace("${prefix}", PREFIX) + "/auth_xfrout_conn"
 
 MAX_TRANSFERS_OUT = 10
 verbose_mode = False