Commit 163352be authored by Vivien Kraus's avatar Vivien Kraus
Browse files

Start using guile

parent 77dcc02e
......@@ -67,6 +67,8 @@ export LD_LIBRARY_PATH="$SOURCE_TOP/root/lib:$LD_LIBRARY_PATH"
echo "Looking for libtarot.pc in $PKG_CONFIG_PATH"
./configure \
CFLAGS="-Wall -Wextra -g -O0" \
LDFLAGS="-L/usr/lib/x86_64-linux-gnu" \
DISTCHECK_CONFIGURE_FLAGS='LDFLAGS="-L/usr/lib/x86_64-linux-gnu"' \
--prefix="$SOURCE_TOP/public" \
|| (cat config.log ; exit 1) \
|| exit 1
......
......@@ -25,6 +25,8 @@ make -j 16 install || exit 1
make distclean || exit 1
export PKG_CONFIG_PATH="$PWD/root/share/pkgconfig:$PKG_CONFIG_PATH"
../tarot-$PROGRAM_VERSION/configure \
LDFLAGS="-L/usr/lib/x86_64-linux-gnu" \
DISTCHECK_CONFIGURE_FLAGS='LDFLAGS="-L/usr/lib/x86_64-linux-gnu"' \
--prefix="$PWD/../public" \
--enable-silent-rules=yes \
|| (cat config.log; exit 1)
......
......@@ -15,8 +15,6 @@ gl_EARLY
AM_INIT_AUTOMAKE
AM_PROG_AR
LT_INIT
AX_PROG_BISON
AX_PROG_FLEX
AM_MISSING_PROG([INDENT], [indent])
AM_MISSING_PROG([EMACS], [emacs])
AM_MISSING_PROG([AUTOGEN], [autogen])
......@@ -35,23 +33,12 @@ AM_CONDITIONAL([HAVE_VALGRIND], [test "x$HAVE_VALGRIND" = "xyes"])
# Checks for libraries.
gl_INIT
AC_SEARCH_LIBS([u8_mblen], [unistring], [FOUND_LIBUNISTRING="1"], [
FOUND_LIBUNISTRING="0"
AS_IF([test "x$with_libunistring" = "xyes"], [
AC_MSG_ERROR([libunistring is not working.])])
])
PKG_CHECK_MODULES([libtarot], [libtarot], [], [AC_MSG_ERROR([libtarot is not working.])])
AC_SEARCH_LIBS([readline], [readline], [], [AC_MSG_ERROR([readline is not working.])])
AC_SEARCH_LIBS([add_history], [readline], [], [AC_MSG_ERROR([readline is not working.])])
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION([0.19])
LIBOPTS_CHECK
PKG_CHECK_MODULES([GUILE], [guile-2.0])
# Checks for header files.
AS_IF([test "x$FOUND_LIBUNISTRING" = "x1"], [
AC_CHECK_HEADERS([unistr.h], [], [FOUND_LIBUNISTRING="0"])
])
AC_CHECK_HEADERS([readline/readline.h readline/history.h], [], [AC_MSG_ERROR([readline is not working.])])
# Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_UID_T
......@@ -74,8 +61,4 @@ AC_CONFIG_FILES([
lib/Makefile
])
AC_DEFINE([FIRST_LINE], [1], [First line of a file, for the lexer])
AC_DEFINE([FIRST_COLUMN], [1], [First column in a line, for the lexer])
AC_DEFINE([TAB_WIDTH], [8], [Number of columns in a tab])
AC_DEFINE_UNQUOTED([HAVE_LIBUNISTRING], [$FOUND_LIBUNISTRING ], [Whether libunistring is available])
AC_OUTPUT
This diff is collapsed.
......@@ -18,6 +18,4 @@
AM_CPPFLAGS += -I $(srcdir)/%reldir% -I %reldir%
include %reldir%/parser/Makefile.am
include %reldir%/program/Makefile.am
include %reldir%/command/Makefile.am
......@@ -31,7 +31,7 @@ EXTRA_DIST += \
%reldir%/options.h \
%reldir%/options.c
%canon_reldir%_tarot_CFLAGS = \
$(libtarot_CFLAGS) \
$(GUILE_CFLAGS) \
$(AM_CFLAGS) \
$(LIBOPTS_CFLAGS)
%canon_reldir%_tarot_CXXFLAGS = \
......@@ -39,10 +39,8 @@ EXTRA_DIST += \
%canon_reldir%_tarot_CPPFLAGS = \
$(AM_CPPFLAGS)
%canon_reldir%_tarot_LDADD = \
src/parser/libtarot-parser.la \
src/command/libtarot-command.la \
$(GUILE_LIBS) \
lib/libgnu.la \
$(libtarot_LIBS) \
$(AM_LDADD) \
$(LTLIBINTL) \
$(LTLIBTHREAD) \
......
This diff is collapsed.
......@@ -16,7 +16,6 @@ copyright = {
flag = {
name = assistant;
descrip = "Analyze an external game";
flags-cant = "output";
flags-cant = "model";
flags-cant = "n-players";
flags-cant = "call";
......@@ -70,19 +69,6 @@ flag = {
"use with another program.";
};
flag = {
name = output;
value = o;
arg-type = file;
open-file = "yes";
file-mode = "w";
descrip = "Output batch results to a file";
doc = "In batch modes of operation, the results may be written to a file, or "
"to standard output. This option redirects the output to a file on "
"disk. If using this option, make sure that the directory containing the "
"destination file exists. The file itself needs not exist.";
};
flag = {
name = n-players;
value = n;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment