enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

use efl_fnmatch m4 macro 

SVN revision: 45852
This commit is contained in:
Vincent Torri 2010-02-03 20:47:48 +00:00
parent 64f1c415e2
commit 519cb98847
3 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
legacy/eet/configure.ac
View File

@ -291,10 +291,6 @@ AC_CHECK_HEADER([jpeglib.h],
AC_CHECK_HEADERS(netinet/in.h)
AC_CHECK_HEADER([fnmatch.h],
[dummy="yes"],
[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])])
### Checks for types
@ -385,19 +381,7 @@ AC_FUNC_ALLOCA
AC_CHECK_FUNCS(fmemopen open_memstream realpath)
fnmatch_libs=""
AC_CHECK_FUNCS([fnmatch], [res="yes"], [res="no"])
if test "x$res" = "xno"; then
AC_SEARCH_LIBS([fnmatch],
[fnmatch evil iberty],
[res="yes"],
[res="no"])
if test "x$res" = "xno"; then
AC_MSG_ERROR([Cannot find fnmatch() in neither libc nor libfnmatch, nor libiberty, nor libevil])
fi
fnmatch_libs="${ac_cv_search_fnmatch}"
fi
AC_SUBST(fnmatch_libs)
EFL_CHECK_FNMATCH([], [AC_MSG_ERROR([Cannot find fnmatch()])])
AC_SUBST(requirement_eet)

2
legacy/eet/eet.pc.in
View File

@ -8,6 +8,6 @@ Description: Library for speedy data storage, retrieval, and compression
@pkgconfig_requires_private@: @requirement_eet@
Version: @VERSION@
Libs: -L${libdir} -leet
Libs.private: @EET_LIBS@ @fnmatch_libs@ @LIBGCRYPT_LIBS@ -ljpeg -lz -lm
Libs.private: @EET_LIBS@ @EFL_FNMATCH_LIBS@ @LIBGCRYPT_LIBS@ -ljpeg -lz -lm
Cflags: -I${includedir}
Cflags.private: @LIBGCRYPT_CFLAGS@

31
legacy/eet/m4/efl_fnmatch.m4 Normal file
View File

@ -0,0 +1,31 @@
dnl Copyright (C) 2010 Vincent Torri <vtorri at univ-evry dot fr>
dnl That code is public domain and can be freely used or copied.
dnl Macro that check if fnmatch functions are available or not.
dnl Usage: EFL_CHECK_FNMATCH([, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
dnl Call AC_SUBST(EFL_FNMATCH_LIBS)
AC_DEFUN([EFL_CHECK_FNMATCH],
[
AC_CHECK_HEADER([fnmatch.h], [_efl_have_fnmatch="yes"], [_efl_have_fnmatch="no"])
if test "x${_efl_have_fnmatch}" = "xyes" ; then
AC_SEARCH_LIBS([fnmatch],
[fnmatch evil iberty],
[_efl_have_fnmatch="yes"],
[_efl_have_fnmatch="no"])
fi
EFL_FNMATCH_LIBS=""
if (! test "x${ac_cv_search_fnmatch}" = "xnone required") && (! test "x${ac_cv_search_fnmatch}" = "xno") && (! test "x${ac_cv_search_fnmatch}" = "x-levil") ; then
EFL_FNMATCH_LIBS=${ac_cv_search_fnmatch}
fi
AC_SUBST(EFL_FNMATCH_LIBS)
AS_IF([test "x$_efl_have_fnmatch" = "xyes"], [$1], [$2])
])