diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 37 |
2 files changed, 6 insertions, 36 deletions
@@ -1,3 +1,8 @@ +2006-04-17 Lucas Rocha <lucasr@gnome.org> + + * configure.in: remove X libs checks because zenity + doesn't use X includes directly (Fixes bug #338102). + 2006-04-16 Lucas Rocha <lucasr@gnome.org> * src/tree.c (zenity_tree_extract_column_indexes): diff --git a/configure.in b/configure.in index c71bd1c3..97337aa0 100644 --- a/configure.in +++ b/configure.in @@ -26,40 +26,6 @@ if test x$SCROLLKEEPER_CONFIG = xno; then AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package) fi -dnl *********************************************** -dnl X development libraries check -dnl *********************************************** - -# -# If Pango included the shared library dependencies from X11 in -# the pkg-config output, then we use that (to avoid duplicates). -# but if they were omitted to avoid binary compatibility problems -# then we need to repeat the checks. -# -if $PKG_CONFIG --exists pangoxft ; then - PANGO_PACKAGES="pangox pangoxft" -else - PANGO_PACKAGES="pangox" -fi - -x_libs="`$PKG_CONFIG --libs $PANGO_PACKAGES`" -case x_libs in - *-lX11*) pango_omitted_x_deps=no ;; - *) pango_omitted_x_deps=yes ;; -esac - -if test $pango_omitted_x_deps = yes ; then - AC_PATH_XTRA - - if test x$no_x = xyes ; then - AC_MSG_ERROR([X development libraries not found]) - else - X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" - fi -fi - -AC_SUBST(X_LIBS) - dnl ******************************* dnl perl check dnl ******************************* @@ -84,8 +50,7 @@ dnl ******************************* dnl Internationalization dnl ******************************* -ALL_LINGUAS="am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id is it ja kn ko ku lt mi mk ml mn ms nb ne nl nn no or pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv ta th tr ug uk vi xh zh_CN zh_TW" -GETTEXT_PACKAGE=zenity-0.1 +GETTEXT_PACKAGE=zenity AC_SUBST(GETTEXT_PACKAGE) AM_GLIB_GNU_GETTEXT |