Enlightenment CVS committal

Author  : tilman
Project : e17
Module  : libs/ecore

Dir     : e17/libs/ecore


Modified Files:
        configure.in 


Log Message:
fix ecore_desktop check etc

===================================================================
RCS file: /cvs/e/e17/libs/ecore/configure.in,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -3 -r1.179 -r1.180
--- configure.in        23 Mar 2007 23:04:32 -0000      1.179
+++ configure.in        24 Mar 2007 08:38:33 -0000      1.180
@@ -892,39 +892,39 @@
 AC_SUBST(ecore_file_libs)
 
 have_ecore_desktop="no"
-want_ecore_desktop="no"
+ecore_desktop_cflags="";
+ecore_desktop_libs="";
 
-if test "x$have_ecore_file" = "xyes"; then
-  AC_MSG_CHECKING(whether ecore_desktop module is to be built)
-  want_ecore_desktop="yes";
-  ecore_desktop_cflags="";
-  ecore_desktop_libs="";
+AC_ARG_ENABLE(ecore-desktop,
+  AC_HELP_STRING(
+    [--enable-ecore-desktop],
+    [enable the ecore_desktop module. [[default=enabled]]]
+  ), [
+    want_ecore_desktop=$enableval
+  ], [
+    want_ecore_desktop=yes
+  ]
+)
 
-  AC_ARG_ENABLE(ecore-desktop,
-    [  --disable-ecore-desktop          disable the ecore_desktop module],
-    [
-      if test x"$enableval" = x"yes" ; then
-        AC_MSG_RESULT(yes)
-      else
-        AC_MSG_RESULT(no)
-        want_ecore_desktop="no"
-      fi
-    ], [
-      AC_MSG_RESULT(yes)
-    ]
-  )
+AC_MSG_CHECKING(whether ecore_desktop module is to be built)
 
-  if test "x$want_ecore_desktop" = "xyes"; then
-    AC_DEFINE(BUILD_ECORE_DESKTOP, 1, [Build Ecore_Desktop Module])
-    ecore_desktop_libs="-lecore_desktop";
-       requirements_ecore_desktop="$requirements_ecore_desktop ecore-file"
-  fi
-
-  AC_SUBST(ecore_desktop_cflags)
-  AC_SUBST(ecore_desktop_libs)
+if test $want_ecore_desktop != yes; then
+  AC_MSG_RESULT(no)
+elif test $have_ecore_file = yes; then
+  AC_MSG_RESULT(yes)
+  have_ecore_desktop=yes
 else
-  AC_MSG_RESULT(ecore_file not enabled so ecore_desktop will not be enabled)
+  AC_MSG_RESULT([no (ecore_file not enabled)])
+fi
+
+if test "x$want_ecore_desktop" = "xyes"; then
+  AC_DEFINE(BUILD_ECORE_DESKTOP, 1, [Build Ecore_Desktop Module])
+  ecore_desktop_libs="-lecore_desktop";
+  requirements_ecore_desktop="$requirements_ecore_desktop ecore-file"
 fi
+
+AC_SUBST(ecore_desktop_cflags)
+AC_SUBST(ecore_desktop_libs)
 
 AC_ARG_ENABLE(pthreads,
   [  --disable-pthreads            disable building with pthread support],



-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to