From fd2a6181fa3e3d0ef935bdfca0dfc301be6de180 Mon Sep 17 00:00:00 2001
From: Vincent Torri <vincent.torri@gmail.com>
Date: Fri, 26 Oct 2012 06:44:50 +0000
Subject: [PATCH] embryo: even more simplifications

SVN revision: 78502
---
 legacy/embryo/configure.ac        | 19 +------------------
 legacy/embryo/embryo.pc.in        |  2 +-
 legacy/embryo/src/bin/Makefile.am |  1 -
 legacy/embryo/src/lib/Makefile.am |  9 +++------
 4 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/legacy/embryo/configure.ac b/legacy/embryo/configure.ac
index bfb5a198c4..4b9f4b334f 100644
--- a/legacy/embryo/configure.ac
+++ b/legacy/embryo/configure.ac
@@ -63,7 +63,6 @@ AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 
 requirement_embryo=""
-embryoincludedir="${datadir}/include"
 
 
 ### Additional options to configure
@@ -133,31 +132,16 @@ EFL_CHECK_PATH_MAX
 
 ### Checks for compiler characteristics
 AC_C_BIGENDIAN
-AM_PROG_CC_C_O
-AC_C_CONST
 AC_C_INLINE
 AC_PROG_CC_STDC
-AC_HEADER_STDC
 AC_C___ATTRIBUTE__
 
-EMBRYO_CPPFLAGS=""
-EMBRYO_CFLAGS=""
-case "$host_os" in
-   mingw32ce*)
-      EMBRYO_CPPFLAGS="-D_WIN32_WCE=0x0420"
-      ;;
-esac
-AC_SUBST(EMBRYO_CPPFLAGS)
-AC_SUBST(EMBRYO_CFLAGS)
-
 
 ### Checks for linker characteristics
 
 
 ### Checks for library functions
 
-AC_ISC_POSIX
-
 # alloca
 AC_FUNC_ALLOCA
 
@@ -168,8 +152,7 @@ EFL_CHECK_FNMATCH([], [AC_MSG_ERROR([Cannot find fnmatch()])])
 EFL_CHECK_GETTIMEOFDAY([], [AC_MSG_ERROR([Cannot find gettimeofday()])])
 
 
-AC_SUBST(requirement_embryo)
-AC_SUBST(embryoincludedir)
+AC_SUBST([requirement_embryo])
 
 AC_OUTPUT([
 Makefile
diff --git a/legacy/embryo/embryo.pc.in b/legacy/embryo/embryo.pc.in
index 540f27cc56..bea0736579 100644
--- a/legacy/embryo/embryo.pc.in
+++ b/legacy/embryo/embryo.pc.in
@@ -4,7 +4,7 @@ libdir=@libdir@
 includedir=@includedir@
 datarootdir=@datarootdir@
 datadir=@datadir@/@PACKAGE@
-embryoincludedir=@embryoincludedir@
+embryoincludedir=@datadir@/include
 
 Name: embryo
 Description: A small virtual machine engine and bytecode compiler
diff --git a/legacy/embryo/src/bin/Makefile.am b/legacy/embryo/src/bin/Makefile.am
index c180791549..c1a96facea 100644
--- a/legacy/embryo/src/bin/Makefile.am
+++ b/legacy/embryo/src/bin/Makefile.am
@@ -31,7 +31,6 @@ embryo_cc_scvars.c \
 embryo_cc_prefix.c \
 embryo_cc_prefix.h
 
-embryo_cc_CFLAGS = @EMBRYO_CFLAGS@
 embryo_cc_LDADD = $(top_builddir)/src/lib/libembryo.la @EVIL_LIBS@ @EINA_LIBS@ -lm
 
 EXTRA_DIST = \
diff --git a/legacy/embryo/src/lib/Makefile.am b/legacy/embryo/src/lib/Makefile.am
index 47653e1a2a..51888c5604 100644
--- a/legacy/embryo/src/lib/Makefile.am
+++ b/legacy/embryo/src/lib/Makefile.am
@@ -12,8 +12,7 @@ AM_CPPFLAGS = \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
 -DEFL_EMBRYO_BUILD \
 @EVIL_CFLAGS@ \
-@EXOTIC_CFLAGS@ \
-@EMBRYO_CPPFLAGS@
+@EXOTIC_CFLAGS@
 
 includes_HEADERS = Embryo.h
 includesdir = $(includedir)/embryo-@VMAJ@
@@ -27,10 +26,8 @@ embryo_float.c \
 embryo_main.c \
 embryo_rand.c \
 embryo_str.c \
-embryo_time.c
+embryo_time.c \
+embryo_private.h
 
-libembryo_la_CFLAGS = @EMBRYO_CFLAGS@
 libembryo_la_LIBADD = @EXOTIC_LIBS@ @EVIL_LIBS@ -lm
 libembryo_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
-
-EXTRA_DIST = embryo_private.h