luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 15:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

gresource: libelf, try pkg-config first then fall-back to AC_CHECK_LIB

Browse Source 
On some systems gelf.h may not be stored under the top level include
directory in which case we need to add the correct include paths in
cflags by using pkg-config(1).
This commit is contained in:
Antoine Jacoutot 2012-03-31 20:20:19 +02:00
parent 4143842eb4
commit 1494544958
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -1799,12 +1799,13 @@ dnl ************************
dnl *** check for libelf *** dnl *** check for libelf ***
dnl ************************ dnl ************************
AC_CHECK_LIB([elf], [elf_begin], have_libelf=yes, have_libelf=no) PKG_CHECK_MODULES([LIBELF], [libelf], [have_libelf=yes], [
AC_CHECK_LIB([elf], [elf_begin], have_libelf=yes, have_libelf=no)
])
if test $have_libelf = yes; then if test $have_libelf = yes; then
AC_DEFINE(HAVE_LIBELF, 1, [Define if libelf is available]) AC_DEFINE(HAVE_LIBELF, 1, [Define if libelf is available])
ELF_LIBS=-lelf LIBELF_LIBS=-lelf
fi fi
AC_SUBST(ELF_LIBS)
dnl **************************************** dnl ****************************************
dnl *** platform dependent source checks *** dnl *** platform dependent source checks ***

3
gio/Makefile.am
View File

@ -704,10 +704,11 @@ EXTRA_DIST += $(completion_DATA)
bin_PROGRAMS += gresource bin_PROGRAMS += gresource
gresource_SOURCES = gresource-tool.c gresource_SOURCES = gresource-tool.c
gresource_CPPFLAGS = $(LIBELF_CFLAGS) $(AM_CPPFLAGS)
gresource_LDADD = libgio-2.0.la \ gresource_LDADD = libgio-2.0.la \
$(top_builddir)/glib/libglib-2.0.la \ $(top_builddir)/glib/libglib-2.0.la \
$(top_builddir)/gobject/libgobject-2.0.la \ $(top_builddir)/gobject/libgobject-2.0.la \
$(ELF_LIBS) $(LIBELF_LIBS)
# ------------------------------------------------------------------------ # ------------------------------------------------------------------------