Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/eet
Dir : e17/libs/eet
Modified Files:
INSTALL configure.in eet-config.in
Log Message:
fix compilation with MinGW
===================================================================
RCS file: /cvs/e/e17/libs/eet/INSTALL,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- INSTALL 2 Dec 2002 23:39:25 -0000 1.2
+++ INSTALL 20 Jan 2007 15:20:23 -0000 1.3
@@ -12,3 +12,8 @@
make install
NOTE: You MUST make install Eet for it to run properly.
+
+NOTE: for compilation with MinGW, fnmatch.h is probably missing.
+ That file can be found here:
+http://www.koders.com/c/fid2B518462CB1EED3D4E31E271DB83CD1582F6EEBE.aspx
+ It should be installed in the mingw include directory.
===================================================================
RCS file: /cvs/e/e17/libs/eet/configure.in,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- configure.in 4 Dec 2006 12:14:17 -0000 1.68
+++ configure.in 20 Jan 2007 15:20:23 -0000 1.69
@@ -21,6 +21,7 @@
AC_CHECK_HEADERS(netinet/in.h)
+winsock_libs=""
case "$host_os" in
mingw|mingw32)
winsock_libs="-lwsock32"
@@ -29,15 +30,19 @@
AC_SUBST(winsock_libs)
-AC_CHECK_HEADER(fnmatch.h,, AC_MSG_ERROR([Cannot find fnmatch.h. Make sure
your CFLAGS environment variable contains include lines for the location of
this file]))
+AC_CHECK_HEADER(fnmatch.h,, AC_MSG_ERROR([Cannot find fnmatch.h. Make sure
your CFLAGS environment variable contains include lines for the location of
this file. MinGW users: see the INSTALL file]))
+fnmatch_libs=""
AC_CHECK_FUNCS(fnmatch, res=yes, res=no)
if test "x$res" = "xno"; then
- AC_CHECK_LIB(fnmatch, fnmatch, res=yes, res=no)
+ AC_CHECK_LIB(fnmatch, fnmatch, res=yes fnmatch_libs="-lfnmatch", res=no)
+dnl Test for compilation with MinGW.
+dnl fnmatch function is in the libiberty library
if test "x$res" = "xno"; then
- AC_MSG_ERROR([Cannot find fnmatch() in neither libc nor
libfnmatch])
- else
- fnmatch_libs="-lfnmatch"
+ AC_CHECK_LIB(iberty, fnmatch, res=yes fnmatch_libs="-liberty",
res=no)
+ fi
+ if test "x$res" = "xno"; then
+ AC_MSG_ERROR([Cannot find fnmatch() in neither libc nor
libfnmatch, nor libiberty])
fi
fi
===================================================================
RCS file: /cvs/e/e17/libs/eet/eet-config.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- eet-config.in 11 Jun 2006 22:37:23 -0000 1.7
+++ eet-config.in 20 Jan 2007 15:20:23 -0000 1.8
@@ -46,7 +46,7 @@
;;
--libs)
[EMAIL PROTECTED]@
- echo $libdirs -leet -lz -ljpeg
+ echo $libdirs -leet -lz -ljpeg @fnmatch_libs@ @winsock_libs@
;;
*)
echo "${usage}" 1>&2
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
