diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-05-06 16:07:03 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-05-06 16:07:03 +0000 |
| commit | 83fbec4d46e4bfa9e26733b74e92cfca90e62604 (patch) | |
| tree | bb985272a482d3680d4ea249cf1dc762c5678ccb /m4macros | |
| parent | a7b7ff8413192ed149afbd57d0e4430d33e76dd0 (diff) | |
[ merged from stable ]
Mon May 6 11:48:08 2002 Owen Taylor <otaylor@redhat.com>
[ merged from stable ]
* Makefile.am (EXTRA_DIST): Add ChangeLog.pre-2-0 (#78641)
* m4macros/glib-2.0.m4: save CFLAGS/LIBS properly when
compiling "what went wrong" test case. (#79330)
* m4macros/glib-2.0.m4: Remove reference to editing
pkg-config script. (From Jim Gettys)
* configure.in: (Look for dyld interfaces before dlopen()
since OS X can have both. Patch from Jacob Berkman,
#80438)
Diffstat (limited to 'm4macros')
| -rw-r--r-- | m4macros/glib-2.0.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/m4macros/glib-2.0.m4 b/m4macros/glib-2.0.m4 index 0c1ae8560..28ccef4a5 100644 --- a/m4macros/glib-2.0.m4 +++ b/m4macros/glib-2.0.m4 @@ -173,6 +173,8 @@ main () : else echo "*** Could not run GLIB test program, checking why..." + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" AC_TRY_LINK([ @@ -189,9 +191,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 GLIB was incorrectly installed" - echo "*** or that you have moved GLIB 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 GLIB is incorrectly installed."]) CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi |