Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f0315fc authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "qahw: Use glib2.0 library for standard api"

parents 1bfc7bd3 12f5884b

qahw/Makefile.am

+3 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ libqahwwrapper_la_SOURCES = src/qahw.c \ 


libqahwwrapper_la_CFLAGS  = $(AM_CFLAGS)

libqahwwrapper_la_CFLAGS += -include stddef.h

libqahwwrapper_la_CFLAGS += -Dstrlcpy=g_strlcpy $(GLIB_CFLAGS) -include glib.h

libqahwwrapper_la_CFLAGS += -D__unused=__attribute__\(\(__unused__\)\)

libqahwwrapper_la_CFLAGS += -Werror

libqahwwrapper_la_LDFLAGS = -shared -avoid-version -llog -lcutils -lhardware
 
libqahwwrapper_la_CFLAGS += -Werror -Wall

libqahwwrapper_la_LDFLAGS = -shared -avoid-version -llog -lcutils -lhardware $(GLIB_LIBS)

qahw/configure.ac

+16 −0
Original line number Diff line number Diff line
@@ -29,6 +29,22 @@ AC_PROG_LN_S 
AC_PROG_MAKE_SET

PKG_PROG_PKG_CONFIG



AC_ARG_WITH([glib],

      AC_HELP_STRING([--with-glib],

         [enable glib, Build against glib. Use this when building for HLOS systems which use glib]))



if (test "x${with_glib}" = "xyes"); then

        PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.16, dummy=yes,

                                AC_MSG_ERROR(GThread >= 2.16 is required))

        PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16, dummy=yes,

                                AC_MSG_ERROR(GLib >= 2.16 is required))

        GLIB_CFLAGS="$GLIB_CFLAGS $GTHREAD_CFLAGS"

        GLIB_LIBS="$GLIB_LIBS $GTHREAD_LIBS"



        AC_SUBST(GLIB_CFLAGS)

        AC_SUBST(GLIB_LIBS)

fi



AC_CONFIG_FILES([ \

        Makefile

        ])