Browse Source

[3413] Changes after review:

 - cosmetic changes in configure.ac
 - comment in src/lib/testutils/testdata/Makefile.am updated
Tomek Mrugalski 11 years ago
parent
commit
8f8886ba93
2 changed files with 12 additions and 8 deletions
  1. 8 5
      configure.ac
  2. 4 3
      src/lib/testutils/testdata/Makefile.am

+ 8 - 5
configure.ac

@@ -1363,7 +1363,7 @@ END
 if test "$PYTHON" != "no" ; then
 cat >> config.report << END
 
-Python:
+Python3:
   PYTHON_VERSION:  ${PYTHON_VERSION}
   PYTHON_INCLUDES: ${PYTHON_INCLUDES}
   PYTHON_CXXFLAGS: ${PYTHON_CXXFLAGS}
@@ -1374,7 +1374,8 @@ END
 else
 cat >> config.report << END
 
-Python: no
+Python3:
+  not installed
 
 END
 fi
@@ -1396,7 +1397,7 @@ Log4cplus:
   LOG4CPLUS_LIBS:  ${LOG4CPLUS_LIBS}
 
 Kea config backend:
-  CONFIG_BACKEND: ${CONFIG_BACKEND}
+  CONFIG_BACKEND:  ${CONFIG_BACKEND}
 END
 
 # Avoid confusion on DNS/DHCP and only mention MySQL if it
@@ -1412,7 +1413,8 @@ END
 else
 cat >> config.report << END
 
-MySQL: no
+MySQL:
+  no
 END
 fi
 
@@ -1427,7 +1429,8 @@ END
 else
 cat >> config.report << END
 
-PostgreSQL: no
+PostgreSQL:
+  no
 END
 fi
 

+ 4 - 3
src/lib/testutils/testdata/Makefile.am

@@ -1,8 +1,9 @@
 CLEANFILES = *.copied
 
-# The following files used to be auto-generated using gen_wiredata.py,
-# but #3413 removed python3 dependency and those files are now part
-# of the git repo.
+# The following files are generated from the corresponding .spec files using
+# gen-wiredata.py. Python is not a prerequisite for Kea, so it cannot be
+# assumed that they can be generated when Kea is built. For this reason, they
+# are part of the Kea repository and are distributed in the tarball.
 EXTRA_DIST  = badExampleQuery_fromWire.wire examplequery_fromWire.wire
 EXTRA_DIST += iqueryresponse_fromWire.wire multiquestion_fromWire.wire
 EXTRA_DIST += queryBadEDNS_fromWire.wire shortanswer_fromWire.wire