-add gana to bootstrap; update

2 files changed, 28 insertions, 1 deletions

diff --git a/bootstrap b/bootstrap
index c6253048c..36e411f1d 100755
--- a/bootstrap
+++ b/bootstrap
@@ -98,15 +98,42 @@ submodules()
         echo "git not installed, skipping submodule update"
     else
         git submodule update --init || exit 1
-        git submodule update --recursive || exit 1
+        git submodule update --remote --recursive || exit 1
         git submodule sync || exit 1
     fi
 }
 
+gana_update()
+{
+    if existence recfmt; then
+      cwd=$PWD
+      cd contrib/gana || exit 1
+      # GNS
+      cd gnu-name-system-record-types && \
+         make && \
+         cp gnu_name_system_record_types.h ../../../src/include/ && \
+         make clean
+      cd ../gnu-name-system-default-tlds && \
+         make && \
+         cp tlds.conf ../../../src/gns && \
+         make clean
+
+      # Signatures
+      cd ../gnunet-signatures && \
+         make && \
+         cp gnunet_signatures.h ../../../src/include && \
+         make clean
+      cd $cwd
+    else
+      echo "WARNING: No recutils found! Unable to generate recent GANA headers and configs."
+    fi
+}
+
 main()
 {
     cleanup
     submodules
+    gana_update
     check_uncrustify
     check_yapf
     check_libtool
diff --git a/contrib/gana b/contrib/gana
-Subproject f81e247d78c452bd99beda5cf2cb9c41cba11d3
+Subproject 9b8a787580307cea5a38359c485d521cd8ece82