quick-lounge-applet r216 - trunk

[paobac svn gnome org]

Author: paobac
Date: Sun Jul 27 08:24:02 2008
New Revision: 216
URL: http://svn.gnome.org/viewvc/quick-lounge-applet?rev=216&view=rev

Log:
2008-07-27  Paolo Bacchilega  <paobac svn gnome org>

	* configure.in: removed pangox check, use AM_PROG_LIBTOOL instead of
	LT_PROG_LIBTOOL.
	
	Fixed bug #544888 â LT_PROG_LIBTOOL should be AM_PROG_LIBTOOL?
	Fixed bug #544850 â configure needs to handle the non-existence of pangox

Modified:
   trunk/ChangeLog
   trunk/configure.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Jul 27 08:24:02 2008
@@ -1,13 +1,13 @@
 AC_PREREQ(2.52)
 
-AC_INIT([quick-lounge-applet],[2.12.6],[http://bugzilla.gnome.org/enter_bug.cgi?product=quick-lounge-applet])
+AC_INIT([quick-lounge-applet],[2.12.7],[http://bugzilla.gnome.org/enter_bug.cgi?product=quick-lounge-applet])
 
 AC_CONFIG_SRCDIR(src/quick-lounge.c)
 
 AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2])
 AC_CONFIG_HEADERS([config.h])
 
-LT_PROG_LIBTOOL
+AM_PROG_LIBTOOL
 
 dnl ==========================================================================
 dnl
@@ -53,37 +53,6 @@
 AC_SUBST(QL_CFLAGS)
 AC_SUBST(QL_LIBS)
 
-#
-# 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_CHECK_LIB(Xau, XauFileName, [X_LIBS="$X_LIBS -lXau"])
-
-AC_SUBST(X_LIBS)
 
 dnl ******************************