From 9c51c824182a1b3180cecdd86b5af6c9dbc958ab Mon Sep 17 00:00:00 2001
From: Ganesh Viswanathan <dev@genotrance.com>
Date: Fri, 30 Aug 2019 19:08:35 -0500
Subject: [PATCH] Add autopoint detection

---
 .travis.yml        | 6 +++++-
 appveyor.yml       | 4 +++-
 nimterop/build.nim | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e56a392..564c34d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,11 @@ os:
   - linux
   - osx
 
+addons:
+  apt:
+    packages:
+    - autopoint
+
 language: c
 
 env:
@@ -15,7 +20,6 @@ cache:
     - "$HOME/.choosenim/toolchains/nim-0.20.2"
 
 install:
-  # `set -u` failed for ubuntu: /home/travis/.travis/job_stages: line 107: secure: unbound variable
   - set -e
   - export CHOOSENIM_CHOOSE_VERSION=$BRANCH
   - |
diff --git a/appveyor.yml b/appveyor.yml
index 9525673..5386bbc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,7 +10,7 @@ matrix:
 environment:
   matrix:
     - NIM_VERSION: 0.19.6
-    - NIM_VERSION: 0.20.0
+    - NIM_VERSION: 0.20.2
 
 for:
 -
@@ -54,6 +54,8 @@ for:
       - image: Ubuntu
 
   install:
+    - sudo apt-get update
+    - sudo apt-get --yes --force-yes install liblzma-dev liblzma5 autopoint
     - if [ ! -e /home/appveyor/binaries ]; then
         echo $NIM_VERSION &&
         mkdir /home/appveyor/binaries &&
diff --git a/nimterop/build.nim b/nimterop/build.nim
index 53237c0..dfeb2d4 100644
--- a/nimterop/build.nim
+++ b/nimterop/build.nim
@@ -462,7 +462,10 @@ proc buildLibrary(lname, outdir, conFlags, cmakeFlags, makeFlags: string): strin
         if findExe("aclocal").len != 0:
           if findExe("autoconf").len != 0:
             if findExe("libtoolize").len != 0:
-              cfgCommon()
+              if findExe("autopoint").len != 0:
+                cfgCommon()
+              else:
+                conDepStr &= "autopoint executable missing"
             else:
               conDepStr &= "libtoolize executable missing"
           else: