mirror of
git://slackware.nl/current.git
synced 2024-12-26 09:58:59 +01:00
646a5c1cbf
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
52 lines
1.7 KiB
Diff
52 lines
1.7 KiB
Diff
diff -up gtk+-1.2.10/gtk-config.in.multilib gtk+-1.2.10/gtk-config.in
|
|
--- gtk+-1.2.10/gtk-config.in.multilib 2000-10-21 20:20:40.000000000 +0200
|
|
+++ gtk+-1.2.10/gtk-config.in 2008-10-02 09:52:59.000000000 +0200
|
|
@@ -1,12 +1,16 @@
|
|
#!/bin/sh
|
|
|
|
-glib_libs="@glib_libs@"
|
|
-glib_cflags="@glib_cflags@"
|
|
-glib_thread_libs="@glib_thread_libs@"
|
|
-glib_thread_cflags="@glib_thread_cflags@"
|
|
+[ -z "$PKG_CONFIG" ] && PKG_CONFIG="pkg-config"
|
|
|
|
-prefix=@prefix@
|
|
-exec_prefix=@exec_prefix@
|
|
+glib_libs=`${PKG_CONFIG} --libs glib gmodule`
|
|
+glib_cflags=`${PKG_CONFIG} --cflags glib gmodule`
|
|
+glib_thread_libs=`${PKG_CONFIG} --libs gthread`
|
|
+glib_thread_cflags=`${PKG_CONFIG} --cflags gthread`
|
|
+
|
|
+prefix=`${PKG_CONFIG} --variable prefix gtk+`
|
|
+exec_prefix=`${PKG_CONFIG} --variable exec_prefix gtk+`
|
|
+libdir=`${PKG_CONFIG} --variable libdir gtk+`
|
|
+includedir=`${PKG_CONFIG} --variable includedir gtk+`
|
|
exec_prefix_set=no
|
|
|
|
usage()
|
|
@@ -91,14 +95,14 @@ if test "$lib_gthread" = "yes"; then
|
|
fi
|
|
|
|
if test "$echo_cflags" = "yes"; then
|
|
- echo -I@includedir@/gtk-1.2 $glib_cflags @x_cflags@
|
|
+ echo -I${includedir}/gtk-1.2 $glib_cflags @x_cflags@
|
|
fi
|
|
|
|
if test "$echo_libs" = "yes"; then
|
|
my_glib_libs=
|
|
- libdirs=-L@libdir@
|
|
+ libdirs=-L${libdir}
|
|
for i in $glib_libs ; do
|
|
- if test $i != -L@libdir@ ; then
|
|
+ if test $i != -L${libdir} ; then
|
|
if test -z "$my_glib_libs" ; then
|
|
my_glib_libs="$i"
|
|
else
|
|
@@ -107,6 +111,6 @@ if test "$echo_libs" = "yes"; then
|
|
fi
|
|
done
|
|
|
|
- echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm
|
|
+ echo $libdirs -lgtk -lgdk $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm
|
|
fi
|
|
|