build: fix make distcheck with the local glib copy

Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
This commit is contained in:
Diego Elio Pettenò 2012-04-09 11:57:09 -07:00 committed by Neil Horman
parent 8c5325459a
commit 29b049f1f9
2 changed files with 5 additions and 3 deletions

View file

@ -41,4 +41,6 @@ clean-generic:
rm -rf autom4te*.cache
rm -f *.rej *.orig *~
SUBDIRS = $(GLIB_SUBDIR)
if LOCAL_GLIB
SUBDIRS = glib-local
endif

View file

@ -52,14 +52,14 @@ AS_IF(
[
GLIB_CFLAGS=-I./glib-local
GLIB_LIBS=glib-local/libglib.a
GLIB_SUBDIR=glib-local
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
AC_SUBST(GLIB_SUBDIR)
AC_MSG_WARN(Using locale implementation of GList functions)
]
)
AM_CONDITIONAL([LOCAL_GLIB], [test "x$local_glib2" = "xyes"])
LIBCAP_NG_PATH
AC_OUTPUT(Makefile glib-local/Makefile)