diff options
| author | Carsten Haitzler <raster@rasterman.com> | 2013-01-05 02:13:19 +0000 |
|---|---|---|
| committer | Carsten Haitzler <raster@rasterman.com> | 2013-01-05 02:13:19 +0000 |
| commit | 1803cd1e6a48d5964db5dde568d6c80fa50ffd90 (patch) | |
| tree | ff8582c77871446477f38093b38aa70d94730030 | |
| parent | b117e6601005216f50502987a4a9cc893765061d (diff) | |
| download | eet-1803cd1e6a48d5964db5dde568d6c80fa50ffd90.tar.gz | |
gnutls cflags fix (just to be nice the dirfd macro fixed too - but it
isnt used by eet)
SVN revision: 82251
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | m4/efl_check_funcs.m4 | 3 |
3 files changed, 6 insertions, 3 deletions
@@ -669,3 +669,6 @@ * 1.7.5 release +2013-01-05 Joel Klinghed + + * eet gcrypt cflags build fix. diff --git a/configure.ac b/configure.ac index f945e20..be923ff 100644 --- a/configure.ac +++ b/configure.ac @@ -68,6 +68,7 @@ AC_CANONICAL_HOST ### Default options with respect to host requirements_pc_eet="" +requirements_cflags_eet="" requirements_libs_eet="" ### Additional options to configure @@ -269,6 +270,7 @@ fi if test "x${have_gnutls}" = "xyes" ; then AC_PATH_GENERIC([libgcrypt], [], [have_gnutls="yes"], [have_gnutls="no"]) if test "x${have_gnutls}" = "xyes" ; then + requirements_cflags_eet="${LIBGCRYPT_CFLAGS} ${requirements_cflags_eet}" requirements_libs_eet="${LIBGCRYPT_LIBS} ${requirements_libs_eet}" fi fi @@ -405,6 +407,7 @@ case "$host_os" in ;; esac +EET_CFLAGS="${EET_CFLAGS} ${requirements_cflags_eet}" EET_LIBS="${EET_LIBS} ${requirements_libs_eet}" diff --git a/m4/efl_check_funcs.m4 b/m4/efl_check_funcs.m4 index 3714969..11a77b6 100644 --- a/m4/efl_check_funcs.m4 +++ b/m4/efl_check_funcs.m4 @@ -26,11 +26,8 @@ AC_LINK_IFELSE( #endif ]], [[ -int main(void) -{ DIR *dirp; return dirfd(dirp); -} ]]) ], [_efl_have_fct="yes"], |