applications/tg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix merge of configure

Browse Source
This commit is contained in:
Vincent Castellano 2015-05-15 09:26:45 -07:00
parent 2e62498539
commit e1d65dad8f
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure vendored
View File

@ -6379,8 +6379,6 @@ $as_echo "#define USE_PYTHON 1" >>confdefs.h
fi fi
<<<<<<< HEAD
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libjansson" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libjansson" >&5
$as_echo_n "checking for libjansson... " >&6; } $as_echo_n "checking for libjansson... " >&6; }
# Check whether --enable-json was given. # Check whether --enable-json was given.
@ -6501,9 +6499,6 @@ $as_echo "#define USE_JSON 1" >>confdefs.h
fi fi
=======
>>>>>>> 1b3cdff3fde9a12d9251fa388fc86a94a905db2a
#check for custom prog name #check for custom prog name
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking progname" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking progname" >&5
$as_echo_n "checking progname... " >&6; } $as_echo_n "checking progname... " >&6; }