Updated configure scripts
svn: r1171
This commit is contained in:
47
gramps2/configure
vendored
47
gramps2/configure
vendored
@@ -3811,53 +3811,9 @@ echo "${ECHO_T}ok" >&6
|
||||
SCROLLKEEPER_REQUIRED=0.1.4
|
||||
|
||||
|
||||
# Extract the first word of "scrollkeeper-config", so it can be a program name with args.
|
||||
set dummy scrollkeeper-config; ac_word=$2
|
||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
if test "${ac_cv_path_SCROLLKEEPER_CONFIG+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
case $SCROLLKEEPER_CONFIG in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_SCROLLKEEPER_CONFIG="$SCROLLKEEPER_CONFIG" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_path_SCROLLKEEPER_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
test -z "$ac_cv_path_SCROLLKEEPER_CONFIG" && ac_cv_path_SCROLLKEEPER_CONFIG="no"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
SCROLLKEEPER_CONFIG=$ac_cv_path_SCROLLKEEPER_CONFIG
|
||||
DISABLE_SCROLLKEEPER=1
|
||||
|
||||
if test -n "$SCROLLKEEPER_CONFIG"; then
|
||||
echo "$as_me:$LINENO: result: $SCROLLKEEPER_CONFIG" >&5
|
||||
echo "${ECHO_T}$SCROLLKEEPER_CONFIG" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
if test x$SCROLLKEEPER_CONFIG = xno; then
|
||||
{ { echo "$as_me:$LINENO: error: Couldn't find scrollkeeper-config. Please install the scrollkeeper package." >&5
|
||||
echo "$as_me: error: Couldn't find scrollkeeper-config. Please install the scrollkeeper package." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
DISABLE_SCROLLKEEPER=1
|
||||
|
||||
fi
|
||||
|
||||
# Extract the first word of "jw", so it can be a program name with args.
|
||||
set dummy jw; ac_word=$2
|
||||
@@ -4590,7 +4546,6 @@ s,@CCDEPMODE@,$CCDEPMODE,;t t
|
||||
s,@CPP@,$CPP,;t t
|
||||
s,@HAVE_PKG_CONFIG@,$HAVE_PKG_CONFIG,;t t
|
||||
s,@SCROLLKEEPER_REQUIRED@,$SCROLLKEEPER_REQUIRED,;t t
|
||||
s,@SCROLLKEEPER_CONFIG@,$SCROLLKEEPER_CONFIG,;t t
|
||||
s,@DISABLE_SCROLLKEEPER@,$DISABLE_SCROLLKEEPER,;t t
|
||||
s,@JW@,$JW,;t t
|
||||
s,@HAVE_JW@,$HAVE_JW,;t t
|
||||
|
Reference in New Issue
Block a user