[vlc-commits] Cleanup GTK+ checks in configure.ac

[Cheng Sun]

npapi-vlc | branch: master | Cheng Sun <chengsun9 at gmail.com> | Wed Dec 28 12:09:34 2011 +0000| [ebc0e0196868c74b706ac82fe3fde49bf39a4394] | committer: Jean-Baptiste Kempf

Cleanup GTK+ checks in configure.ac

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=ebc0e0196868c74b706ac82fe3fde49bf39a4394
---

 configure.ac |   21 ++++++++-------------
 1 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index b682fab..c7a8753 100644
--- a/configure.ac
+++ b/configure.ac
@@ -245,20 +245,15 @@ gtk_found=no
 AS_IF([ test "${SYS}" != "mingw32" -a "${SYS}" != "darwin" ], [
   AS_IF([ test "x$with_gtk" != "xno" ],
     [
-       PKG_CHECK_MODULES(GTK, [gtk+-2.0],
-       [gtk_found=yes],
-       [
-         AC_MSG_WARN([GTK+ >=2 not found. Re-run configure with --without-gtk.])
-         PKG_CHECK_MODULES(XPM, [xpm],, [
-           AC_MSG_ERROR([Please install the libXpm development files, or re-run configure with --with-gtk])
-         ])
-       ])
-    ], [
-      PKG_CHECK_MODULES(XPM, [xpm],, [
-        AC_MSG_ERROR([Please install the libXpm development files, or re-run configure with --with-gtk])
-      ])
+       PKG_CHECK_MODULES(GTK, [gtk+-2.0], [gtk_found=yes])
     ])
 ])
+AS_IF([ test "x$gtk_found" == "xno" ],
+  [
+    PKG_CHECK_MODULES(XPM, [xpm],, [
+      AC_MSG_ERROR([Please install the libXpm development files, or re-run configure with --with-gtk])
+    ])
+  ])
 AM_CONDITIONAL(USE_GTK, [ test "x$gtk_found" = "xyes" ])
 
 
@@ -268,7 +263,7 @@ AM_COND_IF([HAVE_WIN32], [
   ACTIVEX_CPPFLAGS="${CPPFLAGS} -DUNICODE -D_UNICODE -D_MIDL_USE_GUIDDEF_"
   ACTIVEX_CXXFLAGS="${CXXFLAGS} -fno-exceptions"
 
-  AC_ARG_VAR([ACTIVEX_LIBS], [linker flags for Activex])
+  AC_ARG_VAR([ACTIVEX_LIBS], [linker flags for ActiveX])
   ACTIVEX_LIBS="${ACTIVEX_LIBS} -lole32 -loleaut32 -luuid -lshlwapi -lgdi32"
 ])