Fix merge of configure
This commit is contained in:
parent
2e62498539
commit
e1d65dad8f
5
configure
vendored
5
configure
vendored
@ -6379,8 +6379,6 @@ $as_echo "#define USE_PYTHON 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
|
||||
<<<<<<< HEAD
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libjansson" >&5
|
||||
$as_echo_n "checking for libjansson... " >&6; }
|
||||
# Check whether --enable-json was given.
|
||||
@ -6501,9 +6499,6 @@ $as_echo "#define USE_JSON 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
|
||||
=======
|
||||
>>>>>>> 1b3cdff3fde9a12d9251fa388fc86a94a905db2a
|
||||
|
||||
#check for custom prog name
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking progname" >&5
|
||||
$as_echo_n "checking progname... " >&6; }
|
||||
|
Loading…
Reference in New Issue
Block a user