Commit f0c81071 authored by Erick's avatar Erick

Preparing version stklos-0.99dev-beta4

parent c65752a0
......@@ -19,11 +19,7 @@
#
# Author: Erick Gallesio [eg@unice.fr]
# Creation date: 11-Apr-2000 10:30 (eg)
<<<<<<< local
# Last file update: 26-Sep-2009 00:31 (eg)
=======
# Last file update: 25-Sep-2009 23:28 (eg)
>>>>>>> other
# Last file update: 26-Sep-2009 00:59 (eg)
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
......@@ -236,11 +232,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST =
SUBDIRS = @PCRE@ @GC@ @GMP@ @LIBFFI@ src utils lib \
<<<<<<< local
examples pkgman tests doc
=======
@EXAMPLES@ pkgman tests doc
>>>>>>> other
VERSION_TAG = @PACKAGE@-@VERSION@
VERSION_BETA = $(VERSION_TAG)-beta
......
......@@ -604,10 +604,6 @@ PCRETARGET
LDAP_LIB
HAVE_LDAP
HAVE_GNOME
<<<<<<< local
=======
EXAMPLES
>>>>>>> other
STACK_DIRECTION
COMPSRC
COMPOBJ
......@@ -4991,11 +4987,6 @@ fi
# HAVE_LDAP="undef" && LDAP_LIB="")
<<<<<<< local
#1.0
=======
>>>>>>> other
#1.0 dnl
#1.0 dnl GTK support
#1.0 dnl
......@@ -5013,10 +5004,6 @@ fi
#1.0 USE_GTK=no
#1.0 fi
#1.0
<<<<<<< local
#1.0
=======
>>>>>>> other
#1.0 dnl
#1.0 dnl GNOME support
#1.0 dnl
......@@ -5661,14 +5648,10 @@ fi
<<<<<<< local
#1.0 AC_SUBST(GTKLOS)
#1.0 AC_SUBST(GTK_CONFIG_LIBS)
#1.0 AC_SUBST(GTK_CONFIG_CFLAGS)
#1.0 AC_SUBST(EXAMPLES)
=======
>>>>>>> other
......@@ -7162,11 +7145,7 @@ echo " Compilation flags: " $CFLAGS
echo " Bignum library: " $biglib
echo " Regexp library: " $pcrelib
echo " GC library: " $gclib
<<<<<<< local
#1.0 echo " LDAP support: " $USE_LDAP
=======
echo " LDAP support: " $USE_LDAP
>>>>>>> other
#1.0 echo " GTK+ support: " $USE_GTK
#1.0 echo " GNOME support: " $USE_GNOME
echo " FFI support: " $FFI
......
schemedemodir = $(prefix)/share/@PACKAGE@/@VERSION@/Demos.d
schemedemo_DATA = fork-test.stk hello.stk secho.stk \
<<<<<<< local
socket-server.stk socket-client.stk
=======
socket-server.stk socket-client.stk \
threads.stk
>>>>>>> other
schemedemo_SCRIPTS = fork-test hello secho \
<<<<<<< local
socket-server socket-client
=======
socket-server socket-client \
threads
>>>>>>> other
SUFFIXES = .stk
......
......@@ -197,20 +197,12 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
schemedemodir = $(prefix)/share/@PACKAGE@/@VERSION@/Demos.d
schemedemo_DATA = fork-test.stk hello.stk secho.stk \
<<<<<<< local
socket-server.stk socket-client.stk
=======
socket-server.stk socket-client.stk \
threads.stk
>>>>>>> other
schemedemo_SCRIPTS = fork-test hello secho \
<<<<<<< local
socket-server socket-client
=======
socket-server socket-client \
threads
>>>>>>> other
SUFFIXES = .stk
all: all-am
......
This diff is collapsed.
This diff is collapsed.
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