diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-12-17 03:25:21 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-12-17 03:25:21 +0000 |
| commit | 0216952a5c77ffe79d4f198d5e190f4c05a0cba6 (patch) | |
| tree | 9a8bae49fc8a6fbd13941f820633793faa3c173c | |
| parent | 24899adb05d1f366e2df6780854627b145f59307 (diff) | |
| download | gtk+-0216952a5c77ffe79d4f198d5e190f4c05a0cba6.tar.gz | |
Don't use AC_CHECK_LIB() when checking for FreeType, Pango, Atk since that
Mon Dec 16 22:12:01 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Don't use AC_CHECK_LIB() when
checking for FreeType, Pango, Atk since that get
the ordering wrong. Instead, set LIBS ourself
and call AC_TRY_LINK_FUNC(). (#98406)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 7 | ||||
| -rw-r--r-- | configure.in | 20 |
7 files changed, 56 insertions, 6 deletions
@@ -1,3 +1,10 @@ +Mon Dec 16 22:12:01 2002 Owen Taylor <otaylor@redhat.com> + + * configure.in: Don't use AC_CHECK_LIB() when + checking for FreeType, Pango, Atk since that get + the ordering wrong. Instead, set LIBS ourself + and call AC_TRY_LINK_FUNC(). (#98406) + Mon Dec 16 21:39:28 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkentry.c (gtk_entry_enter_text): Call diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 680e0de304..ae6026b607 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Mon Dec 16 22:12:01 2002 Owen Taylor <otaylor@redhat.com> + + * configure.in: Don't use AC_CHECK_LIB() when + checking for FreeType, Pango, Atk since that get + the ordering wrong. Instead, set LIBS ourself + and call AC_TRY_LINK_FUNC(). (#98406) + Mon Dec 16 21:39:28 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkentry.c (gtk_entry_enter_text): Call diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 680e0de304..ae6026b607 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Mon Dec 16 22:12:01 2002 Owen Taylor <otaylor@redhat.com> + + * configure.in: Don't use AC_CHECK_LIB() when + checking for FreeType, Pango, Atk since that get + the ordering wrong. Instead, set LIBS ourself + and call AC_TRY_LINK_FUNC(). (#98406) + Mon Dec 16 21:39:28 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkentry.c (gtk_entry_enter_text): Call diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 680e0de304..ae6026b607 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Mon Dec 16 22:12:01 2002 Owen Taylor <otaylor@redhat.com> + + * configure.in: Don't use AC_CHECK_LIB() when + checking for FreeType, Pango, Atk since that get + the ordering wrong. Instead, set LIBS ourself + and call AC_TRY_LINK_FUNC(). (#98406) + Mon Dec 16 21:39:28 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkentry.c (gtk_entry_enter_text): Call diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 680e0de304..ae6026b607 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Mon Dec 16 22:12:01 2002 Owen Taylor <otaylor@redhat.com> + + * configure.in: Don't use AC_CHECK_LIB() when + checking for FreeType, Pango, Atk since that get + the ordering wrong. Instead, set LIBS ourself + and call AC_TRY_LINK_FUNC(). (#98406) + Mon Dec 16 21:39:28 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkentry.c (gtk_entry_enter_text): Call diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 680e0de304..ae6026b607 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Mon Dec 16 22:12:01 2002 Owen Taylor <otaylor@redhat.com> + + * configure.in: Don't use AC_CHECK_LIB() when + checking for FreeType, Pango, Atk since that get + the ordering wrong. Instead, set LIBS ourself + and call AC_TRY_LINK_FUNC(). (#98406) + Mon Dec 16 21:39:28 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkentry.c (gtk_entry_enter_text): Call diff --git a/configure.in b/configure.in index 98abc61031..d9761eb8de 100644 --- a/configure.in +++ b/configure.in @@ -945,8 +945,10 @@ if test "x$gdktarget" = "xlinux-fb" || test "x$gdktarget" = "xx11" ; then FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags` FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` - AC_CHECK_LIB(freetype, FT_New_Face, have_freetype=true - ,:,$FREETYPE_LIBS) + gtk_save_LIBS="$LIBS" + LIBS="$FREETYPE_LIBS $LIBS" + AC_TRY_LINK_FUNC(FT_New_Face, have_freetype=true,:) + LIBS="$gtk_save_LIBS" if $have_freetype ; then gtk_save_cppflags="$CPPFLAGS" @@ -1352,9 +1354,12 @@ CFLAGS="$CFLAGS $PANGO_CFLAGS" if $PKG_CONFIG --uninstalled $PANGO_PACKAGES; then : else - AC_CHECK_LIB(pango-1.0, pango_context_new, :, AC_MSG_ERROR([ + gtk_save_LIBS="$LIBS" + LIBS="$PANGO_LIBS $LIBS" + AC_TRY_LINK_FUNC(pango_context_new, :, AC_MSG_ERROR([ *** Can't link to Pango. Pango is required to build -*** GTK+. For more information see http://www.pango.org]), $PANGO_LIBS) +*** GTK+. For more information see http://www.pango.org])) + LIBS="$gtk_save_LIBS" fi CFLAGS="$saved_cflags" @@ -1400,9 +1405,12 @@ fi if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then : else - AC_CHECK_LIB(atk-1.0, atk_object_get_type, : , AC_MSG_ERROR([ + gtk_save_LIBS="$LIBS" + LIBS="$ATK_LIBS $LIBS" + AC_TRY_LINK_FUNC(atk_object_get_type, : , AC_MSG_ERROR([ *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required - *** to build GTK+]), $ATK_LIBS $GLIB_LIBS) + *** to build GTK+])) + LIBS="$gtk_save_LIBS" fi GTK_PACKAGES=atk |