Add the autofoo to enable OS X battery support.

SVN revision: 16232

diff --git a/configure.in b/configure.in
index a7bdd22..f40d61d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -124,6 +124,23 @@ AC_CHECK_HEADER(X11/X.h,
 AC_SUBST(x_cflags)
 AC_SUBST(x_libs)
 
+cf_cflags=""
+cf_libs=""
+PCPPFLAGS="${CPPFLAGS}"
+CPPFLAGS="${CPPFLAGS} -I /System/Library/Frameworks/CoreFoundation.framework/Headers"
+AC_CHECK_HEADERS(CFBase.h,
+  [
+    cf_cflags="-I /System/Library/Frameworks/CoreFoundation.framework/Headers"
+    cf_cflags="${cf_cflags} -I /System/Library/Frameworks/IOKit.framework/Headers"
+    cf_libs="-framework 'CoreFoundation' -framework 'IOKit'"
+  ],[
+    AC_MSG_ERROR([Cannot find CoreFoundation headers and libraries.])
+  ]
+)
+CPPFLAGS="${PCPPFLAGS}"
+AC_SUBST(cf_cflags)
+AC_SUBST(cf_libs)
+
 ALL_LINGUAS="bg de es fi fr ja pl pt ru zh_CN hu sl it cs da sk"
 AC_SUBST(ALL_LINGUAS)
 

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 4cc986e..6bc76aa 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -5,6 +5,7 @@ INCLUDES = -I$(includedir) \
           -I$(top_srcdir)/src/lib \
           @e_cflags@ \
           @x_cflags@ \
+          @cf_cflags@ \
           @EDJE_DEF@
 
 bin_PROGRAMS = enlightenment enlightenment_remote enlightenment_eapp
@@ -128,7 +129,7 @@ e_pan.c \
 e_dialog.c \
 $(ENLIGHTENMENTHEADERS)
 
-enlightenment_LDFLAGS = -export-dynamic @e_libs@ @x_libs@ @dlopen_libs@
+enlightenment_LDFLAGS = -export-dynamic @e_libs@ @x_libs@ @dlopen_libs@ @cf_libs@
 
 enlightenment_remote_SOURCES = \
 e.h \

diff --git a/src/modules/battery/Makefile.am b/src/modules/battery/Makefile.am
index cbe97fa..56e43aa 100644 (file)
--- a/src/modules/battery/Makefile.am
+++ b/src/modules/battery/Makefile.am
@@ -16,11 +16,12 @@ INCLUDES               = -I. \
                          -I$(top_srcdir)/src/bin \
                          -I$(top_srcdir)/src/lib \
                          -I$(top_srcdir)/src/modules \
-                         @e_cflags@
+                         @e_cflags@ \
+                        @cf_cflags@
 pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
 pkg_LTLIBRARIES        = module.la
 module_la_SOURCES      = e_mod_main.c \
                          e_mod_main.h
-module_la_LIBADD       = @e_libs@ @dlopen_libs@
+module_la_LIBADD       = @e_libs@ @cf_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h