:: commit e287c9d1d08ac5ee05ce3a2520565683c88f3257

mintsuki <mintsuki@protonmail.com> — 2024-11-27 22:25

parents: 7aea0eeea1

build: Remove pkgconf stuff from build system as we do not need it

diff --git a/GNUmakefile.in b/GNUmakefile.in
index e97e03e4..94831f59 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -67,15 +67,12 @@ AWK := @AWK@
 export AWK
 
 CPPFLAGS := @CPPFLAGS@
-override CPPFLAGS := @PKGCONF_CPPFLAGS@ $(CPPFLAGS)
 export CPPFLAGS
 CFLAGS := @CFLAGS@
-override CFLAGS += @PKGCONF_CFLAGS@
 export CFLAGS
 LDFLAGS := @LDFLAGS@
 export LDFLAGS
 LIBS := @LIBS@
-override LIBS += @PKGCONF_LIBS@
 export LIBS
 
 override WERROR_FLAG := @WERROR_FLAG@
diff --git a/configure.ac b/configure.ac
index da553ce2..017e7901 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,40 +82,9 @@ fi
 
 AC_SUBST([STRIP])
 
-PKGCONF_LIBS_LIST=""
-
-PKG_PROG_PKG_CONFIG
-PROG_ABSPATH([PKG_CONFIG])
-
-for lib in $PKGCONF_LIBS_LIST; do
-    set -e
-    $PKG_CONFIG --exists --print-errors "$lib"
-    set +e
-done
-
-PKGCONF_CFLAGS="$($PKG_CONFIG --cflags-only-other $PKGCONF_LIBS_LIST 2>/dev/null)"
-PKGCONF_CPPFLAGS="$($PKG_CONFIG --cflags-only-I $PKGCONF_LIBS_LIST 2>/dev/null)"
-PKGCONF_LIBS="$($PKG_CONFIG --libs $PKGCONF_LIBS_LIST 2>/dev/null)"
-
-AC_SUBST([PKGCONF_CFLAGS])
-AC_SUBST([PKGCONF_CPPFLAGS])
-AC_SUBST([PKGCONF_LIBS])
-
-OLD_CFLAGS="$CFLAGS"
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LIBS="$LIBS"
-
-CFLAGS="$CFLAGS $PKGCONF_CFLAGS"
-CPPFLAGS="$PKGCONF_CPPFLAGS $CPPFLAGS"
-LIBS="$LIBS $PKGCONF_LIBS"
-
 AC_CHECK_HEADERS([stdint.h stddef.h stdbool.h limits.h inttypes.h stdio.h stdlib.h string.h],
     [], [AC_MSG_ERROR([required header not found])])
 
-CFLAGS="$OLD_CFLAGS"
-CPPFLAGS="$OLD_CPPFLAGS"
-LIBS="$OLD_LIBS"
-
 AC_ARG_VAR([TOOLCHAIN_FOR_TARGET], [alternative toolchain prefix for Limine (or 'llvm', or 'gnu')])
 AC_ARG_VAR([AR_FOR_TARGET], [archiver command for Limine])
 AC_ARG_VAR([CC_FOR_TARGET], [C compiler command for Limine])
tab: 248 wrap: offon