summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2014-06-11 08:00:09 +0200
committerCedric BAIL <c.bail@partner.samsung.com>2014-06-12 03:11:48 +0200
commitb0e08f231dcbcbbd444c3b7a6583f27179550546 (patch)
tree7bccd50ae73b574c2c938f1c6ef6a0d5a3f3d6c6
parentce6f8f8380857eeebe0407087f9f09b9305065c1 (diff)
downloadelementary-b0e08f231dcbcbbd444c3b7a6583f27179550546.tar.gz
autotools: --enable-auto-import is passed by default, nowadays
-rw-r--r--configure.ac4
-rw-r--r--src/modules/datetime_input_ctxpopup/Makefile.am2
-rw-r--r--src/modules/prefs/Makefile.am2
3 files changed, 2 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 8a125f6c4..cd1486747 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,6 @@ AC_DEFINE_UNQUOTED(MODULE_EDJE, "$MODULE_EDJE", "Edje module architecture")
DEPS_EOLIAN_FLAGS=`pkg-config --variable=eolian_flags eo evas edje ecore`
AC_SUBST(DEPS_EOLIAN_FLAGS)
-lt_enable_auto_import=""
ELM_UNIX_DEF="#undef"
ELM_WIN32_DEF="#undef"
ELM_WINCE_DEF="#undef"
@@ -43,7 +42,6 @@ case "$host_os" in
mingw32ce*)
PKG_CHECK_MODULES([EVIL], [evil])
AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed.])
- lt_enable_auto_import="-Wl,--enable-auto-import"
ELM_WINCE_DEF="#define"
have_windows="yes"
dnl managed by evil
@@ -56,7 +54,6 @@ dnl managed by evil
mingw*)
PKG_CHECK_MODULES([EVIL], [evil])
AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed.])
- lt_enable_auto_import="-Wl,--enable-auto-import"
ELM_WIN32_DEF="#define"
have_windows="yes"
dnl managed by evil
@@ -189,7 +186,6 @@ getuid \
])
AC_SUBST(dlopen_libs)
-AC_SUBST(lt_enable_auto_import)
AC_SUBST(ELM_UNIX_DEF)
AC_SUBST(ELM_WIN32_DEF)
AC_SUBST(ELM_WINCE_DEF)
diff --git a/src/modules/datetime_input_ctxpopup/Makefile.am b/src/modules/datetime_input_ctxpopup/Makefile.am
index 6439017a6..e46a7945f 100644
--- a/src/modules/datetime_input_ctxpopup/Makefile.am
+++ b/src/modules/datetime_input_ctxpopup/Makefile.am
@@ -35,5 +35,5 @@ pkg_LTLIBRARIES = module.la
module_la_SOURCES = datetime_input_ctxpopup.c
module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la
-module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
+module_la_LDFLAGS = -no-undefined -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/src/modules/prefs/Makefile.am b/src/modules/prefs/Makefile.am
index 3f1868878..57a36b1f0 100644
--- a/src/modules/prefs/Makefile.am
+++ b/src/modules/prefs/Makefile.am
@@ -61,7 +61,7 @@ elm_vertical_frame.c \
elm_horizontal_frame.c
module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la @EVIL_LIBS@
-module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
+module_la_LDFLAGS = -no-undefined -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
clean-local: