fdo-mirrors/pkg-config
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pkg-config/pkg-config.git synced 2026-05-08 08:58:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

glib: Remove check for FAM only needed in GIO

Browse source 
One less thing for people to worry about with bundled glib.
This commit is contained in:
Dan Nicholson 2012-05-14 15:59:11 -07:00
parent ad561f6163
commit cfaffdc570
2 changed files with 42 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
glib-patches/glib-only.patch
View file

@ -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([

31
glib/configure.ac
View file

@ -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) ***