forked from enlightenment/efl
Eio: Fix alloca declaration and remove useless autotools Windows stuff
SVN revision: 79612
This commit is contained in:
parent
a943f063bc
commit
a79a4408e4
|
@ -105,16 +105,13 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
|
|||
|
||||
### Checks for libraries
|
||||
|
||||
EFL_EIO_BUILD=""
|
||||
case "$host_os" in
|
||||
mingw*)
|
||||
PKG_CHECK_EXISTS([evil >= 1.6.99])
|
||||
AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if evil package is installed])
|
||||
requirements_eio="${requirements_eio} evil >= 1.6.99"
|
||||
EFL_EIO_BUILD="-DEFL_EIO_BUILD"
|
||||
;;
|
||||
esac
|
||||
AC_SUBST([EFL_EIO_BUILD])
|
||||
|
||||
requirements_eio="${requirements_eio} eet >= 1.6.99 eina >= 1.6.99 ecore >= 1.6.99"
|
||||
AC_SUBST([requirements_eio])
|
||||
|
@ -158,27 +155,10 @@ AC_C_INLINE
|
|||
AC_C___ATTRIBUTE__
|
||||
AM_PROG_CC_C_O
|
||||
|
||||
EFL_EIO_BUILD=""
|
||||
case "$host_os" in
|
||||
mingw*)
|
||||
EFL_EIO_BUILD="-DEFL_EIO_BUILD"
|
||||
;;
|
||||
esac
|
||||
AC_SUBST(EFL_EIO_BUILD)
|
||||
|
||||
### Checks for linker characteristics
|
||||
|
||||
# use --enable-auto-import on Windows
|
||||
|
||||
lt_enable_auto_import=""
|
||||
case "$host_os" in
|
||||
mingw* | cegcc*)
|
||||
lt_enable_auto_import="-Wl,--enable-auto-import"
|
||||
;;
|
||||
esac
|
||||
AC_SUBST(lt_enable_auto_import)
|
||||
|
||||
### Checks for library functions
|
||||
AC_FUNC_ALLOCA
|
||||
AC_CHECK_FUNCS([fchmod chown getpwnam getgrnam])
|
||||
|
||||
### Check for splice system call
|
||||
|
|
|
@ -8,7 +8,7 @@ files_DATA =
|
|||
AM_CPPFLAGS = \
|
||||
-I. \
|
||||
-I$(top_srcdir)/src/lib/ \
|
||||
@EIO_CFLAGS@ @EFL_EIO_BUILD@
|
||||
@EIO_CFLAGS@
|
||||
|
||||
ECOREBASELDADD = \
|
||||
$(top_builddir)/src/lib/libeio.la \
|
||||
|
|
|
@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
|
||||
AM_CPPFLAGS = @EIO_CFLAGS@ \
|
||||
@EFL_PTHREAD_CFLAGS@ \
|
||||
@EFL_EIO_BUILD@
|
||||
-DEFL_EIO_BUILD
|
||||
|
||||
lib_LTLIBRARIES = libeio.la
|
||||
|
||||
|
@ -29,6 +29,6 @@ endif
|
|||
endif
|
||||
|
||||
libeio_la_LIBADD = @EIO_LIBS@ @EFL_PTHREAD_LIBS@
|
||||
libeio_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
|
||||
libeio_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
|
||||
|
||||
EXTRA_DIST = eio_private.h
|
||||
|
|
|
@ -5,6 +5,32 @@
|
|||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#ifdef STDC_HEADERS
|
||||
# include <stdlib.h>
|
||||
# include <stddef.h>
|
||||
#else
|
||||
# ifdef HAVE_STDLIB_H
|
||||
# include <stdlib.h>
|
||||
# endif
|
||||
#endif
|
||||
#ifdef HAVE_ALLOCA_H
|
||||
# include <alloca.h>
|
||||
#elif !defined alloca
|
||||
# ifdef __GNUC__
|
||||
# define alloca __builtin_alloca
|
||||
# elif defined _AIX
|
||||
# define alloca __alloca
|
||||
# elif defined _MSC_VER
|
||||
# include <malloc.h>
|
||||
# define alloca _alloca
|
||||
# elif !defined HAVE_ALLOCA
|
||||
# ifdef __cplusplus
|
||||
extern "C"
|
||||
# endif
|
||||
void *alloca (size_t);
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#include <sys/types.h>
|
||||
#ifdef HAVE_DIRENT_H
|
||||
# include <dirent.h>
|
||||
|
|
Loading…
Reference in New Issue