Enlightenment CVS committal

Author  : vapier
Project : e16
Module  : e16keyedit

Dir     : e16/e16keyedit


Modified Files:
        configure.in 


Log Message:
cleanup script

===================================================================
RCS file: /cvs/e/e16/e16keyedit/configure.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- configure.in        28 Mar 2006 17:28:44 -0000      1.6
+++ configure.in        31 Mar 2006 03:17:50 -0000      1.7
@@ -12,22 +12,22 @@
 
 dnl Checks for libraries.
 AC_ARG_ENABLE(gtk2,
-        [  --enable-gtk2=[no/yes]        enables the gtk2 GUI (default=yes)],,
-                 enable_gtk2=yes)
-                
-if [ ! test "x$enable_gtk2" != "xyes"]; then
-    pkg_modules="gtk+-2.0 >= 2.0.0"
-    PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
-    CFLAGS="$CFLAGS $PACKAGE_CFLAGS"
-    LIBS="$LIBS $PACKAGE_LIBS"
-    AC_DEFINE(ENABLE_GTK2, , [Define to enable gtk2 support])
-else        
-  if !(gtk-config --version >/dev/null 2>&1); then
-     AC_MSG_ERROR([Gtk+ is required.])
-  else
-      CFLAGS="$CFLAGS `gtk-config --cflags`"
-      LIBS="$LIBS `gtk-config --libs`"
-  fi
+       [AC_HELP_STRING([--enable-gtk2],[enable gtk2 GUI (instead of GTK1) 
[default=yes]])],,
+       [enable_gtk2=yes])
+
+if test "x$enable_gtk2" = "xyes" ; then
+       pkg_modules="gtk+-2.0 >= 2.0.0"
+       PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+       CFLAGS="$CFLAGS $PACKAGE_CFLAGS"
+       LIBS="$LIBS $PACKAGE_LIBS"
+       AC_DEFINE(ENABLE_GTK2, , [Define to enable gtk2 support])
+else
+       if ! gtk-config --version &> /dev/null ; then
+               AC_MSG_ERROR([Gtk+ is required.])
+       else
+               CFLAGS="$CFLAGS `gtk-config --cflags`"
+               LIBS="$LIBS `gtk-config --libs`"
+       fi
 fi
 
 AC_SUBST(ENABLE_GTK2)




-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to