Merge remote-tracking branch 'origin/upstream'

diff --git a/ChangeLog b/ChangeLog
index 38b7089..4a46661 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,3 +9,8 @@
 2011-07-16  Vincent Torri
 
        * delete temporary files on Windows
+
+2011-10-05  Vincent Torri
+
+       * use fseek() instead of rewind() as the latter does not exist on
+       Windows CE and fix compilation with Evil.

diff --git a/Makefile.am b/Makefile.am
index 79bfa3e..5c70db3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,9 +30,7 @@ COPYING \
 autogen.sh \
 embryo.pc.in \
 embryo.spec.in \
-embryo.spec \
-README.in \
-README
+embryo.spec
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = embryo.pc

diff --git a/README.in b/README
similarity index 99%
rename from README.in
rename to README
index e062e42..36cfe09 100644 (file)
--- a/README.in
+++ b/README
@@ -1,4 +1,4 @@
-Embryo @VERSION@ BETA
+Embryo
 
 ******************************************************************************
 

diff --git a/autogen.sh b/autogen.sh
index 00116ea..72e1033 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,7 +3,6 @@
 rm -rf autom4te.cache
 rm -f aclocal.m4 ltmain.sh
 
-touch README
 touch ABOUT-NLS
 
 echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1

diff --git a/configure.ac b/configure.ac
index 129fdf1..222c3f4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -185,7 +185,6 @@ include/Makefile
 src/Makefile
 src/lib/Makefile
 src/bin/Makefile
-README
 embryo.spec
 ])
 

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index aa2b3d8..f5c78aa 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -10,6 +10,7 @@ AM_CPPFLAGS = \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+@EVIL_CFLAGS@ \
 @EMBRYO_CPPFLAGS@ \
 @EFL_EMBRYO_BUILD@
 
@@ -28,7 +29,7 @@ embryo_str.c \
 embryo_time.c
 
 libembryo_la_CFLAGS = @EMBRYO_CFLAGS@
-libembryo_la_LIBADD = -lm
+libembryo_la_LIBADD = @EVIL_LIBS@ -lm
 libembryo_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
 
 EXTRA_DIST = embryo_private.h

diff --git a/src/lib/embryo_amx.c b/src/lib/embryo_amx.c
index 1462a54..4fa84c5 100644 (file)
--- a/src/lib/embryo_amx.c
+++ b/src/lib/embryo_amx.c
@@ -29,10 +29,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#ifdef HAVE_EVIL
-# include <Evil.h>
-#endif
-
 #include "Embryo.h"
 #include "embryo_private.h"
 
@@ -290,7 +286,7 @@ embryo_program_load(const char *file)
    if (!f) return NULL;
    fseek(f, 0, SEEK_END);
    program_size = ftell(f);
-   rewind(f);
+   fseek(f, 0L, SEEK_SET);
    if (program_size < (int)sizeof(Embryo_Header))
      {
        fclose(f);
@@ -301,7 +297,7 @@ embryo_program_load(const char *file)
        fclose(f);
        return NULL;
      }
-   rewind(f);
+   fseek(f, 0L, SEEK_SET);
 #ifdef WORDS_BIGENDIAN
    embryo_swap_32((unsigned int *)(&hdr.size));
 #endif