[gjs: 1/3] maint: build fixes



commit 5b105f7e255b1814f85a1e3083d599bdbc4da56f
Author: Claudio André <claudioandre br gmail com>
Date:   Fri Jul 20 13:44:29 2018 -0300

    maint: build fixes
    
    - fix the libgjs location on Ubuntu;
    - remove a wrong configure message;
    - select bash as the shell.

 configure.ac                            | 4 +---
 installed-tests/scripts/testExamples.sh | 2 +-
 test/test-ci.sh                         | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1ea98917..55cc8c98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -193,9 +193,7 @@ AS_IF([test x$enable_readline != xno],[
 
 if test $gjs_cv_lib_readline = no; then
   AS_IF([test x$enable_readline != xno],
-    [AC_MSG_ERROR([Readline requested but not found. Configure with --disable-readline.])]
-  )
-  AC_MSG_RESULT([none])
+    [AC_MSG_ERROR([Readline requested but not found. Configure with --disable-readline.])])
   READLINE_LIBS=""
   ac_cv_header_readline_readline_h=no
 else
diff --git a/installed-tests/scripts/testExamples.sh b/installed-tests/scripts/testExamples.sh
index 06496238..e54280b9 100755
--- a/installed-tests/scripts/testExamples.sh
+++ b/installed-tests/scripts/testExamples.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 DIR="$( cd "$( dirname "${0}" )" && pwd )"
 source "${DIR}"/common.sh
 
diff --git a/test/test-ci.sh b/test/test-ci.sh
index b18d572d..84708bfa 100755
--- a/test/test-ci.sh
+++ b/test/test-ci.sh
@@ -7,9 +7,9 @@ function do_Set_Env(){
     XDG_CACHE_HOME="$(pwd)"/.cache
     export XDG_CACHE_HOME
 
-    #SpiderMonkey
+    #SpiderMonkey and libgjs
     export PKG_CONFIG_PATH=/root/jhbuild/install/lib/pkgconfig
-    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/root/jhbuild/install/lib
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/root/jhbuild/install/lib:/usr/local/lib
 
     #Macros
     export ACLOCAL_PATH=$ACLOCAL_PATH:/root/jhbuild/install/share/aclocal


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]