summaryrefslogtreecommitdiff
path: root/m4macros
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2002-05-06 18:01:39 +0000
committerOwen Taylor <otaylor@src.gnome.org>2002-05-06 18:01:39 +0000
commit9af9ab160867b693b3ec556cd5da010f19981d23 (patch)
tree5be77b3f9ce25f2e8a79eedab39072df44fbb193 /m4macros
parent189a6cc5dbd2d4f60bfe879a318797e0609a436e (diff)
downloadgtk+-9af9ab160867b693b3ec556cd5da010f19981d23.tar.gz
Fix versioning to avoid changing the soname!
Mon May 6 12:17:14 2002 Owen Taylor <otaylor@redhat.com> * configure.in: Fix versioning to avoid changing the soname! [ merge from stable ] * Makefile.am (EXTRA_DIST): Add ChangeLog.pre-2-0 (#78641) * m4macros/gtk-2.0.m4: save CFLAGS/LIBS properly when compiling "what went wrong" test case. (#79329) * m4macros/gtk-2.0.m4: Remove reference to editing pkg-config script. (From Jim Gettys)
Diffstat (limited to 'm4macros')
-rw-r--r--m4macros/gtk-2.0.m46
1 files changed, 3 insertions, 3 deletions
diff --git a/m4macros/gtk-2.0.m4 b/m4macros/gtk-2.0.m4
index 7eafb05047..a0c53ac11f 100644
--- a/m4macros/gtk-2.0.m4
+++ b/m4macros/gtk-2.0.m4
@@ -163,6 +163,8 @@ main ()
:
else
echo "*** Could not run GTK+ test program, checking why..."
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
AC_TRY_LINK([
@@ -179,9 +181,7 @@ main ()
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
[ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means GTK+ was incorrectly installed"
- echo "*** or that you have moved GTK+ since it was installed. In the latter case, you"
- echo "*** may want to edit the pkg-config script: $PKG_CONFIG" ])
+ echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi