Skip to content
Snippets Groups Projects
Commit 06118c90 authored by Henrik (Grubba) Grubbström's avatar Henrik (Grubba) Grubbström
Browse files

Configure [GTK2]: Use PIKE_PROG_PKG_CONFIG.

parent 8bbf2412
No related branches found
No related tags found
No related merge requests found
......@@ -27,7 +27,7 @@ AC_CHECK_HEADERS( signal.h netinet/in.h arpa/inet.h sys/types.h sys/stat.h fcntl
AC_CHECK_FUNCS( gethrtime sigaction )
AC_PATH_PROG(PKG_CONFIG,${ac_tool_prefix}pkg-config,no)
PIKE_PROG_PKG_CONFIG
AC_SUBST(pgtk2_have_x11)
pgtk2_have_x11=nox11
......@@ -95,7 +95,7 @@ AC_DEFUN([AC_CHECK_PKG],
[
AC_MSG_CHECKING([for $1])
AC_CACHE_VAL([pgtk2_cv_pkg_]translit([$1], [-+.], [___]), [
if ${ac_tool_prefix}pkg-config $1 2>/dev/null; then
if [$]PKG_CONFIG $1 2>/dev/null; then
[pgtk2_cv_pkg_]translit([$1], [-+.], [___])=yes
else
[pgtk2_cv_pkg_]translit([$1], [-+.], [___])=no
......@@ -113,8 +113,8 @@ AC_DEFUN([AC_CHECK_PKG],
# /grubba 2005-10-05
OLD_CFLAGS="$CFLAGS"
OLD_LIBS="$LIBS"
LIBS="`${ac_tool_prefix}pkg-config --libs $gtk_final_libs $1 | sed -e 's/\(.*\)/ \1 /' | sed -e 's/ -mt / /g'` $LIBS"
CFLAGS="`${ac_tool_prefix}pkg-config --cflags $gtk_final_libs $1 | sed -e 's/\(.*\)/ \1 /' | sed -e 's/ -mt / /g'` $CFLAGS"
LIBS="`[$]PKG_CONFIG --libs $gtk_final_libs $1 | sed -e 's/\(.*\)/ \1 /' | sed -e 's/ -mt / /g'` $LIBS"
CFLAGS="`[$]PKG_CONFIG --cflags $gtk_final_libs $1 | sed -e 's/\(.*\)/ \1 /' | sed -e 's/ -mt / /g'` $CFLAGS"
# Header check necessary for PIKE_FUNCS_NEED_DECLS.
ifelse([$2],,,[AC_CHECK_HEADERS($2)])
......@@ -139,7 +139,7 @@ dnl package
AC_DEFUN(PGTK_CHECK_VERSION, [
AC_MSG_CHECKING(for $1 version)
AC_CACHE_VAL([pgtk2_cv_ver_]translit([$1], [-+.], [___]), [
[pgtk2_cv_ver_]translit([$1], [-+.], [___])=`${ac_tool_prefix}pkg-config --modversion $1 2>/dev/null`
[pgtk2_cv_ver_]translit([$1], [-+.], [___])=`[$]PKG_CONFIG --modversion $1 2>/dev/null`
])
AC_MSG_RESULT($[pgtk2_cv_ver_]translit([$1], [-+.], [___]))
])
......@@ -366,8 +366,8 @@ else
# The manual for cc says that -mt is -D_REENTRANT plus -lthread;
# both of which should already be present.
# /grubba 2005-10-05
GTK_CFLAGS="`${ac_tool_prefix}pkg-config --cflags ${gtk_final_libs} | sed -e 's/\(.*\)/ \1 /' | sed -e 's/ -mt / /g'`"
GTK_LIBS="`${ac_tool_prefix}pkg-config --libs ${gtk_final_libs} | sed -e 's/\(.*\)/ \1 /' | sed -e 's/ -mt / /g'`"
GTK_CFLAGS="`[$]PKG_CONFIG --cflags ${gtk_final_libs} | sed -e 's/\(.*\)/ \1 /' | sed -e 's/ -mt / /g'`"
GTK_LIBS="`[$]PKG_CONFIG --libs ${gtk_final_libs} | sed -e 's/\(.*\)/ \1 /' | sed -e 's/ -mt / /g'`"
AC_DEFINE(PGTK_AUTO_UTF8)
fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment