add some guards for non Windows headers and reorder

alphabetically some autotools stuff

SVN revision: 59393
This commit is contained in:
Vincent Torri 2011-05-15 05:42:30 +00:00
parent 4a6a5bd213
commit f0cbd4add5
3 changed files with 23 additions and 18 deletions

View File

@ -418,7 +418,7 @@ fi
### Checks for header files
AC_HEADER_STDC
AC_CHECK_HEADERS([unistd.h stdint.h sys/param.h])
AC_CHECK_HEADERS([unistd.h stdint.h sys/param.h netinet/in.h])
EFL_CHECK_PATH_MAX
@ -1749,18 +1749,18 @@ echo "Image Loaders:"
echo " BMP.....................: $have_evas_image_loader_bmp"
echo " EDB.....................: $have_evas_image_loader_edb"
echo " EET.....................: $have_evas_image_loader_eet"
echo " GENERIC.................: $have_evas_image_loader_generic"
echo " GIF.....................: $have_evas_image_loader_gif"
echo " ICO.....................: $have_evas_image_loader_ico"
echo " JPEG....................: $have_evas_image_loader_jpeg (region: $have_jpeg_region)"
echo " PMAPS...................: $have_evas_image_loader_pmaps"
echo " PNG.....................: $have_evas_image_loader_png"
echo " PSD.....................: $have_evas_image_loader_psd"
echo " SVG.....................: $have_evas_image_loader_svg"
echo " TGA.....................: $have_evas_image_loader_tga"
echo " TIFF....................: $have_evas_image_loader_tiff"
echo " WBMP....................: $have_evas_image_loader_wbmp"
echo " XPM.....................: $have_evas_image_loader_xpm"
echo " PSD.....................: $have_evas_image_loader_psd"
echo " GENERIC.................: $have_evas_image_loader_generic"
echo
echo "Font Sourcing Systems:"
echo " EET.....................: $have_evas_font_loader_eet"

View File

@ -20,6 +20,12 @@ SUBDIRS += eet
endif
endif
if BUILD_LOADER_GENERIC
if !EVAS_STATIC_BUILD_GENERIC
SUBDIRS += generic
endif
endif
if BUILD_LOADER_GIF
if !EVAS_STATIC_BUILD_GIF
SUBDIRS += gif
@ -50,6 +56,12 @@ SUBDIRS += png
endif
endif
if BUILD_LOADER_PSD
if !EVAS_STATIC_BUILD_PSD
SUBDIRS += psd
endif
endif
if BUILD_LOADER_SVG
if !EVAS_STATIC_BUILD_SVG
SUBDIRS += svg
@ -79,16 +91,3 @@ if !EVAS_STATIC_BUILD_XPM
SUBDIRS += xpm
endif
endif
if BUILD_LOADER_PSD
if !EVAS_STATIC_BUILD_PSD
SUBDIRS += psd
endif
endif
if BUILD_LOADER_GENERIC
if !EVAS_STATIC_BUILD_GENERIC
SUBDIRS += generic
endif
endif

View File

@ -10,13 +10,19 @@
#include <errno.h>
#include <math.h>
#include <netinet/in.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/mman.h>
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#ifdef HAVE_EVIL
# include <Evil.h>
#endif