[svn] commit: r697 - in /branches/parkinglot/src/bin/auth: Makefile.am config.h.in main.cc

[BIND 10 source code commits]

Author: jelte
Date: Mon Feb  1 11:19:23 2010
New Revision: 697

Log:
install auth.spec and use the right one

Modified:
    branches/parkinglot/src/bin/auth/Makefile.am
    branches/parkinglot/src/bin/auth/config.h.in
    branches/parkinglot/src/bin/auth/main.cc

Modified: branches/parkinglot/src/bin/auth/Makefile.am
==============================================================================
--- branches/parkinglot/src/bin/auth/Makefile.am (original)
+++ branches/parkinglot/src/bin/auth/Makefile.am Mon Feb  1 11:19:23 2010
@@ -8,3 +8,7 @@
 b10_auth_LDADD +=  $(top_builddir)/src/lib/auth/cpp/.libs/libauth.a
 b10_auth_LDADD += $(top_builddir)/src/lib/config/cpp/libclient.a
 b10_auth_LDADD += $(top_builddir)/src/lib/cc/cpp/libcc.a
+
+b10_authdir = $(DESTDIR)$(pkgdatadir)
+b10_auth_DATA = auth.spec
+

Modified: branches/parkinglot/src/bin/auth/config.h.in
==============================================================================
--- branches/parkinglot/src/bin/auth/config.h.in (original)
+++ branches/parkinglot/src/bin/auth/config.h.in Mon Feb  1 11:19:23 2010
@@ -1,1 +1,1 @@
-#define AUTH_SPECFILE_LOCATION "@abs_top_srcdir@/src/bin/auth/auth.spec"
+#define AUTH_SPECFILE_LOCATION "@prefix@/share/bind/auth.spec"

Modified: branches/parkinglot/src/bin/auth/main.cc
==============================================================================
--- branches/parkinglot/src/bin/auth/main.cc (original)
+++ branches/parkinglot/src/bin/auth/main.cc Mon Feb  1 11:19:23 2010
@@ -100,7 +100,13 @@
 
     // initialize command channel
     try {
-        CommandSession cs = CommandSession(AUTH_SPECFILE_LOCATION,
+        std::string specfile;
+        if (getenv("B10_FROM_SOURCE")) {
+            specfile = std::string(getenv("B10_FROM_SOURCE")) + "/src/bin/auth/auth.spec";
+        } else {
+            specfile = std::string(AUTH_SPECFILE_LOCATION);
+        }
+        CommandSession cs = CommandSession(specfile,
                                            my_config_handler,
                                            my_command_handler);