diff options
| -rw-r--r-- | configure.ac | 570 | ||||
| -rw-r--r-- | data/desktop/Makefile.am | 2 | ||||
| -rw-r--r-- | elementary.pc.in | 2 | ||||
| -rw-r--r-- | src/bin/Makefile.am | 5 | ||||
| -rw-r--r-- | src/edje_externals/Makefile.am | 3 | ||||
| -rw-r--r-- | src/lib/Makefile.am | 11 | ||||
| -rw-r--r-- | src/modules/access_output/Makefile.am | 7 | ||||
| -rw-r--r-- | src/modules/datetime_input_ctxpopup/Makefile.am | 5 | ||||
| -rw-r--r-- | src/modules/prefs/Makefile.am | 9 | ||||
| -rw-r--r-- | src/modules/test_entry/Makefile.am | 7 | ||||
| -rw-r--r-- | src/modules/test_map/Makefile.am | 5 | ||||
| -rw-r--r-- | src/tests/Makefile.am | 6 |
12 files changed, 342 insertions, 290 deletions
diff --git a/configure.ac b/configure.ac index c076de52d..6ecf4ec44 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ EFL_VERSION([1], [11], [99], [dev]) AC_INIT([elementary], [efl_version], [enlightenment-devel@lists.sourceforge.net]) -AC_PREREQ(2.60) +AC_PREREQ(2.63) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_BUILD @@ -18,118 +18,151 @@ AH_BOTTOM([ AC_USE_SYSTEM_EXTENSIONS -AM_INIT_AUTOMAKE([1.6 dist-bzip2 dist-xz -Wall]) +AM_INIT_AUTOMAKE([1.11 dist-bzip2 dist-xz -Wall]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) -# pkg-config -PKG_PROG_PKG_CONFIG +LT_INIT([win32-dll disable-static pic-only]) +EFL_INIT -MODULE_EDJE=`pkg-config --variable=module_arch edje` -AC_SUBST(MODULE_EDJE) -AC_DEFINE_UNQUOTED(MODULE_EDJE, "$MODULE_EDJE", "Edje module architecture") -# Needs to be moved into a macro, and also, needs a way to automatically fetch -# from all the dependencies using the Requires. -DEPS_EOLIAN_FLAGS=`pkg-config --variable=eolian_flags eo evas edje ecore efl` -AC_SUBST(DEPS_EOLIAN_FLAGS) +### Additional options to configure + +# C++ bindings + +AC_ARG_ENABLE([cxx-bindings], + [AC_HELP_STRING([--disable-cxx-bindings], + [disable C++11 bindings. @<:@default=enabled@:>@])], + [want_cxx11="${enableval}"], + [want_cxx11="yes"]) + +# Tests + +AC_ARG_WITH([tests], + [AS_HELP_STRING([--with-tests=none|regular], + [choose elementary testing method: regular or none.(coverage will be supported)@<:@default=none@:>@])], + [build_tests=${withval}], + [build_tests=none]) + +# Elementary base dir + +AC_ARG_WITH([elementary-base-dir], + [AC_HELP_STRING([--with-elementary-base-dir=PATH], [specify the subdirectory for all elementary data @<:@default=${elementary_base_dir}@:>@])], + [elementary_base_dir=${withval}], + [elementary_base_dir=".elementary"]) + +AC_MSG_NOTICE([ELEMENTARY_BASE_DIR set to ${elementary_base_dir}]) +AC_DEFINE_UNQUOTED([ELEMENTARY_BASE_DIR], ["${elementary_base_dir}"], ["subdirectory for all elementary data"]) + +# Build and install examples + +EFL_CHECK_BUILD_EXAMPLES( + [enable_build_examples="yes"], + [enable_build_examples="no"]) + +EFL_CHECK_INSTALL_EXAMPLES( + [enable_install_examples="yes"], + [enable_install_examples="no"]) + +# Debug mode + +AC_ARG_ENABLE([debug], + [AC_HELP_STRING([--enable-debug], [enable elementary debug support. @<:@default=disabled@:>@])], + [want_elementary_debug=$enableval], + [want_elementary_debug="no"]) + +ELM_DEBUG_DEF="#undef" +if test "x$want_elementary_debug" = "xyes"; then + AC_DEFINE([HAVE_ELEMENTARY_DEBUG], [1], [Elementary debug.]) + ELM_DEBUG_DEF="#define" +fi +AC_SUBST([ELM_DEBUG_DEF]) + +# quicklaunch support + +AC_ARG_ENABLE([quick-launch], + [AC_HELP_STRING([--disable-quick-launch], [disable quick-launch support, @<:@default=detect@:>@])], + [want_quicklaunch=$enableval], + [want_quicklaunch="auto"]) + + +### Default options with respect to host and default values + +ELM_VERSION_MAJOR="v_maj" +ELM_VERSION_MINOR="v_min" +AC_SUBST([ELM_VERSION_MAJOR]) +AC_SUBST([ELM_VERSION_MINOR]) + +MODULE_ARCH="v-v_maj.v_min.v_mic" +AC_SUBST([MODULE_ARCH]) +AC_DEFINE_UNQUOTED([MODULE_ARCH], ["$MODULE_ARCH"], ["Module architecture"]) + +EFL_SHARED_EXTENSION="${shrext_cmds}" +AC_DEFINE_UNQUOTED([EFL_SHARED_EXTENSION], ["${EFL_SHARED_EXTENSION}"], ["Shared extension"]) ELM_UNIX_DEF="#undef" ELM_WIN32_DEF="#undef" have_windows="no" -have_dlopen="no" have_freebsd="no" -case "$host_os" in - freebsd*) - have_freebsd="yes" - ;; -esac + case "$host_os" in mingw*) - PKG_CHECK_MODULES([EVIL], [evil]) - AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed.]) + AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if evil package is installed.]) ELM_WIN32_DEF="#define" have_windows="yes" -dnl managed by evil - AC_DEFINE(HAVE_DLADDR) - have_dlopen="yes" - dlopen_libs=-ldl - requirement_elm="evil" - have_socket="no" ;; *solaris*) ELM_UNIX_DEF="#define" - have_socket="yes" - have_dlopen="yes" - AC_CHECK_LIB([socket], [connect], [], [have_socket="no"]) + ;; + freebsd*) + ELM_UNIX_DEF="#define" + have_freebsd="yes" ;; darwin*) ELM_UNIX_DEF="#define" - have_socket="yes" - have_dlopen="yes" - AC_CHECK_HEADERS([crt_externs.h]) - AC_DEFINE([environ], [(*_NSGetEnviron())], ["apple doesn't follow POSIX in this case."]) ;; *) ELM_UNIX_DEF="#define" - AC_CHECK_FUNCS(dlopen, res=yes, res=no) - if test "x$res" = "xyes"; then - AC_CHECK_FUNCS(dladdr, AC_DEFINE(HAVE_DLADDR)) - have_dlopen="yes" - else - AC_CHECK_LIB(dl, dlopen, res=yes, res=no) - AC_CHECK_LIB(m, sincos) - if test "x$res" = "xyes"; then - AC_CHECK_LIB(dl, dladdr, AC_DEFINE(HAVE_DLADDR)) - dlopen_libs=-ldl - have_dlopen="yes" - fi - fi - have_socket="yes" ;; esac -AM_CONDITIONAL([BUILD_RUN], [test "x$have_socket" = "xyes"]) -AM_CONDITIONAL([BUILD_MODULES], [test "x$have_dlopen" = "xyes"]) +AM_CONDITIONAL([ELEMENTARY_WINDOWS_BUILD], [test "x${have_windows}" = "xyes"]) AM_CONDITIONAL([HAVE_FREEBSD], [test "x${have_freebsd}" = "xyes"]) +AC_SUBST([ELM_UNIX_DEF]) +AC_SUBST([ELM_WIN32_DEF]) -EFL_COMPILER_FLAG([-Wall -Wextra -Wpointer-arith -Wno-missing-field-initializers -fvisibility=hidden -fdata-sections -ffunction-sections]) -EFL_LINKER_FLAG([-fvisibility=hidden -fdata-sections -ffunction-sections -Wl,--gc-sections -fno-strict-aliasing -Wl,--as-needed -Wl,--no-copy-dt-needed-entries]) -m4_ifdef([v_mic], - [ - EFL_COMPILER_FLAG([-Wshadow]) - EFL_COMPILER_FLAG([-Wall]) - EFL_COMPILER_FLAG([-W]) - ]) +### Checks for programs -m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) -LT_INIT([win32-dll disable-static pic-only]) -EFL_INIT +# gettext +m4_ifdef([AM_GNU_GETTEXT_VERSION], [ +AM_GNU_GETTEXT_VERSION([0.17]) +]) + +m4_ifdef([AM_GNU_GETTEXT], [ +AM_GNU_GETTEXT([external]) +po_makefile_in=po/Makefile.in +have_po="yes" +],[ +have_po="no" +]) +AC_SUBST([LTLIBINTL]) -AC_GNU_SOURCE +if test "x${POSUB}" = "x" ; then + have_po="no" +fi -AC_C_BIGENDIAN -AC_ISC_POSIX +AM_CONDITIONAL([HAVE_PO], [test "x${have_po}" = "xyes"]) + +# compilers AC_PROG_CC AC_PROG_CC_STDC -AC_HEADER_STDC -AC_C_CONST -AC_FUNC_ALLOCA AC_PROG_CXX -ELM_VERSION_MAJOR="v_maj" -ELM_VERSION_MINOR="v_min" -AC_SUBST(ELM_VERSION_MAJOR) -AC_SUBST(ELM_VERSION_MINOR) - -MODULE_ARCH="v-v_maj.v_min.v_mic" -AC_SUBST(MODULE_ARCH) -AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture") - -EFL_SHARED_EXTENSION="${shrext_cmds}" -AC_DEFINE_UNQUOTED(EFL_SHARED_EXTENSION, "${EFL_SHARED_EXTENSION}", "Shared extension") +EFL_CXX_COMPILE_STDCXX_11([ext]) -requirement_elm="" +# pkg-config +PKG_PROG_PKG_CONFIG # Check whether pkg-config supports Requires.private if $PKG_CONFIG --atleast-pkgconfig-version 0.22; then @@ -137,77 +170,40 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.22; then else pkgconfig_requires_private="Requires" fi -AC_SUBST(pkgconfig_requires_private) - -#================================================ -if test "x${prefix}" = "xNONE"; then - LOCALE_DIR="${ac_default_prefix}/share/locale" -else - LOCALE_DIR="${prefix}/share/locale" -fi -AC_SUBST(LOCALE_DIR) -#================================================ -elementary_icon_dir="${datadir}/icons" -AC_SUBST(elementary_icon_dir) - -have_fork="no" -want_quicklaunch="auto" -AC_ARG_ENABLE([quick-launch], - [AC_HELP_STRING([--disable-quick-launch], [disable quick-launch support, @<:@default=detect@:>@])], - [want_quicklaunch=$enableval], []) +AC_SUBST([pkgconfig_requires_private]) -# Check if we can build binary with quicklaunch support -ELM_QUICKLAUNCH +# doxygen +EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"]) -if test "x$want_quicklaunch" != "xno"; then - AC_CHECK_FUNCS(fork, [ - have_fork="yes" - AC_DEFINE(HAVE_FORK) - ]) - AC_CHECK_FUNCS([clearenv]) -fi -AM_CONDITIONAL([BUILD_QUICKLAUNCH], [test "x$have_fork" = "xyes" && test "x$have_dlopen" = "xyes"]) +# EFL binaries +EFL_WITH_BIN([eet], [eet-eet], [eet]) +EFL_WITH_BIN([edje], [edje-cc], [edje_cc]) +EFL_WITH_BIN([elementary], [elementary-codegen], [elementary_codegen]) +EFL_WITH_BIN([elementary], [elm-prefs-cc], [elm_prefs_cc]) +EFL_WITH_BIN([eolian], [eolian-gen], [eolian_gen]) +EFL_WITH_BIN([eolian-cxx], [eolian-cxx], [eolian_cxx]) +# Force the helper to try external eolian generators +AM_CONDITIONAL([HAVE_EOLIAN_GEN], [true]) +AM_CONDITIONAL([HAVE_EOLIAN_CXX], [true]) -AC_CHECK_FUNCS([\ -geteuid \ -getuid \ -]) +EFL_ENABLE_BIN([elementary-test]) +EFL_ENABLE_BIN([elementary-codegen]) +EFL_ENABLE_BIN([elm-prefs-cc]) +EFL_ENABLE_BIN([elementary-config]) -AC_SUBST(dlopen_libs) -AC_SUBST(ELM_UNIX_DEF) -AC_SUBST(ELM_WIN32_DEF) -AM_CONDITIONAL([ELEMENTARY_WINDOWS_BUILD], [test "x${have_windows}" = "xyes"]) +### Checks for libraries -PKG_CHECK_MODULES([ELEMENTARY], - [ - efl >= efl_version - eina >= efl_version - eet >= efl_version - evas >= efl_version - ecore >= efl_version - ecore-evas >= efl_version - ecore-file >= efl_version - ecore-input >= efl_version - edje >= efl_version - eo >= efl_version - ethumb_client >= efl_version - emotion >= efl_version - ecore-imf >= efl_version - ecore-con >= efl_version - eio >= efl_version - eldbus >= efl_version - efreet >= efl_version - efreet-mime >= efl_version - efreet-trash >= efl_version - eio >= efl_version - ] -) +requirement_elm="" -EFL_ENABLE_EO_API_SUPPORT -EFL_ENABLE_BETA_API_SUPPORT +case "$host_os" in + mingw*) + requirement_elm="evil >= efl_version" + ;; +esac requirement_elm="\ + ${requirement_elm} \ efl >= efl_version \ eina >= efl_version \ eet >= efl_version \ @@ -230,12 +226,12 @@ requirement_elm="\ eio >= efl_version \ " -EFL_CXX_COMPILE_STDCXX_11([ext]) -want_cxx11="yes" -AC_ARG_ENABLE([cxx-bindings], - [AC_HELP_STRING([--disable-cxx-bindings], - [disable C++11 bindings. @<:@default=enabled@:>@])], - [want_cxx11="${enableval}"]) +PKG_CHECK_MODULES([ELEMENTARY], + [${requirement_elm}]) + +EFL_ENABLE_EO_API_SUPPORT +EFL_ENABLE_BETA_API_SUPPORT + if test "x${HAVE_CXX11}" = "x1" -a "x${want_cxx11}" = "xyes"; then PKG_CHECK_MODULES([ELEMENTARY_CXX], @@ -261,6 +257,181 @@ else fi AM_CONDITIONAL([HAVE_CXX11], [test "x${have_cxx11}" = "xyes"]) + +MODULE_EDJE=`${PKG_CONFIG} --variable=module_arch edje` +AC_SUBST([MODULE_EDJE]) +AC_DEFINE_UNQUOTED([MODULE_EDJE], ["$MODULE_EDJE"], ["Edje module architecture"]) + +# Needs to be moved into a macro, and also, needs a way to automatically fetch +# from all the dependencies using the Requires. +DEPS_EOLIAN_FLAGS=`${PKG_CONFIG} --variable=eolian_flags eo evas edje ecore efl` +AC_SUBST([DEPS_EOLIAN_FLAGS]) + +my_libs="-lm" + +# sockets + +case "$host_os" in + mingw*) + have_socket="no" + ;; + *solaris*) + AC_CHECK_LIB([socket], [connect], + [ + have_socket="yes" + my_libs="-lsocket ${my_libs}" + ], + [have_socket="no"]) + ;; + darwin*) + have_socket="yes" + ;; + *) + have_socket="yes" + ;; +esac + +AM_CONDITIONAL([BUILD_RUN], [test "x$have_socket" = "xyes"]) + +# dlopen + +have_dlopen="no" +case "$host_os" in + mingw*) +dnl managed by evil + AC_DEFINE([HAVE_DLADDR], [1], [Define to 1 if you have the `dladdr' function.]) + have_dlopen="yes" + my_libs="-ldl ${my_libs}" + ;; + *solaris*) + have_dlopen="yes" + ;; + darwin*) + have_dlopen="yes" + ;; + *) + AC_CHECK_LIB([dl], [dlopen], [res=yes], [res=no]) + if test "x$res" = "xyes"; then + AC_CHECK_LIB([dl], [dladdr], AC_DEFINE([HAVE_DLADDR], [1], [Define to 1 if you have the `dladdr' function.])) + my_libs="-ldl ${my_libs}" + have_dlopen="yes" + fi + ;; +esac + +AM_CONDITIONAL([BUILD_MODULES], [test "x$have_dlopen" = "xyes"]) + +AC_SUBST([my_libs]) +AC_SUBST([requirement_elm]) + +# check unit testing library +if test "${build_tests}" = "regular"; then + PKG_CHECK_MODULES([CHECK], [check >= 0.9.5]) +fi +AM_CONDITIONAL([ENABLE_ELEMENTARY_TESTS], [test "${build_tests}" = "regular"]) + + +### Checks for header files + +ELM_ALLOCA_H_DEF="#undef" +AC_CHECK_HEADER([alloca.h], [ELM_ALLOCA_H_DEF="#define"]) +AC_SUBST([ELM_ALLOCA_H_DEF]) + +ELM_LIBINTL_H_DEF="#undef" +AC_CHECK_HEADER([libintl.h], [ELM_LIBINTL_H_DEF="#define"]) +AC_SUBST([ELM_LIBINTL_H_DEF]) + +ELM_DIRENT_H_DEF="#undef" +AC_CHECK_HEADER([dirent.h], [ELM_DIRENT_H_DEF="#define"]) +AC_SUBST([ELM_DIRENT_H_DEF]) + +AC_CHECK_HEADER([sys/mman.h], [have_mman="yes"], [have_mman="no"]) +if test "x${have_mman}" = "xyes"; then + AC_DEFINE([HAVE_MMAN_H], [1], [Have sys/mman.h header file]) +fi + +AC_CHECK_HEADERS([locale.h langinfo.h sys/times.h]) + +case "$host_os" in + darwin*) + AC_CHECK_HEADERS([crt_externs.h]) + ;; +esac + + +### Checks for types + + +### Checks for structures + + +### Checks for compiler characteristics + +AC_C_BIGENDIAN + +m4_ifdef([v_mic], + [ + EFL_COMPILER_FLAG([-Wshadow]) + EFL_COMPILER_FLAG([-Wall]) + EFL_COMPILER_FLAG([-W]) + ]) + +EFL_COMPILER_FLAG([-Wall -Wextra -Wpointer-arith -Wno-missing-field-initializers -fvisibility=hidden -fdata-sections -ffunction-sections]) + +EFL_CHECK_PATH_MAX + + +### Checks for linker characteristics + +EFL_LINKER_FLAG([-fvisibility=hidden -fdata-sections -ffunction-sections -Wl,--gc-sections -fno-strict-aliasing -Wl,--as-needed -Wl,--no-copy-dt-needed-entries]) + +# Check if we can build binary with quicklaunch support +ELM_QUICKLAUNCH + + +### Checks for library functions + +AC_FUNC_ALLOCA + +AC_CHECK_FUNCS([geteuid getuid]) + +if test "x${want_quicklaunch}" != "xno"; then + AC_CHECK_FUNCS([fork clearenv]) +fi + +if test "x${have_dlopen}" = "xno"; then + AC_CHECK_FUNCS([dlopen dladdr]) +fi + +if test "x${ac_cv_func_dlopen}" = "xyes"; then + have_dlopen="yes" +fi + +AM_CONDITIONAL([BUILD_QUICKLAUNCH], [test "x${ac_cv_func_fork}" = "xyes" && test "x${have_dlopen}" = "xyes"]) + +# environ variable + +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ +# define _GNU_SOURCE 1 +#include <unistd.h> + ]], + [[ +extern char **environ; + ]]) + ], + [AC_DEFINE([HAVE_ENVIRON], [1], [extern environ exists])]) + +case "$host_os" in + darwin*) + AC_DEFINE([environ], [(*_NSGetEnviron())], ["apple doesn't follow POSIX in this case."]) + ;; +esac + + + + have_elementary_x="no" want_elementary_x="auto" AC_ARG_ENABLE([ecore-x], @@ -581,113 +752,6 @@ if test "x$elementary_web_backend" = "xewebkit2"; then fi AC_SUBST(ELM_WEB2_DEF) -ELM_DEBUG_DEF="#undef" -want_elementary_debug="no" -AC_ARG_ENABLE([debug], - [AC_HELP_STRING([--enable-debug], [enable elementary debug support. @<:@default=disabled@:>@])], - [want_elementary_debug=$enableval], []) - -if test "x$want_elementary_debug" = "xyes"; then - AC_DEFINE(HAVE_ELEMENTARY_DEBUG, 1, [Elementary debug.]) - ELM_DEBUG_DEF="#define" -fi -AC_SUBST(ELM_DEBUG_DEF) - -AC_ARG_WITH([tests], - [AC_HELP_STRING([--with-tests=none|regular], - [choose elementary testing method: regular or none.(coverage will be supported)@<:@default=none@:>@])], - [build_tests=${withval}], - [build_tests=none]) - -if test "${build_tests}" = "regular"; then - PKG_CHECK_MODULES([CHECK], [check >= 0.9.5]) -fi -AM_CONDITIONAL([ENABLE_ELEMENTARY_TESTS], [test "${build_tests}" = "regular"]) - -ELM_ALLOCA_H_DEF="#undef" -AC_CHECK_HEADER(alloca.h, [ELM_ALLOCA_H_DEF="#define"]) -AC_SUBST(ELM_ALLOCA_H_DEF) - -ELM_LIBINTL_H_DEF="#undef" -AC_CHECK_HEADER(libintl.h, [ELM_LIBINTL_H_DEF="#define"]) -AC_SUBST(ELM_LIBINTL_H_DEF) - -ELM_DIRENT_H_DEF="#undef" -AC_CHECK_HEADER(dirent.h, [ELM_DIRENT_H_DEF="#define"]) -AC_SUBST(ELM_DIRENT_H_DEF) - -AC_CHECK_HEADER(sys/mman.h, [have_mman="yes"], [have_mman="no"]) -if test "x${have_mman}" = "xyes"; then - AC_DEFINE(HAVE_MMAN_H, 1, [Have sys/mman.h header file]) -fi - -AC_CHECK_HEADERS([locale.h langinfo.h sys/times.h]) - -my_libs="-lm" -AC_SUBST(my_libs) -AC_SUBST(requirement_elm) - - -EFL_WITH_BIN([eet], [eet-eet], [eet]) -EFL_WITH_BIN([edje], [edje-cc], [edje_cc]) -EFL_WITH_BIN([elementary], [elementary-codegen], [elementary_codegen]) -EFL_WITH_BIN([elementary], [elm-prefs-cc], [elm_prefs_cc]) -EFL_WITH_BIN([eolian], [eolian-gen], [eolian_gen]) -EFL_WITH_BIN([eolian-cxx], [eolian-cxx], [eolian_cxx]) -# Force the helper to try external eolian generators -AM_CONDITIONAL(HAVE_EOLIAN_GEN, [true]) -AM_CONDITIONAL(HAVE_EOLIAN_CXX, [true]) - -EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"]) - -EFL_ENABLE_BIN([elementary-test]) -EFL_ENABLE_BIN([elementary-codegen]) -EFL_ENABLE_BIN([elm-prefs-cc]) -EFL_ENABLE_BIN([elementary-config]) - -m4_ifdef([AM_GNU_GETTEXT_VERSION], [ -AM_GNU_GETTEXT_VERSION([0.17]) -]) - -m4_ifdef([AM_GNU_GETTEXT], [ -AM_GNU_GETTEXT([external]) -po_makefile_in=po/Makefile.in -have_po="yes" -],[ -have_po="no" -]) -AC_SUBST(LTLIBINTL) - -if test "x${POSUB}" = "x" ; then - have_po="no" -fi - -AM_CONDITIONAL([HAVE_PO], [test "x${have_po}" = "xyes"]) - -EFL_CHECK_PATH_MAX - -elementary_base_dir=".elementary" -AC_ARG_WITH([elementary-base-dir], - [AC_HELP_STRING([--with-elementary-base-dir=PATH], [specify the subdirectory for all elementary data @<:@default=${elementary_base_dir}@:>@])], - [elementary_base_dir=${withval}], - [elementary_base_dir=".elementary"]) - -AC_MSG_NOTICE([ELEMENTARY_BASE_DIR set to ${elementary_base_dir}]) -AC_DEFINE_UNQUOTED(ELEMENTARY_BASE_DIR, "${elementary_base_dir}", "subdirectory for all elementary data") - -### Build and install examples -EFL_CHECK_BUILD_EXAMPLES([enable_build_examples="yes"], [enable_build_examples="no"]) -EFL_CHECK_INSTALL_EXAMPLES([enable_install_examples="yes"], [enable_install_examples="no"]) - -AC_TRY_COMPILE([ -# define _GNU_SOURCE 1 -#include <unistd.h> -], [ -extern char **environ; -], [ - AC_DEFINE(HAVE_ENVIRON, 1, [extern environ exists]) -]) - AC_CONFIG_FILES([ Makefile elementary.spec @@ -757,7 +821,7 @@ echo " Features:" echo " EWeather...............: ${have_elementary_eweather}" echo " EMap...................: ${have_elementary_emap}" echo " Web (WebKit)...........: ${elementary_web}" -echo " Quick Launch...........: ${have_fork}" +echo " Quick Launch...........: ${ac_cv_func_fork}" echo " Elocation..............: ${have_elementary_elocation}" echo echo " eet......................: ${eet_eet}" diff --git a/data/desktop/Makefile.am b/data/desktop/Makefile.am index fe8c41962..c49fe4e7f 100644 --- a/data/desktop/Makefile.am +++ b/data/desktop/Makefile.am @@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in desktopdir = $(datadir)/applications desktop_DATA = elementary_test.desktop elementary_config.desktop -icondir = $(elementary_icon_dir) +icondir = $(datadir)/icons icon_DATA = elementary.png EXTRA_DIST = $(desktop_DATA) $(icon_DATA) diff --git a/elementary.pc.in b/elementary.pc.in index 4e26dec58..3c880fdff 100644 --- a/elementary.pc.in +++ b/elementary.pc.in @@ -13,5 +13,5 @@ Name: elementary Description: Mobile device touchscreen widget library @pkgconfig_requires_private@: @requirement_elm@ Version: @VERSION@ -Libs: -L${libdir} -lelementary @my_libs@ @ELEMENTARY_LIBS@ @EVIL_LIBS@ @ELEMENTARY_WEB_LIBS@ @ELEMENTARY_EMAP_LIBS@ +Libs: -L${libdir} -lelementary @my_libs@ @ELEMENTARY_LIBS@ @ELEMENTARY_WEB_LIBS@ @ELEMENTARY_EMAP_LIBS@ Cflags: -I${includedir}/elementary-@VMAJ@ diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index f4f6e4600..b86dc2db6 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -9,7 +9,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/bin \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ --DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ +-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \ @ELEMENTARY_CFLAGS@ \ @ELEMENTARY_X_CFLAGS@ \ @ELEMENTARY_FB_CFLAGS@ \ @@ -20,8 +20,7 @@ AM_CPPFLAGS = \ @ELEMENTARY_WEB_CFLAGS@ \ @ELEMENTARY_EMAP_CFLAGS@ \ @ELEMENTARY_WAYLAND_CFLAGS@ \ -@ELEMENTARY_DRM_CFLAGS@ \ -@EVIL_CFLAGS@ +@ELEMENTARY_DRM_CFLAGS@ bin_PROGRAMS = \ @ELEMENTARY_TEST_PRG@ \ diff --git a/src/edje_externals/Makefile.am b/src/edje_externals/Makefile.am index ab4d73b4b..8357b73ee 100644 --- a/src/edje_externals/Makefile.am +++ b/src/edje_externals/Makefile.am @@ -17,8 +17,7 @@ AM_CPPFLAGS = \ @ELEMENTARY_EMAP_CFLAGS@ \ @ELEMENTARY_WEB_CFLAGS@ \ @ELEMENTARY_WAYLAND_CFLAGS@ \ -@ELEMENTARY_DRM_CFLAGS@ \ -@EVIL_CFLAGS@ +@ELEMENTARY_DRM_CFLAGS@ if ELEMENTARY_WINDOWS_BUILD AM_CPPFLAGS += -DELEMENTARY_BUILD diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 337e14c7c..4b4ca848b 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -18,10 +18,10 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/imported \ -I$(top_srcdir)/src/lib \ -I$(top_builddir)/src/lib \ --DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ --DLOCALE_DIR=\"@LOCALE_DIR@\" \ +-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \ +-DLOCALE_DIR=\"$(localedir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ --DICON_DIR=\"$(elementary_icon_dir)\" \ +-DICON_DIR=\"$(datadir)/icons\" \ @ELEMENTARY_CFLAGS@ \ @ELEMENTARY_X_CFLAGS@ \ @ELEMENTARY_FB_CFLAGS@ \ @@ -32,8 +32,7 @@ AM_CPPFLAGS = \ @ELEMENTARY_WEB_CFLAGS@ \ @ELEMENTARY_EMAP_CFLAGS@ \ @ELEMENTARY_WAYLAND_CFLAGS@ \ -@ELEMENTARY_DRM_CFLAGS@ \ -@EVIL_CFLAGS@ +@ELEMENTARY_DRM_CFLAGS@ if ELEMENTARY_WINDOWS_BUILD AM_CPPFLAGS += -DELEMENTARY_BUILD @@ -514,7 +513,6 @@ elu_ews_wm.c libelementary_la_CFLAGS = libelementary_la_LIBADD = \ @my_libs@ \ -@dlopen_libs@ \ @ELEMENTARY_LIBS@ \ @ELEMENTARY_X_LIBS@ \ @ELEMENTARY_FB_LIBS@ \ @@ -525,7 +523,6 @@ libelementary_la_LIBADD = \ @ELEMENTARY_EMAP_LIBS@ \ @ELEMENTARY_WAYLAND_LIBS@ \ @ELEMENTARY_DRM_LIBS@ \ -@EVIL_LIBS@ \ @LTLIBINTL@ libelementary_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ diff --git a/src/modules/access_output/Makefile.am b/src/modules/access_output/Makefile.am index 06b940f38..72906902e 100644 --- a/src/modules/access_output/Makefile.am +++ b/src/modules/access_output/Makefile.am @@ -7,7 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/src/lib \ -I$(top_builddir)/src/lib \ --DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ +-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ @ELEMENTARY_CFLAGS@ \ @ELEMENTARY_X_CFLAGS@ \ @@ -18,8 +18,7 @@ AM_CPPFLAGS = \ @ELEMENTARY_EWEATHER_CFLAGS@ \ @ELEMENTARY_WEB_CFLAGS@ \ @ELEMENTARY_EMAP_CFLAGS@ \ -@ELEMENTARY_WAYLAND_CFLAGS@ \ -@EVIL_CFLAGS@ +@ELEMENTARY_WAYLAND_CFLAGS@ if ELEMENTARY_WINDOWS_BUILD AM_CPPFLAGS += -DELEMENTARY_BUILD @@ -30,6 +29,6 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = mod.c -module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la @EVIL_LIBS@ +module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ module_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/src/modules/datetime_input_ctxpopup/Makefile.am b/src/modules/datetime_input_ctxpopup/Makefile.am index ddbc4cc18..3fe00e2b1 100644 --- a/src/modules/datetime_input_ctxpopup/Makefile.am +++ b/src/modules/datetime_input_ctxpopup/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/src/lib \ -I$(top_builddir)/src/lib \ --DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ +-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ @ELEMENTARY_CFLAGS@ \ @ELEMENTARY_X_CFLAGS@ \ @@ -21,8 +21,7 @@ AM_CPPFLAGS = \ @ELEMENTARY_EMAP_CFLAGS@ \ @ELEMENTARY_WAYLAND_CFLAGS@ \ @ELEMENTARY_EMAP_CFLAGS@ \ -@ELEMENTARY_DRM_CFLAGS@ \ -@EVIL_CFLAGS@ +@ELEMENTARY_DRM_CFLAGS@ if ELEMENTARY_WINDOWS_BUILD AM_CPPFLAGS += -DELEMENTARY_BUILD diff --git a/src/modules/prefs/Makefile.am b/src/modules/prefs/Makefile.am index 023ddf4e2..d53f1d2e7 100644 --- a/src/modules/prefs/Makefile.am +++ b/src/modules/prefs/Makefile.am @@ -19,8 +19,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/src/lib \ -I$(top_builddir)/src/lib \ --DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ --DLOCALE_DIR=\"@LOCALE_DIR@\" \ +-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \ +-DLOCALE_DIR=\"$(localedir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ @ELEMENTARY_CFLAGS@ \ @ELEMENTARY_X_CFLAGS@ \ @@ -30,8 +30,7 @@ AM_CPPFLAGS = \ @ELEMENTARY_ELOCATION_CFLAGS@ \ @ELEMENTARY_WEB_CFLAGS@ \ @ELEMENTARY_EMAP_CFLAGS@ \ -@ELEMENTARY_WAYLAND_CFLAGS@ \ -@EVIL_CFLAGS@ +@ELEMENTARY_WAYLAND_CFLAGS@ if ELEMENTARY_WINDOWS_BUILD AM_CPPFLAGS += -DELEMENTARY_BUILD @@ -59,7 +58,7 @@ elm_horizontal_box.c \ elm_vertical_frame.c \ elm_horizontal_frame.c -module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la @EVIL_LIBS@ +module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la module_la_LDFLAGS = -no-undefined -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/src/modules/test_entry/Makefile.am b/src/modules/test_entry/Makefile.am index 7eec5a94b..bf191b8ab 100644 --- a/src/modules/test_entry/Makefile.am +++ b/src/modules/test_entry/Makefile.am @@ -7,7 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/src/lib \ -I$(top_builddir)/src/lib \ --DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ +-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ @ELEMENTARY_CFLAGS@ \ @ELEMENTARY_X_CFLAGS@ \ @@ -18,8 +18,7 @@ AM_CPPFLAGS = \ @ELEMENTARY_EWEATHER_CFLAGS@ \ @ELEMENTARY_WEB_CFLAGS@ \ @ELEMENTARY_EMAP_CFLAGS@ \ -@ELEMENTARY_WAYLAND_CFLAGS@ \ -@EVIL_CFLAGS@ +@ELEMENTARY_WAYLAND_CFLAGS@ if ELEMENTARY_WINDOWS_BUILD AM_CPPFLAGS += -DELEMENTARY_BUILD @@ -30,6 +29,6 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = mod.c -module_la_LIBADD = $(top_builddir)/src/lib/libelementary.la @EVIL_LIBS@ +module_la_LIBADD = $(top_builddir)/src/lib/libelementary.la module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ module_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/src/modules/test_map/Makefile.am b/src/modules/test_map/Makefile.am index 6d2565991..260cd59f3 100644 --- a/src/modules/test_map/Makefile.am +++ b/src/modules/test_map/Makefile.am @@ -7,7 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/src/lib \ -I$(top_builddir)/src/lib \ --DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ +-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ @ELEMENTARY_CFLAGS@ \ @ELEMENTARY_X_CFLAGS@ \ @@ -18,8 +18,7 @@ AM_CPPFLAGS = \ @ELEMENTARY_EWEATHER_CFLAGS@ \ @ELEMENTARY_WEB_CFLAGS@ \ @ELEMENTARY_EMAP_CFLAGS@ \ -@ELEMENTARY_WAYLAND_CFLAGS@ \ -@EVIL_CFLAGS@ +@ELEMENTARY_WAYLAND_CFLAGS@ if ELEMENTARY_WINDOWS_BUILD AM_CPPFLAGS += -DELEMENTARY_BUILD diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index 4766a3134..6c97ce634 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -88,8 +88,7 @@ elm_suite_CPPFLAGS = \ @ELEMENTARY_EWEATHER_CFLAGS@ \ @ELEMENTARY_WEB_CFLAGS@ \ @ELEMENTARY_EMAP_CFLAGS@ \ - @ELEMENTARY_WAYLAND_CFLAGS@ \ - @EVIL_CFLAGS@ + @ELEMENTARY_WAYLAND_CFLAGS@ elm_suite_LDADD = \ $(top_builddir)/src/lib/libelementary.la \ @@ -121,8 +120,7 @@ elm_cxx_suite_CPPFLAGS = \ @ELEMENTARY_EWEATHER_CFLAGS@ \ @ELEMENTARY_WEB_CFLAGS@ \ @ELEMENTARY_EMAP_CFLAGS@ \ - @ELEMENTARY_WAYLAND_CFLAGS@ \ - @EVIL_CFLAGS@ + @ELEMENTARY_WAYLAND_CFLAGS@ elm_cxx_suite_LDADD = \ $(top_builddir)/src/lib/libelementary.la \ |