fdo-mirrors/pkg-config
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pkg-config/pkg-config.git synced 2025-12-24 20:20:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
pkg-config/glib-patches/no-pkg-config.patch

83 lines
2.2 KiB
Diff
Raw Normal View History

glib: Avoid pkg-config usage in bundled library The whole exercise of carrying an internal copy of glib to avoid the circular dependency is moot if it's still using pkg-config.
2012-04-09 20:04:58 -07:00
diff --git a/glib/configure.ac b/glib/configure.ac
glib: Update snapshot to 2.32.4 This gets us to the latest stable release for glib and probably a good stopping point for a while since the 2.32 series seems to be slowing down.
2012-08-22 05:49:02 -07:00
index 99de9f7..e582232 100644
glib: Avoid pkg-config usage in bundled library The whole exercise of carrying an internal copy of glib to avoid the circular dependency is moot if it's still using pkg-config.
2012-04-09 20:04:58 -07:00
--- a/glib/configure.ac
+++ b/glib/configure.ac
glib: Update snapshot to 2.32.2 A libelf pkg-config check creeped in, but it's only used in gio so we can remove the libelf check completely.
2012-05-01 16:25:41 -07:00
@@ -294,8 +294,6 @@ AC_PROG_INSTALL
glib: Avoid pkg-config usage in bundled library The whole exercise of carrying an internal copy of glib to avoid the circular dependency is moot if it's still using pkg-config.
2012-04-09 20:04:58 -07:00
AC_SYS_LARGEFILE
-PKG_PROG_PKG_CONFIG(0.16)
-
if test "x$enable_debug" = "xyes"; then
if test x$cflags_set != xset ; then
case " $CFLAGS " in
glib: Update snapshot to 2.32.2 A libelf pkg-config check creeped in, but it's only used in gio so we can remove the libelf check completely.
2012-05-01 16:25:41 -07:00
@@ -454,23 +452,6 @@ AC_MSG_RESULT($enable_iconv_cache)
glib: Avoid pkg-config usage in bundled library The whole exercise of carrying an internal copy of glib to avoid the circular dependency is moot if it's still using pkg-config.
2012-04-09 20:04:58 -07:00
dnl
-dnl zlib support
-dnl
-PKG_CHECK_MODULES([ZLIB], [zlib], [found_zlib=yes], [found_zlib=no])
-if test "x$found_zlib" = "xno" ; then
- AC_CHECK_LIB(z, inflate, [AC_CHECK_HEADER(zlib.h, found_zlib=yes)])
- if test "x$found_zlib" = "xno" ; then
- AC_MSG_ERROR([*** Working zlib library and headers not found ***])
- fi
- ZLIB_LIBS='-lz'
- AC_SUBST(ZLIB_LIBS)
-fi
-
-PKG_CHECK_MODULES(LIBFFI, [libffi >= 3.0.0])
-AC_SUBST(LIBFFI_CFLAGS)
-AC_SUBST(LIBFFI_LIBS)
-
-dnl
dnl gettext support
dnl
glib: Update snapshot to 2.32.4 This gets us to the latest stable release for glib and probably a good stopping point for a while since the 2.32 series seems to be slowing down.
2012-08-22 05:49:02 -07:00
@@ -1779,30 +1760,6 @@ dnl failure. try libattr
glib: Update snapshot to 2.32.2 A libelf pkg-config check creeped in, but it's only used in gio so we can remove the libelf check completely.
2012-05-01 16:25:41 -07:00
fi
AC_SUBST(XATTR_LIBS)
-dnl ************************
-dnl *** check for libelf ***
-dnl ************************
-
glib: Update snapshot to 2.32.4 This gets us to the latest stable release for glib and probably a good stopping point for a while since the 2.32 series seems to be slowing down.
2012-08-22 05:49:02 -07:00
-PKG_CHECK_MODULES([LIBELF], [libelf >= 0.8.12], [have_libelf=yes], [have_libelf=maybe])
glib: Update snapshot to 2.32.2 A libelf pkg-config check creeped in, but it's only used in gio so we can remove the libelf check completely.
2012-05-01 16:25:41 -07:00
-
-if test $have_libelf = maybe; then
glib: Update snapshot to 2.32.3 There doesn't appear to be any changes in the code pkg-config uses. Just keeping in sync.
2012-06-04 09:00:07 -07:00
- glib_save_LIBS=$LIBS
glib: Update snapshot to 2.32.2 A libelf pkg-config check creeped in, but it's only used in gio so we can remove the libelf check completely.
2012-05-01 16:25:41 -07:00
- AC_CHECK_LIB([elf], [elf_begin], , [have_libelf=no])
- AC_CHECK_LIB([elf], [elf_getshdrstrndx], , [have_libelf=no])
- AC_CHECK_LIB([elf], [elf_getshdrnum], , [have_libelf=no])
- AC_CHECK_HEADER([libelf.h], , [have_libelf=no])
glib: Update snapshot to 2.32.3 There doesn't appear to be any changes in the code pkg-config uses. Just keeping in sync.
2012-06-04 09:00:07 -07:00
- LIBS=$glib_save_LIBS
glib: Update snapshot to 2.32.2 A libelf pkg-config check creeped in, but it's only used in gio so we can remove the libelf check completely.
2012-05-01 16:25:41 -07:00
-
- if test $have_libelf != no; then
- LIBELF_LIBS=-lelf
glib: Update snapshot to 2.32.3 There doesn't appear to be any changes in the code pkg-config uses. Just keeping in sync.
2012-06-04 09:00:07 -07:00
- have_libelf=yes
glib: Update snapshot to 2.32.2 A libelf pkg-config check creeped in, but it's only used in gio so we can remove the libelf check completely.
2012-05-01 16:25:41 -07:00
- fi
-fi
-
-if test $have_libelf = yes; then
- AC_DEFINE(HAVE_LIBELF, 1, [Define if libelf is available])
-fi
-
dnl ****************************************
dnl *** platform dependent source checks ***
dnl ****************************************
glib: Update snapshot to 2.32.4 This gets us to the latest stable release for glib and probably a good stopping point for a while since the 2.32 series seems to be slowing down.
2012-08-22 05:49:02 -07:00
@@ -3280,12 +3237,7 @@ AC_CHECK_ALIGNOF([unsigned long])
glib: Avoid pkg-config usage in bundled library The whole exercise of carrying an internal copy of glib to avoid the circular dependency is moot if it's still using pkg-config.
2012-04-09 20:04:58 -07:00
# Check for libdbus1 - Optional - is only used in the GDBus test cases
#
# 1.2.14 required for dbus_message_set_serial
-PKG_CHECK_MODULES(DBUS1,
- dbus-1 >= 1.2.14,
- [AC_DEFINE(HAVE_DBUS1, 1, [Define if dbus-1 is available]) have_dbus1=yes],
- have_dbus1=no)
-AC_SUBST(DBUS1_CFLAGS)
-AC_SUBST(DBUS1_LIBS)
+have_dbus1=no
AM_CONDITIONAL(HAVE_DBUS1, [test "x$have_dbus1" = "xyes"])
dnl
Reference in a new issue Copy permalink