kwo pushed a commit to branch master.

http://git.enlightenment.org/legacy/imlib2_loaders.git/commit/?id=58dfbd446a8d4296c485c37e20f1025d6f468ee0

commit 58dfbd446a8d4296c485c37e20f1025d6f468ee0
Author: Kim Woelders <k...@woelders.dk>
Date:   Fri Apr 6 05:25:51 2018 +0200

    Autofoo cleanup
---
 configure.ac                    | 111 +++++++++++-----------------------------
 src/modules/loaders/Makefile.am |  12 +++--
 2 files changed, 40 insertions(+), 83 deletions(-)

diff --git a/configure.ac b/configure.ac
index 550ced6..dfc303a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,74 +15,16 @@ AC_PROG_CC
 
 AC_HEADER_STDC
 AC_C_CONST
-LT_INIT
-PKG_PROG_PKG_CONFIG
-
-if test "x${bindir}" = 'x${exec_prefix}/bin'; then
-  if test "x${exec_prefix}" = "xNONE"; then
-    if test "x${prefix}" = "xNONE"; then
-      bindir="${ac_default_prefix}/bin";
-    else
-      bindir="${prefix}/bin";
-    fi
-  else
-    if test "x${prefix}" = "xNONE"; then
-      bindir="${ac_default_prefix}/bin";
-    else
-      bindir="${prefix}/bin";
-    fi
-  fi
-fi
-
-if test "x${libdir}" = 'x${exec_prefix}/lib'; then
-  if test "x${exec_prefix}" = "xNONE"; then
-    if test "x${prefix}" = "xNONE"; then
-      libdir="${ac_default_prefix}/lib";
-    else
-      libdir="${prefix}/lib";
-    fi
-  else
-    if test "x${prefix}" = "xNONE"; then
-      libdir="${ac_default_prefix}/lib";
-    else
-      libdir="${prefix}/lib";
-    fi
-  fi
-fi
-
-dnl Set PACKAGE_BIN_DIR in config.h.
-if test "x${bindir}" = 'xNONE'; then
-  if test "x${prefix}" = "xNONE"; then
-    AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${ac_default_prefix}/bin", 
[Installation directory for user executables])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin", [Installation 
directory for user executables])
-  fi
-else
-  AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}", [Installation directory for 
user executables])
-fi
 
-dnl Set PACKAGE_LIB_DIR in config.h.
-if test "x${libdir}" = 'xNONE'; then
-  if test "x${prefix}" = "xNONE"; then
-    AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${ac_default_prefix}/lib", 
[Installation directory for libraries])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib", [Installation 
directory for libraries])
-  fi
-else
-  AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}", [Installation directory for 
libraries])
-fi
-
-dnl Set PACKAGE_DATA_DIR in config.h.
-if test "x${prefix}" = "xNONE"; then
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, 
"${ac_default_prefix}/share/${PACKAGE}", [Shared Data Directory])
-else
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared 
Data Directory])
-fi
+dnl Next two lines is a hack to prevent libtool checking for CXX/F77
+define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
+define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
+LT_INIT
 
-dnl Set PACKAGE_SOURCE_DIR in config.h.
-packagesrcdir=`cd $srcdir && pwd`
-AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source code 
directory])
+PKG_PROG_PKG_CONFIG
 
+ani=yes
+ico=yes
 
 eet=auto
 AC_ARG_ENABLE(eet,
@@ -95,11 +37,14 @@ AC_ARG_ENABLE(eet,
  fi
 ])
 
+xcf=yes
 AC_ARG_ENABLE(xcf,
 [  --disable-xcf           disable building the xcf loader],
 [
  if test x$enableval = xno; then
-   xcf=no;
+   xcf=no
+ else
+   xcf=yes
  fi
 ])
 
@@ -116,7 +61,9 @@ elif test "x$found_eet" = "xno" ; then
        eet=no
 fi
 
+AM_CONDITIONAL(BUILD_ANI_LOADER, test x$ani != xno)
 AM_CONDITIONAL(BUILD_EET_LOADER, test x$eet != xno)
+AM_CONDITIONAL(BUILD_ICO_LOADER, test x$ico != xno)
 AM_CONDITIONAL(BUILD_XCF_LOADER, test x$xcf != xno)
 
 AC_CONFIG_HEADERS(config.h)
@@ -132,17 +79,21 @@ AC_CONFIG_COMMANDS([default],[
 ],[])
 AC_OUTPUT
 
-echo -e "\nBuild summary:"
-echo    "------------------------"
-echo -n " EET: "
-if test x$eet = xno ; then
-  echo    "Disabled "
-else
-  echo    "Enabled "
-fi
-echo -n " XCF: "
-if test x$xcf = xno ; then
-  echo    "Disabled "
-else
-  echo    "Enabled "
-fi
+#####################################################################
+## Info
+echo
+echo
+echo "------------------------------------------------------------------------"
+echo "$PACKAGE $VERSION"
+echo "------------------------------------------------------------------------"
+echo
+echo "Configuration Options Summary:"
+echo
+echo "Image loaders:"
+echo "  ANI.....................: $ani"
+echo "  EET.....................: $eet"
+echo "  ICO.....................: $ico"
+echo "  XCF.....................: $xcf"
+echo
+echo "Installation path.........: $prefix"
+echo
diff --git a/src/modules/loaders/Makefile.am b/src/modules/loaders/Makefile.am
index 7e5b117..b95aac3 100644
--- a/src/modules/loaders/Makefile.am
+++ b/src/modules/loaders/Makefile.am
@@ -2,18 +2,24 @@ MAINTAINERCLEANFILES = Makefile.in
 
 pkgdir               = $(libdir)/imlib2/loaders
 
+if BUILD_ANI_LOADER
+ANI_L                = ani.la
+endif
 if BUILD_EET_LOADER
 EET_L                = eet.la
 endif
+if BUILD_ICO_LOADER
+ICO_L                = ico.la
+endif
 if BUILD_XCF_LOADER
 XCF_L                = xcf.la
 endif
 
 pkg_LTLIBRARIES      = \
+$(ANI_L) \
 $(EET_L) \
-$(XCF_L) \
-ico.la \
-ani.la
+$(ICO_L) \
+$(XCF_L)
 
 eet_la_SOURCES      = loader_eet.c common.h image.h
 eet_la_CPPFLAGS     = @EET_CFLAGS@

-- 


Reply via email to