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

more configuration fixes

This commit is contained in:
Vítor Santos Costa 2014-02-15 01:24:07 +00:00
parent e52d8f7d7e
commit 1bd528198a
7 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile.in
View File

@ -190,6 +190,8 @@ HEADERS = \
$(srcdir)/H/trim_trail.h \
$(srcdir)/H/yapio.h \
$(srcdir)/H/YapText.h \
$(srcdir)/H/cut_c.h \
$(srcdir)/H/iatoms.h $(srcdir)/H/ratoms.h $(srcdir)/H/tatoms.h \
$(srcdir)/BEAM/eam.h $(srcdir)/BEAM/eamamasm.h \
$(srcdir)/OPTYap/opt.config.h \
$(srcdir)/OPTYap/opt.proto.h $(srcdir)/OPTYap/opt.structs.h \
@ -200,8 +202,6 @@ HEADERS = \
$(srcdir)/OPTYap/locks_mips_funcs.h $(srcdir)/OPTYap/locks_alpha.h \
$(srcdir)/OPTYap/locks_alpha_funcs.h \
$(srcdir)/OPTYap/locks_pthread.h \
$(srcdir)/H/cut_c.h \
$(srcdir)/H/iatoms.h $(srcdir)/H/ratoms.h $(srcdir)/H/tatoms.h \
$(srcdir)/library/dialect/swi/fli/swi.h
IOLIB_SOURCES=$(srcdir)/os/pl-buffer.c $(srcdir)/os/pl-ctype.c \
@ -558,7 +558,10 @@ PACKAGES= \
$(INSTALLED_PACKAGES)
all: startup.yss
for f in $(PACKAGES); do ( cd $$f ; $(MAKE) ); done
for p in $(PACKAGES); do \
echo " ============== " $$p; \
if [ -r $$p/Makefile ]; then $(MAKE) -C $$p || exit 1; fi; \
done
startup.yss: yap@EXEC_SUFFIX@ $(PL_SOURCES)
-rm -f startup.yss
@ -605,7 +608,10 @@ install_unix: startup.yss @YAPLIB@
$(INSTALL) config.h $(DESTDIR)$(INCLUDEDIR)/src/config.h
$(INSTALL) parms.h $(DESTDIR)$(INCLUDEDIR)/src/parms.h
$(INSTALL) YapTermConfig.h $(DESTDIR)$(INCLUDEDIR)
for f in $(PACKAGES); do ( echo "**** INSTALLING **** " $$f; cd $$f ; $(MAKE) install ); done
for p in $(PACKAGES); do \
echo " ============== INSTALLING" $$p; \
if [ -r $$p/Makefile ]; then $(MAKE) -C $$p install || exit 1; fi; \
done
install_win32: startup.yss @WINDOWS@ yap-win@EXEC_SUFFIX@ install_unix
$(INSTALL_PROGRAM) -m 755 yap.dll $(DESTDIR)$(BINDIR)/yap.dll
@ -635,7 +641,10 @@ clean_local:
rm -f *.o *~ *.BAK *.a
distclean: distclean_docs clean_local
for f in $(PACKAGES); do ( ECHO "**** CLEANING ****" $$f; cd $$f ; $(MAKE) distclean ); done
for p in $(PACKAGES); do \
echo " ============== DISTCLEAN " $$p; \
if [ -r $$p/Makefile ]; then $(MAKE) -C $$p distclean || exit 1; fi; \
done
rm -f yap@EXEC_SUFFIX@ startup.yss libYap.* Makefile packages/Makefile.defs packages/Dialect.defs
dist:
@ -724,7 +733,7 @@ distclean_docs: clean_docs
rm -f yap.ps yap.html yap_toc.html yap.pdf yap.info*
installcheck:
@ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) installcheck)
(cd packages/cplint; $(MAKE) installcheck)
# DO NOT DELETE THIS LINE -- make depend depends on it.

21
configure vendored
View File

@ -9171,7 +9171,7 @@ if test "$yap_cv_minisat" = no -a "$INSTALL_DLLS" = "no"
then
PKG_MINISAT=""
else
PKG_MINISAT="packages/swi-minisat2"
PKG_MINISAT="packages/swi-minisat2 packages/swi-minisat2/C"
fi
@ -9446,7 +9446,9 @@ if test "x$ac_cv_header_mysql_mysql_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_MYSQL_MYSQL_H 1
_ACEOF
yap_cv_odbc="yes"
else
yap_cv_odbc="no"
fi
done
@ -11752,7 +11754,7 @@ else
JAVA_TEST=Test.java
CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST
/* #line 11755 "configure" */
/* #line 11757 "configure" */
public class Test {
}
EOF
@ -11928,7 +11930,7 @@ EOF
if uudecode$EXEEXT Test.uue; then
ac_cv_prog_uudecode_base64=yes
else
echo "configure: 11931: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
echo "configure: 11933: 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
@ -12059,7 +12061,7 @@ else
JAVA_TEST=Test.java
CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST
/* #line 12062 "configure" */
/* #line 12064 "configure" */
public class Test {
}
EOF
@ -12094,7 +12096,7 @@ JAVA_TEST=Test.java
CLASS_TEST=Test.class
TEST=Test
cat << \EOF > $JAVA_TEST
/* [#]line 12097 "configure" */
/* [#]line 12099 "configure" */
public class Test {
public static void main (String args[]) {
System.exit (0);
@ -12745,6 +12747,12 @@ _ACEOF
if test $i_am_cross_compiling = yes
then
#mingw: we know where things are
JPLCFLAGS="-I \"$yap_cv_java\"/include -I \"$yap_cv_java\"/include/win32"
JAVALIBS="-L \"$yap_cv_java\"/jre/bin/server -L \"$yap_cv_java\"/jre/bin/client -ljvm"
fi
@ -12847,6 +12855,7 @@ done
if test -d "$raptor_dir/lib64/raptor" -a "$YAP_TARGET" = amd64; then
RAPTOR_LDFLAGS="-L $raptor_dir/lib64/raptor"
elif test -d "$raptor_dir/lib64" -a "$YAP_TARGET" = amd64; then

2
library/Makefile.in
View File

@ -102,6 +102,8 @@ DIALECT_BP= \
$(srcdir)/dialect/bprolog/foreach.pl \
$(srcdir)/dialect/bprolog/hashtable.yap
all:
install: $(PROGRAMS) install-examples
mkdir -p $(DESTDIR)$(SHAREDIR)/Yap
mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/dialect

2
packages/myddas/configure.in
View File

@ -58,7 +58,7 @@ then
ODBC_LIBS="$ODBC_LIBS -liodbc"
fi
fi
AC_CHECK_HEADERS(mysql/mysql.h)
AC_CHECK_HEADERS(mysql/mysql.h, [yap_cv_odbc="yes"], [yap_cv_odbc="no"])
if test "$yap_cv_odbc" = yes
then
YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_ODBC"

2
packages/udi

@ -1 +1 @@
Subproject commit 13ae724d30e4c9dd56ddde63cba4a34f1844c099
Subproject commit 9becd0f0619379d30b26b14df642872a373f3fa4

2
packages/zlib

@ -1 +1 @@
Subproject commit 044e8b33bfe3158463141add5bb9ce5e71cb7451
Subproject commit a8a43aa09892c4b7018dc053d8e7653e2f648107

1
swi/library/Makefile.in
View File

@ -60,6 +60,7 @@ PROGRAMS= \
$(srcdir)/www_browser.pl\
$(srcdir)/dcg/basics.pl
all:
install: $(PROGRAMS)
mkdir -p $(DESTDIR)$(SHAREDIR)/Yap