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

support for glib-2.0 

git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@2283 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
rzf 2008-06-19 21:09:56 +00:00
parent 82d9ed1521
commit a500ac9f97
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure vendored
View File

@ -7232,12 +7232,12 @@ if test "$tabling" = "yes"
fi
if test ! "$yap_cv_cplint" = "no"
then
GLIBS=`glib-config --libs glib`
GFLAGS=`glib-config --cflags glib`
GLIBS=`pkg-config --libs glib-2.0`
GFLAGS=`pkg-config --cflags glib-2.0`
CPLINT_LIBS=${CPLINT_LIBS}$GLIBS
CPLINT_CFLAGS=" $GFLAGS "
CPLINT_LDFLAGS=" `echo $GLIBS | awk '{print $1}'` -L/usr/local/lib/"
LDFLAGS=${LDFLAGS}" `echo $GLIBS | awk '{print $1}'` -L/usr/local/lib/"
CPLINT_LDFLAGS=" `echo $GLIBS | awk '{print $1}'` -L$pefic/lib/"
LDFLAGS=${LDFLAGS}" `echo $GLIBS | awk '{print $1}'` -L$prefix/lib/"
if test ! "$yap_cv_cplint" = "yes"
then
LDFLAGS+=" -L${yap_cv_cplint}/lib"
@ -7272,7 +7272,7 @@ return g_hash_table_new ();
return 0;
}
_ACEOF
for ac_lib in '' glib; do
for ac_lib in '' glib-2.0; do
if test -z "$ac_lib"; then
ac_res="none required"
else
@ -7324,10 +7324,10 @@ echo "${ECHO_T}$ac_cv_search_g_hash_table_new" >&6; }
ac_res=$ac_cv_search_g_hash_table_new
if test "$ac_res" != no; then
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
CPLINT_LIBS="-lglib "
CPLINT_LIBS="-lglib-2.0 "
else
{ { echo "$as_me:$LINENO: error: This package needs glib." >&5
echo "$as_me: error: This package needs glib." >&2;}
{ { echo "$as_me:$LINENO: error: This package needs glib >=2.0." >&5
echo "$as_me: error: This package needs glib >=2.0." >&2;}
{ (exit 1); exit 1; }; }
fi

10
configure.in
View File

@ -962,19 +962,19 @@ if test "$tabling" = "yes"
fi
if test ! "$yap_cv_cplint" = "no"
then
GLIBS=`glib-config --libs glib`
GFLAGS=`glib-config --cflags glib`
GLIBS=`pkg-config --libs glib-2.0`
GFLAGS=`pkg-config --cflags glib-2.0`
CPLINT_LIBS=${CPLINT_LIBS}$GLIBS
CPLINT_CFLAGS=" $GFLAGS "
CPLINT_LDFLAGS=" `echo $GLIBS | awk '{print $1}'` -L/usr/local/lib/"
LDFLAGS=${LDFLAGS}" `echo $GLIBS | awk '{print $1}'` -L/usr/local/lib/"
CPLINT_LDFLAGS=" `echo $GLIBS | awk '{print $1}'` -L$pefic/lib/"
LDFLAGS=${LDFLAGS}" `echo $GLIBS | awk '{print $1}'` -L$prefix/lib/"
if test ! "$yap_cv_cplint" = "yes"
then
LDFLAGS+=" -L${yap_cv_cplint}/lib"
CPLINT_LDFLAGS+=" -L${yap_cv_cplint}/lib"
CPLINT_CFLAGS+=" -I${yap_cv_cplint}/include"
fi
AC_SEARCH_LIBS([g_hash_table_new], [glib], [CPLINT_LIBS="-lglib "], [AC_MSG_ERROR([This package needs glib.], [1])], [])
AC_SEARCH_LIBS([g_hash_table_new], [glib-2.0], [CPLINT_LIBS="-lglib-2.0 "], [AC_MSG_ERROR([This package needs glib >=2.0.], [1])], [])
AC_SEARCH_LIBS([array_do_alloc], [glu], [CPLINT_LIBS="-lglu "$CPLINT_LIBS], [AC_MSG_ERROR([This package needs glu.], [1])], [])
AC_SEARCH_LIBS([Cudd_Init], [cu], [CPLINT_LIBS="-lcu "$CPLINT_LIBS], [AC_MSG_ERROR([This package needs glu.], [1])], [-lglu -lm])
ENABLE_CPLINT=""

4
cplint/doc/manual.tex
View File

@ -59,9 +59,9 @@ The modules for answering queries using the definition of the semantics of LPADs
\section{Installation}
\texttt{cplint} is distributed in source code in the CVS version of Yap. It includes Prolog and C files. Download it by following the instruction in \href{http://www.ncc.up.pt/~vsc/Yap/downloads.html}{http://www.ncc.up.pt/$\sim$vsc/Yap/downloads.html}.
\texttt{cplint} requires glu (a subpackage of vis) and glib.
\texttt{cplint} requires glu (a subpackage of vis) and glib-2.0.
You can download glu from \href{http://vlsi.colorado.edu/~vis/getting_VIS_2.1.html}{http://vlsi.colorado.edu/$\sim$vis/getting\_VIS\_2.1.html}
You can download glib from \href{http://www.gtk.org/}{http://www.gtk.org/}. This is a standard GNU package
You can download glib-2.0 (version $\geq 2.0$) from \href{http://www.gtk.org/}{http://www.gtk.org/}. This is a standard GNU package
so it is easy to install it using the package management software of your Linux or Cygwin
distribution.