From cfaffdc570efaed19665a44967078242e5c1965e Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Mon, 14 May 2012 15:59:11 -0700 Subject: [PATCH] glib: Remove check for FAM only needed in GIO One less thing for people to worry about with bundled glib. --- glib-patches/glib-only.patch | 46 ++++++++++++++++++++++++++++++++---- glib/configure.ac | 31 ------------------------ 2 files changed, 42 insertions(+), 35 deletions(-) diff --git a/glib-patches/glib-only.patch b/glib-patches/glib-only.patch index 7adbc09..ca7481e 100644 --- a/glib-patches/glib-only.patch +++ b/glib-patches/glib-only.patch @@ -113,10 +113,10 @@ index f5c510d..95c71de 100644 files: @files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \ diff --git a/glib/configure.ac b/glib/configure.ac -index 48868d2..ca862c5 100644 +index 2175867..542fe7f 100644 --- a/glib/configure.ac +++ b/glib/configure.ac -@@ -457,19 +457,6 @@ dnl +@@ -474,19 +474,6 @@ dnl dnl gettext support dnl @@ -136,7 +136,45 @@ index 48868d2..ca862c5 100644 GETTEXT_PACKAGE=glib20 AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], -@@ -2555,35 +2542,6 @@ if test $cross_compiling = yes; then +@@ -1724,37 +1711,6 @@ int main() { return 0; } ]])], + + AM_CONDITIONAL(HAVE_FEN, [test "$fen_support" = "yes"]) + +-dnl **************************** +-dnl *** Checks for FAM (GIO) *** +-dnl **************************** +- +-should_disable_fam=no +- +-AC_ARG_ENABLE(fam, +- AC_HELP_STRING([--disable-fam], +- [don't use fam for file system monitoring]), +- [ +- if test "x$enable_fam" = "xno"; then +- should_disable_fam=yes +- fi +- ] +- ) +-fam_support=no +-FAM_LIBS= +-if test "x$should_disable_fam" = "xno"; then +-AC_CHECK_LIB(fam, FAMOpen, +- [AC_CHECK_HEADERS(fam.h, +- [AC_DEFINE(HAVE_FAM, [], [Define if we have FAM]) +- AC_CHECK_LIB(fam, FAMNoExists, +- AC_DEFINE(HAVE_FAM_NO_EXISTS, [], [Define if we have FAMNoExists in fam])) +- FAM_LIBS="-lfam"] +- fam_support=yes, +- AC_MSG_WARN(*** FAM support will not be built (header files not found) ***))], +- AC_MSG_WARN(*** FAM support will not be built (FAM library not found) ***)) +-AC_SUBST(FAM_LIBS) +-fi +-AM_CONDITIONAL(HAVE_FAM, [test "$fam_support" = "yes"]) +- + + dnl ***************************** + dnl *** Check for xattr (GIO) *** +@@ -2583,35 +2539,6 @@ if test $cross_compiling = yes; then fi fi @@ -172,7 +210,7 @@ index 48868d2..ca862c5 100644 dnl dnl Tracing dnl -@@ -3484,87 +3442,22 @@ AC_SUBST(gio_INCLUDES) +@@ -3527,87 +3454,22 @@ AC_SUBST(gio_INCLUDES) AC_CONFIG_FILES([ diff --git a/glib/configure.ac b/glib/configure.ac index da67a56..3f3df15 100644 --- a/glib/configure.ac +++ b/glib/configure.ac @@ -1692,37 +1692,6 @@ int main() { return 0; } ]])], AM_CONDITIONAL(HAVE_FEN, [test "$fen_support" = "yes"]) -dnl **************************** -dnl *** Checks for FAM (GIO) *** -dnl **************************** - -should_disable_fam=no - -AC_ARG_ENABLE(fam, - AC_HELP_STRING([--disable-fam], - [don't use fam for file system monitoring]), - [ - if test "x$enable_fam" = "xno"; then - should_disable_fam=yes - fi - ] - ) -fam_support=no -FAM_LIBS= -if test "x$should_disable_fam" = "xno"; then -AC_CHECK_LIB(fam, FAMOpen, - [AC_CHECK_HEADERS(fam.h, - [AC_DEFINE(HAVE_FAM, [], [Define if we have FAM]) - AC_CHECK_LIB(fam, FAMNoExists, - AC_DEFINE(HAVE_FAM_NO_EXISTS, [], [Define if we have FAMNoExists in fam])) - FAM_LIBS="-lfam"] - fam_support=yes, - AC_MSG_WARN(*** FAM support will not be built (header files not found) ***))], - AC_MSG_WARN(*** FAM support will not be built (FAM library not found) ***)) -AC_SUBST(FAM_LIBS) -fi -AM_CONDITIONAL(HAVE_FAM, [test "$fam_support" = "yes"]) - dnl ***************************** dnl *** Check for xattr (GIO) ***