diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git.dcc.fc.up.pt:yap-6.3

Browse Source 
Conflicts:
	configure
	configure.in
This commit is contained in:
Vitor Santos Costa
2014-02-27 16:33:25 +00:00
parent e9fce51e92 fda1c534d4
commit 0ab280ad25
20 changed files with 797 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
configure vendored
View File

@@ -5230,8 +5230,49 @@ then
if test "$cygwin" = "no" -o "$target_os" = "mingw32"
then
# locale complaints without this.
if test "$threads" = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lmscrt" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpthread" >&5
$as_echo_n "checking for main in -lpthread... " >&6; }
if ${ac_cv_lib_pthread_main+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpthread $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
main ()
{
return main ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_pthread_main=yes
else
ac_cv_lib_pthread_main=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_main" >&5
$as_echo "$ac_cv_lib_pthread_main" >&6; }
if test "x$ac_cv_lib_pthread_main" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBPTHREAD 1
_ACEOF
LIBS="-lpthread $LIBS"
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lmscrt" >&5
$as_echo_n "checking for main in -lmscrt... " >&6; }
if ${ac_cv_lib_mscrt_main+:} false; then :
$as_echo_n "(cached) " >&6
@@ -12102,7 +12143,7 @@ else
JAVA_TEST=Test.java
CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST
/* #line 12105 "configure" */
/* #line 12146 "configure" */
public class Test {
}
EOF
@@ -12278,7 +12319,7 @@ EOF
if uudecode$EXEEXT Test.uue; then
ac_cv_prog_uudecode_base64=yes
else
echo "configure: 12281: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
echo "configure: 12322: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
echo "configure: failed file was:" >&5
cat Test.uue >&5
ac_cv_prog_uudecode_base64=no
@@ -12409,7 +12450,7 @@ else
JAVA_TEST=Test.java
CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST
/* #line 12412 "configure" */
/* #line 12453 "configure" */
public class Test {
}
EOF
@@ -12444,7 +12485,7 @@ JAVA_TEST=Test.java
CLASS_TEST=Test.class
TEST=Test
cat << \EOF > $JAVA_TEST
/* [#]line 12447 "configure" */
/* [#]line 12488 "configure" */
public class Test {
public static void main (String args[]) {
System.exit (0);