Remove the static options of configure and add

a way to select it with --enable-foo by passing
'static'. Use at your own risks.

If I've messed something up, please report in that thread

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@41160 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4
index 1af1c30..2d23eac 100644 (file)
--- a/m4/evas_check_engine.m4
+++ b/m4/evas_check_engine.m4
@@ -590,51 +590,62 @@ m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
 m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
 
 want_engine="$2"
+want_static_engine="no"
+have_engine="no"
 have_evas_engine_[]DOWN="no"
 
 AC_ARG_ENABLE([$1],
    [AC_HELP_STRING([--enable-$1], [enable $4 rendering backend])],
-   [want_engine=${enableval}]
-)
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_engine="yes"
+    else
+       if test "x${enableval}" = "xstatic" ; then
+          want_engine="static"
+       else
+          want_engine="no"
+       fi
+    fi
+   ])
 
 AC_MSG_CHECKING([whether to enable $4 rendering backend])
 AC_MSG_RESULT([${want_engine}])
 
-if test "x${want_engine}" = "xyes" -o "x${want_engine}" = "xauto"; then
-   m4_default([EVAS_CHECK_ENGINE_DEP_]m4_defn([UP]))(DOWN, $3, [have_evas_engine_[]DOWN="yes"], [have_evas_engine_[]DOWN="no"])
+if test "x${want_engine}" = "xyes" -o "x${want_engine}" = "xstatic" -o "x${want_engine}" = "xauto" ; then
+   m4_default([EVAS_CHECK_ENGINE_DEP_]m4_defn([UP]))(DOWN, $3, [have_engine="yes"], [have_engine="no"])
 fi
 
-if test "x${have_evas_engine_[]DOWN}" = "xno" -a "x${want_engine}" = "xyes" -a "x${use_strict}" = "xyes" ; then
+if test "x${have_engine}" = "xno" -a "x${want_engine}" = "xyes" -a "x${use_strict}" = "xyes" ; then
    AC_MSG_ERROR([$4 dependencies not found (strict dependencies checking)])
 fi
 
 AC_MSG_CHECKING([whether $4 rendering backend will be built])
-AC_MSG_RESULT([${have_evas_engine_[]DOWN}])
+AC_MSG_RESULT([${have_engine}])
 
-if test "x${have_evas_engine_[]DOWN}" = "xyes" ; then
-   AC_DEFINE(BUILD_ENGINE_[]UP, [1], [$4 rendering backend])
+if test "x${have_engine}" = "xyes" ; then
+   if test "x${want_engine}" = "xstatic" ; then
+      have_evas_engine_[]DOWN="static"
+      want_static_engine="yes"
+   else
+      have_evas_engine_[]DOWN="yes"
+   fi
 fi
 
-AM_CONDITIONAL(BUILD_ENGINE_[]UP, [test "x${have_evas_engine_[]DOWN}" = "xyes"])
-
-want_static="no"
-have_static_evas_engine_[]DOWN=""
-
-AC_ARG_ENABLE([static-$1],
-   [AC_HELP_STRING([--enable-static-$1], [enable static build of $4 rendering backend])],
-   [want_static=${enableval}]
-)
-
 AC_MSG_CHECKING([whether to statically include $4 rendering backend inside evas library])
-AC_MSG_RESULT([${want_static}])
+AC_MSG_RESULT([${want_static_engine}])
+
+if test "x${have_engine}" = "xyes" ; then
+   AC_DEFINE(BUILD_ENGINE_[]UP, [1], [$4 rendering backend])
+fi
 
-AM_CONDITIONAL(EVAS_STATIC_BUILD_[]UP, [test "x${want_static}" = "xyes" -a "x${have_evas_engine_[]DOWN}" = "xyes"])
+AM_CONDITIONAL(BUILD_ENGINE_[]UP, [test "x${have_engine}" = "xyes"])
 
-if test "x${want_static}" = "xyes" -a "x${have_evas_engine_[]DOWN}" = "xyes"; then
-   have_static_evas_engine_[]DOWN="(static)"
+if test "x${want_static_engine}" = "xyes" ; then
    AC_DEFINE(EVAS_STATIC_BUILD_[]UP, [1], [Build $1 engine inside libevas])
 fi
 
+AM_CONDITIONAL(EVAS_STATIC_BUILD_[]UP, [test "x${want_static_engine}" = "xyes"])
+
 m4_popdef([UP])
 m4_popdef([DOWN])
 

diff --git a/m4/evas_check_loader.m4 b/m4/evas_check_loader.m4
index c0b7c76..ac4c6bd 100644 (file)
--- a/m4/evas_check_loader.m4
+++ b/m4/evas_check_loader.m4
@@ -280,47 +280,63 @@ m4_pushdef([UP], m4_toupper([[$1]]))
 m4_pushdef([DOWN], m4_tolower([[$1]]))
 
 want_loader="$2"
+want_static_loader="no"
+have_loader="no"
 have_evas_image_loader_[]DOWN="no"
 
 AC_ARG_ENABLE([image-loader-[]DOWN],
-   [AC_HELP_STRING([--disable-image-loader-[]DOWN], [disable $1 image loader])],
-   [want_loader=${enableval}]
+   [AC_HELP_STRING([--enable-image-loader-[]DOWN], [enable $1 image loader])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_loader="yes"
+    else
+       if test "x${enableval}" = "xstatic" ; then
+          want_loader="static"
+       else
+          want_loader="no"
+       fi
+    fi
+   ]
 )
 
 AC_MSG_CHECKING([whether to enable $1 image loader])
 AC_MSG_RESULT([${want_loader}])
 
-if test "x${want_loader}" = "xyes" -o "x${want_loader}" = "xauto"; then
-   m4_default([EVAS_CHECK_LOADER_DEP_]m4_defn([UP]))(DOWN, [have_evas_image_loader_[]DOWN="yes"], [have_evas_image_loader_[]DOWN="no"])
+if test "x${want_loader}" = "xyes" -o "x${want_loader}" = "xstatic" -o "x${want_loader}" = "xauto"; then
+   m4_default([EVAS_CHECK_LOADER_DEP_]m4_defn([UP]))(DOWN, [have_loader="yes"], [have_loader="no"])
 fi
 
-if test "x${have_evas_image_loader_[]DOWN}" = "xno" -a "x${want_loader}" = "xyes" -a "x${use_strict}" = "xyes" ; then
+if test "x${have_loader}" = "xno" -a "x${want_loader}" = "xyes" -a "x${use_strict}" = "xyes" ; then
    AC_MSG_ERROR([$1 dependencies not found (strict dependencies checking)])
 fi
 
-if test "x${have_evas_image_loader_[]DOWN}" = "xyes" ; then
-   AC_DEFINE(BUILD_LOADER_[]UP, [1], [UP Image Loader Support])
-fi
-
-AM_CONDITIONAL(BUILD_LOADER_[]UP, [test "x${have_evas_image_loader_[]DOWN}" = "xyes"])
+AC_MSG_CHECKING([whether $1 image loader will be built])
+AC_MSG_RESULT([${have_loader}])
 
-want_static_[]DOWN="no"
-have_static_evas_image_loader_[]DOWN=""
+if test "x${have_loader}" = "xyes" ; then
+   if test "x${want_loader}" = "xstatic" ; then
+      have_evas_image_loader_[]DOWN="static"
+      want_static_loader="yes"
+   else
+      have_evas_image_loader_[]DOWN="yes"
+   fi
+fi
 
-AC_ARG_ENABLE([static-image-loader-[]DOWN],
-   [AC_HELP_STRING([--enable-static-image-loader-[]DOWN], [Build $1 image loader inside evas library])],
-   [want_static_[]DOWN=${enableval}]
-)
 AC_MSG_CHECKING([whether to build inside evas library $1 image loader])
-AC_MSG_RESULT([${want_static_[]DOWN}])
+AC_MSG_RESULT([${want_static_loader}])
 
-AM_CONDITIONAL(EVAS_STATIC_BUILD_[]UP, [test "x${want_static_[]DOWN}" = "xyes" -a "x${have_evas_image_loader_[]DOWN}" = "xyes"])
+if test "x${have_loader}" = "xyes" ; then
+   AC_DEFINE(BUILD_LOADER_[]UP, [1], [UP Image Loader Support])
+fi
 
-if test "x${want_static_[]DOWN}" = "xyes" -a "x${have_evas_image_loader_[]DOWN}" = "xyes"; then
-   have_static_evas_image_loader_[]DOWN="(static)"
+AM_CONDITIONAL(BUILD_LOADER_[]UP, [test "x${have_loader}" = "xyes"])
+
+if test "x${want_static_loader}" = "xyes" ; then
    AC_DEFINE(EVAS_STATIC_BUILD_[]UP, [1], [Build $1 image loader inside libevas])
 fi
 
+AM_CONDITIONAL(EVAS_STATIC_BUILD_[]UP, [test "x${want_static_loader}" = "xyes"])
+
 m4_popdef([UP])
 m4_popdef([DOWN])
 

diff --git a/src/modules/loaders/edb/Makefile.am b/src/modules/loaders/edb/Makefile.am
index 8559758..bdb2127 100644 (file)
--- a/src/modules/loaders/edb/Makefile.am
+++ b/src/modules/loaders/edb/Makefile.am
@@ -9,16 +9,17 @@ AM_CPPFLAGS = \
 @evas_image_loader_edb_cflags@ \
 @EINA_CFLAGS@
 
-pkgdir                 = $(libdir)/evas/modules/loaders/edb/$(MODULE_ARCH)
 
+if BUILD_LOADER_EDB
 if !EVAS_STATIC_BUILD_EDB
 
-pkg_LTLIBRARIES        = module.la
+pkgdir = $(libdir)/evas/modules/loaders/edb/$(MODULE_ARCH)
+pkg_LTLIBRARIES = module.la
 
-module_la_SOURCES      = evas_image_load_edb.c
+module_la_SOURCES = evas_image_load_edb.c
 
-module_la_LIBADD       = @evas_image_loader_edb_libs@ @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la
-module_la_LDFLAGS      = -no-undefined -module -avoid-version
+module_la_LIBADD = @evas_image_loader_edb_libs@ @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la
+module_la_LDFLAGS = -no-undefined -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static
 
 else
@@ -28,4 +29,5 @@ noinst_LTLIBRARIES = libevas_loader_edb.la
 libevas_loader_edb_la_SOURCES = evas_image_load_edb.c
 libevas_loader_edb_la_LIBADD = @evas_image_loader_edb_libs@
 
-endif
\ No newline at end of file
+endif
+endif

diff --git a/src/modules/loaders/eet/Makefile.am b/src/modules/loaders/eet/Makefile.am
index a796cc6..39b2f0b 100644 (file)
--- a/src/modules/loaders/eet/Makefile.am
+++ b/src/modules/loaders/eet/Makefile.am
@@ -11,10 +11,11 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = @WIN32_CFLAGS@
 
-pkgdir = $(libdir)/evas/modules/loaders/eet/$(MODULE_ARCH)
 
+if BUILD_LOADER_EET
 if !EVAS_STATIC_BUILD_EET
 
+pkgdir = $(libdir)/evas/modules/loaders/eet/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la
 
 module_la_SOURCES = evas_image_load_eet.c
@@ -30,4 +31,5 @@ noinst_LTLIBRARIES = libevas_loader_eet.la
 libevas_loader_eet_la_SOURCES = evas_image_load_eet.c
 libevas_loader_eet_la_LIBADD = @evas_image_loader_eet_libs@
 
-endif
\ No newline at end of file
+endif
+endif

diff --git a/src/modules/loaders/gif/Makefile.am b/src/modules/loaders/gif/Makefile.am
index 372096d..6e3a442 100644 (file)
--- a/src/modules/loaders/gif/Makefile.am
+++ b/src/modules/loaders/gif/Makefile.am
@@ -11,10 +11,10 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = @WIN32_CFLAGS@
 
-pkgdir = $(libdir)/evas/modules/loaders/gif/$(MODULE_ARCH)
-
+if BUILD_LOADER_GIF
 if !EVAS_STATIC_BUILD_GIF
 
+pkgdir = $(libdir)/evas/modules/loaders/gif/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la
 
 module_la_SOURCES = evas_image_load_gif.c
@@ -30,4 +30,5 @@ noinst_LTLIBRARIES = libevas_loader_gif.la
 libevas_loader_gif_la_SOURCES = evas_image_load_gif.c
 libevas_loader_gif_la_LIBADD = @evas_image_loader_gif_libs@
 
-endif
\ No newline at end of file
+endif
+endif

diff --git a/src/modules/loaders/jpeg/Makefile.am b/src/modules/loaders/jpeg/Makefile.am
index bea81f6..ffeb2ac 100644 (file)
--- a/src/modules/loaders/jpeg/Makefile.am
+++ b/src/modules/loaders/jpeg/Makefile.am
@@ -13,10 +13,10 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = @WIN32_CFLAGS@
 
-pkgdir = $(libdir)/evas/modules/loaders/jpeg/$(MODULE_ARCH)
-
+if BUILD_LOADER_JPEG
 if !EVAS_STATIC_BUILD_JPEG
 
+pkgdir = $(libdir)/evas/modules/loaders/jpeg/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la
 
 module_la_SOURCES = evas_image_load_jpeg.c
@@ -31,4 +31,5 @@ noinst_LTLIBRARIES = libevas_loader_jpeg.la
 libevas_loader_jpeg_la_SOURCES = evas_image_load_jpeg.c
 libevas_loader_jpeg_la_LIBADD = @evas_image_loader_jpeg_libs@
 
-endif
\ No newline at end of file
+endif
+endif

diff --git a/src/modules/loaders/pmaps/Makefile.am b/src/modules/loaders/pmaps/Makefile.am
index a7e4d2a..6354990 100644 (file)
--- a/src/modules/loaders/pmaps/Makefile.am
+++ b/src/modules/loaders/pmaps/Makefile.am
@@ -13,10 +13,10 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = @WIN32_CFLAGS@
 
-pkgdir = $(libdir)/evas/modules/loaders/pmaps/$(MODULE_ARCH)
-
+if BUILD_LOADER_PMAPS
 if !EVAS_STATIC_BUILD_PMAPS
 
+pkgdir = $(libdir)/evas/modules/loaders/pmaps/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la
 
 module_la_SOURCES = evas_image_load_pmaps.c
@@ -32,3 +32,4 @@ libevas_loader_pmaps_la_SOURCES = evas_image_load_pmaps.c
 libevas_loader_pmaps_la_LIBADD = @evas_image_loader_pmaps_libs@
 
 endif
+endif

diff --git a/src/modules/loaders/png/Makefile.am b/src/modules/loaders/png/Makefile.am
index 68630ca..ff14bb8 100644 (file)
--- a/src/modules/loaders/png/Makefile.am
+++ b/src/modules/loaders/png/Makefile.am
@@ -11,10 +11,10 @@ AM_CPPFLAGS = \
 @EVIL_CFLAGS@ \
 @WIN32_CPPFLAGS@
 
-pkgdir = $(libdir)/evas/modules/loaders/png/$(MODULE_ARCH)
-
+if BUILD_LOADER_PNG
 if !EVAS_STATIC_BUILD_PNG
 
+pkgdir = $(libdir)/evas/modules/loaders/png/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la
 
 module_la_SOURCES = evas_image_load_png.c
@@ -30,3 +30,4 @@ libevas_loader_png_la_SOURCES = evas_image_load_png.c
 libevas_loader_png_la_LIBADD = @evas_image_loader_png_libs@
 
 endif
+endif

diff --git a/src/modules/loaders/svg/Makefile.am b/src/modules/loaders/svg/Makefile.am
index 5921e10..d8e60da 100644 (file)
--- a/src/modules/loaders/svg/Makefile.am
+++ b/src/modules/loaders/svg/Makefile.am
@@ -11,10 +11,10 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = @WIN32_CFLAGS@
 
-pkgdir = $(libdir)/evas/modules/loaders/svg/$(MODULE_ARCH)
-
+if BUILD_LOADER_SVG
 if !EVAS_STATIC_BUILD_SVG
 
+pkgdir = $(libdir)/evas/modules/loaders/svg/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la
 
 module_la_SOURCES = evas_image_load_svg.c
@@ -30,3 +30,4 @@ libevas_loader_svg_la_SOURCES = evas_image_load_svg.c
 libevas_loader_svg_la_LIBADD = @evas_image_loader_svg_libs@
 
 endif
+endif

diff --git a/src/modules/loaders/tiff/Makefile.am b/src/modules/loaders/tiff/Makefile.am
index 3b8e169..b1aa818 100644 (file)
--- a/src/modules/loaders/tiff/Makefile.am
+++ b/src/modules/loaders/tiff/Makefile.am
@@ -13,10 +13,10 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = @WIN32_CFLAGS@
 
-pkgdir = $(libdir)/evas/modules/loaders/tiff/$(MODULE_ARCH)
-
+if BUILD_LOADER_TIFF
 if !EVAS_STATIC_BUILD_TIFF
 
+pkgdir = $(libdir)/evas/modules/loaders/tiff/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la
 
 module_la_SOURCES = evas_image_load_tiff.c
@@ -32,4 +32,5 @@ noinst_LTLIBRARIES = libevas_loader_tiff.la
 libevas_loader_tiff_la_SOURCES = evas_image_load_tiff.c
 libevas_loader_tiff_la_LIBADD = @evas_image_loader_tiff_libs@
 
-endif
\ No newline at end of file
+endif
+endif

diff --git a/src/modules/loaders/xpm/Makefile.am b/src/modules/loaders/xpm/Makefile.am
index cfd475a..de81294 100644 (file)
--- a/src/modules/loaders/xpm/Makefile.am
+++ b/src/modules/loaders/xpm/Makefile.am
@@ -13,9 +13,9 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = @WIN32_CFLAGS@
 
-pkgdir = $(libdir)/evas/modules/loaders/xpm/$(MODULE_ARCH)
-
+if BUILD_LOADER_XPM
 if !EVAS_STATIC_BUILD_XPM
+pkgdir = $(libdir)/evas/modules/loaders/xpm/$(MODULE_ARCH)
 
 pkg_LTLIBRARIES = module.la
 
@@ -33,4 +33,4 @@ libevas_loader_xpm_la_SOURCES = evas_image_load_xpm.c
 libevas_loader_xpm_la_LIBADD = @evas_image_loader_xpm_libs@
 
 endif
-
+endif

diff --git a/src/modules/savers/edb/Makefile.am b/src/modules/savers/edb/Makefile.am
index 8ada6b1..e273d9b 100644 (file)
--- a/src/modules/savers/edb/Makefile.am
+++ b/src/modules/savers/edb/Makefile.am
@@ -7,10 +7,10 @@ AM_CPPFLAGS          = -I. \
                         @FREETYPE_CFLAGS@ @evas_image_loader_edb_cflags@ \
                         @EINA_CFLAGS@
 
-pkgdir                 = $(libdir)/evas/modules/savers/edb/$(MODULE_ARCH)
-
+if BUILD_LOADER_EDB
 if !EVAS_STATIC_BUILD_EDB
 
+pkgdir                 = $(libdir)/evas/modules/savers/edb/$(MODULE_ARCH)
 pkg_LTLIBRARIES        = module.la
 
 module_la_SOURCES      = evas_image_save_edb.c
@@ -27,5 +27,6 @@ libevas_saver_edb_la_SOURCES = evas_image_save_edb.c
 libevas_saver_edb_la_LIBADD = @evas_image_loader_edb_libs@
 
 endif
+endif
 
 EXTRA_DIST             = evas_image_save_edb.c

diff --git a/src/modules/savers/eet/Makefile.am b/src/modules/savers/eet/Makefile.am
index 7f47bb1..94f3a55 100644 (file)
--- a/src/modules/savers/eet/Makefile.am
+++ b/src/modules/savers/eet/Makefile.am
@@ -11,10 +11,10 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = @WIN32_CFLAGS@
 
-pkgdir = $(libdir)/evas/modules/savers/eet/$(MODULE_ARCH)
-
+if BUILD_LOADER_EET
 if !EVAS_STATIC_BUILD_EET
 
+pkgdir = $(libdir)/evas/modules/savers/eet/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la
 
 module_la_SOURCES = evas_image_save_eet.c
@@ -30,4 +30,5 @@ noinst_LTLIBRARIES = libevas_saver_eet.la
 libevas_saver_eet_la_SOURCES = evas_image_save_eet.c
 libevas_saver_eet_la_LIBADD = @evas_image_loader_eet_libs@
 
-endif
\ No newline at end of file
+endif
+endif

diff --git a/src/modules/savers/jpeg/Makefile.am b/src/modules/savers/jpeg/Makefile.am
index 062fe84..63c8fd9 100644 (file)
--- a/src/modules/savers/jpeg/Makefile.am
+++ b/src/modules/savers/jpeg/Makefile.am
@@ -11,10 +11,10 @@ AM_CPPFLAGS= \
 
 AM_CFLAGS = @WIN32_CFLAGS@
 
-pkgdir = $(libdir)/evas/modules/savers/jpeg/$(MODULE_ARCH)
-
+if BUILD_LOADER_JPEG
 if !EVAS_STATIC_BUILD_JPEG
 
+pkgdir = $(libdir)/evas/modules/savers/jpeg/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la
 
 module_la_SOURCES = evas_image_save_jpeg.c
@@ -30,3 +30,4 @@ libevas_saver_jpeg_la_SOURCES = evas_image_save_jpeg.c
 libevas_saver_jpeg_la_LIBADD = @evas_image_loader_jpeg_libs@
 
 endif
+endif

diff --git a/src/modules/savers/png/Makefile.am b/src/modules/savers/png/Makefile.am
index 9e3338c..b9d9cd5 100644 (file)
--- a/src/modules/savers/png/Makefile.am
+++ b/src/modules/savers/png/Makefile.am
@@ -13,10 +13,10 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = @WIN32_CFLAGS@
 
-pkgdir = $(libdir)/evas/modules/savers/png/$(MODULE_ARCH)
-
+if BUILD_LOADER_PNG
 if !EVAS_STATIC_BUILD_PNG
 
+pkgdir = $(libdir)/evas/modules/savers/png/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la
 
 module_la_SOURCES = evas_image_save_png.c
@@ -33,3 +33,4 @@ libevas_saver_png_la_SOURCES = evas_image_save_png.c
 libevas_saver_png_la_LIBADD = @evas_image_loader_png_libs@
 
 endif
+endif

diff --git a/src/modules/savers/tiff/Makefile.am b/src/modules/savers/tiff/Makefile.am
index 5580c33..c754c0b 100644 (file)
--- a/src/modules/savers/tiff/Makefile.am
+++ b/src/modules/savers/tiff/Makefile.am
@@ -11,10 +11,10 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = @WIN32_CFLAGS@
 
-pkgdir = $(libdir)/evas/modules/savers/tiff/$(MODULE_ARCH)
-
+if BUILD_LOADER_TIFF
 if !EVAS_STATIC_BUILD_TIFF
 
+pkgdir = $(libdir)/evas/modules/savers/tiff/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la
 
 module_la_SOURCES = evas_image_save_tiff.c
@@ -31,3 +31,4 @@ libevas_saver_tiff_la_SOURCES = evas_image_save_tiff.c
 libevas_saver_tiff_la_LIBADD = @evas_image_loader_tiff_libs@
 
 endif
+endif