Commit 1493f6f7 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Don't try to use pkg-config when we didn't find it. (#62944, Eric Lemings)

Mon Oct 29 11:31:40 2001  Owen Taylor  <otaylor@redhat.com>

	* m4macros/gtk-2.0.m4: Don't try to use pkg-config
	when we didn't find it. (#62944, Eric Lemings)

	* m4macros/gtk-2.0.m4: Fix problem with spaces around =
	sign in assignment. (#63209, Arkadiusz Miskiewicz)
parent 62adef45
Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com>
* m4macros/gtk-2.0.m4: Don't try to use pkg-config
when we didn't find it. (#62944, Eric Lemings)
* m4macros/gtk-2.0.m4: Fix problem with spaces around =
sign in assignment. (#63209, Arkadiusz Miskiewicz)
2001-10-29 Anders Carlsson <andersca@gnu.org>
* gtk/gtktreeview.c (gtk_tree_view_size_request): Calculate
......@@ -90,7 +98,6 @@
file. Install import libraries.
2001-10-29 Anders Carlsson <andersca@gnu.org>
>>>>>>> 1.2482
* gtk/gtkiconfactory.c (get_default_icons): Fix build.
......@@ -143,6 +150,7 @@
* docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo
changes
>>>>>>> 1.2483
Sun Oct 28 09:15:39 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontext.h (struct _GtkIMContext): Fixed
......
Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com>
* m4macros/gtk-2.0.m4: Don't try to use pkg-config
when we didn't find it. (#62944, Eric Lemings)
* m4macros/gtk-2.0.m4: Fix problem with spaces around =
sign in assignment. (#63209, Arkadiusz Miskiewicz)
2001-10-29 Anders Carlsson <andersca@gnu.org>
* gtk/gtktreeview.c (gtk_tree_view_size_request): Calculate
......@@ -90,7 +98,6 @@
file. Install import libraries.
2001-10-29 Anders Carlsson <andersca@gnu.org>
>>>>>>> 1.2482
* gtk/gtkiconfactory.c (get_default_icons): Fix build.
......@@ -143,6 +150,7 @@
* docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo
changes
>>>>>>> 1.2483
Sun Oct 28 09:15:39 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontext.h (struct _GtkIMContext): Fixed
......
Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com>
* m4macros/gtk-2.0.m4: Don't try to use pkg-config
when we didn't find it. (#62944, Eric Lemings)
* m4macros/gtk-2.0.m4: Fix problem with spaces around =
sign in assignment. (#63209, Arkadiusz Miskiewicz)
2001-10-29 Anders Carlsson <andersca@gnu.org>
* gtk/gtktreeview.c (gtk_tree_view_size_request): Calculate
......@@ -90,7 +98,6 @@
file. Install import libraries.
2001-10-29 Anders Carlsson <andersca@gnu.org>
>>>>>>> 1.2482
* gtk/gtkiconfactory.c (get_default_icons): Fix build.
......@@ -143,6 +150,7 @@
* docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo
changes
>>>>>>> 1.2483
Sun Oct 28 09:15:39 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontext.h (struct _GtkIMContext): Fixed
......
Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com>
* m4macros/gtk-2.0.m4: Don't try to use pkg-config
when we didn't find it. (#62944, Eric Lemings)
* m4macros/gtk-2.0.m4: Fix problem with spaces around =
sign in assignment. (#63209, Arkadiusz Miskiewicz)
2001-10-29 Anders Carlsson <andersca@gnu.org>
* gtk/gtktreeview.c (gtk_tree_view_size_request): Calculate
......@@ -90,7 +98,6 @@
file. Install import libraries.
2001-10-29 Anders Carlsson <andersca@gnu.org>
>>>>>>> 1.2482
* gtk/gtkiconfactory.c (get_default_icons): Fix build.
......@@ -143,6 +150,7 @@
* docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo
changes
>>>>>>> 1.2483
Sun Oct 28 09:15:39 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontext.h (struct _GtkIMContext): Fixed
......
Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com>
* m4macros/gtk-2.0.m4: Don't try to use pkg-config
when we didn't find it. (#62944, Eric Lemings)
* m4macros/gtk-2.0.m4: Fix problem with spaces around =
sign in assignment. (#63209, Arkadiusz Miskiewicz)
2001-10-29 Anders Carlsson <andersca@gnu.org>
* gtk/gtktreeview.c (gtk_tree_view_size_request): Calculate
......@@ -90,7 +98,6 @@
file. Install import libraries.
2001-10-29 Anders Carlsson <andersca@gnu.org>
>>>>>>> 1.2482
* gtk/gtkiconfactory.c (get_default_icons): Fix build.
......@@ -143,6 +150,7 @@
* docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo
changes
>>>>>>> 1.2483
Sun Oct 28 09:15:39 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontext.h (struct _GtkIMContext): Fixed
......
Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com>
* m4macros/gtk-2.0.m4: Don't try to use pkg-config
when we didn't find it. (#62944, Eric Lemings)
* m4macros/gtk-2.0.m4: Fix problem with spaces around =
sign in assignment. (#63209, Arkadiusz Miskiewicz)
2001-10-29 Anders Carlsson <andersca@gnu.org>
* gtk/gtktreeview.c (gtk_tree_view_size_request): Calculate
......@@ -90,7 +98,6 @@
file. Install import libraries.
2001-10-29 Anders Carlsson <andersca@gnu.org>
>>>>>>> 1.2482
* gtk/gtkiconfactory.c (get_default_icons): Fix build.
......@@ -143,6 +150,7 @@
* docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo
changes
>>>>>>> 1.2483
Sun Oct 28 09:15:39 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontext.h (struct _GtkIMContext): Fixed
......
Mon Oct 29 11:31:40 2001 Owen Taylor <otaylor@redhat.com>
* m4macros/gtk-2.0.m4: Don't try to use pkg-config
when we didn't find it. (#62944, Eric Lemings)
* m4macros/gtk-2.0.m4: Fix problem with spaces around =
sign in assignment. (#63209, Arkadiusz Miskiewicz)
2001-10-29 Anders Carlsson <andersca@gnu.org>
* gtk/gtktreeview.c (gtk_tree_view_size_request): Calculate
......@@ -90,7 +98,6 @@
file. Install import libraries.
2001-10-29 Anders Carlsson <andersca@gnu.org>
>>>>>>> 1.2482
* gtk/gtkiconfactory.c (get_default_icons): Fix build.
......@@ -143,6 +150,7 @@
* docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo
changes
>>>>>>> 1.2483
Sun Oct 28 09:15:39 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontext.h (struct _GtkIMContext): Fixed
......
......@@ -34,22 +34,25 @@ AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run
no_gtk=yes
PKG_CONFIG=no
fi
fi
## don't try to run the test against uninstalled libtool libs
if $PKG_CONFIG --uninstalled $pkg_config_args; then
echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
enable_gtktest=no
else
no_gtk=yes
fi
min_gtk_version=ifelse([$1], ,1.3.3,$1)
AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
if test x$PKG_CONFIG != xno ; then
## don't try to run the test against uninstalled libtool libs
if $PKG_CONFIG --uninstalled $pkg_config_args; then
echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
enable_gtktest=no
fi
if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
:
else
no_gtk = yes
if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
:
else
no_gtk=yes
fi
fi
if test x"$no_gtk" = x ; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment