re-enable auto-gen

bk: 44852962y51PYtPa3MbJxXT6hz9AAA

diff --git a/bootstrap b/bootstrap
index 24eede6f69ccd9c0105b5ab0e0c653446736dd6b..4367abbd8d65836c45cc0703f9e0b1eec777a801 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -33,24 +33,24 @@ AUTORECONF=${AUTORECONF:-autoreconf}
 
 scripts/genver
 
-#rm -rf sntp/libopts*
-#gunzip -c $(autoopts-config --libsrc) | (
-#  cd sntp
-#  tar -xvf -
-#  mv libopts-*.*.* libopts )
+rm -rf sntp/libopts*
+gunzip -c $(autoopts-config --libsrc) | (
+  cd sntp
+  tar -xvf -
+  mv libopts-*.*.* libopts )
 
-#prog_opt_files=$(
-#    egrep -l '^prog.name' $(
-#        find * -type f -name *.def|fgrep -v /SCCS/))
+prog_opt_files=$(
+    egrep -l '^prog.name' $(
+        find * -type f -name *.def|fgrep -v /SCCS/))
 
 incdir=${PWD}/include
 
-#for f in ${prog_opt_files}
-#do
-#  ( cd $(dirname ${f})
-#    echo "Running autogen on $f..."
-#    autogen -L${incdir} $(basename ${f}) )
-#done
+for f in ${prog_opt_files}
+do
+  ( cd $(dirname ${f})
+    echo "Running autogen on $f..."
+    autogen -L${incdir} $(basename ${f}) )
+done
 
 (cd sntp && ${AUTORECONF} -i -v)
 

diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c
index 01209c093bac4438dae9a94c9ad9b2a08a164ae1..5f295a8cec88b23724421d8c888dc2b033cd48ec 100644 (file)
--- a/ntpd/ntpd.c
+++ b/ntpd/ntpd.c
@@ -464,7 +464,6 @@ ntpdmain(
 
        initializing = 1;               /* mark that we are initializing */
 
-printf("0: argc=%d\n", argc);
        {
                int optct = optionProcess(
 #ifdef SIM
@@ -476,7 +475,6 @@ printf("0: argc=%d\n", argc);
                argc -= optct;
                argv += optct;
        }
-printf("1: argc=%d\n", argc);
 
        /* HMS: is this lame? Should we process -l first? */