From d8ae9f0a6e9a7f1c491ad8a5a3da47d93530c0b5 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Mon, 14 Oct 2013 00:35:55 +0200 Subject: [PATCH] fix wrong libtool initialization order allow to build dynamic libraries (but keep static as default) Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/c1076ec35b83a96f46c1a33ff7b72ff153137f55 Author: Stefan Seyfried Date: 2013-10-14 (Mon, 14 Oct 2013) ------------------ This commit was generated by Migit --- configure.ac | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 1f360cd..e605b7b 100644 --- a/configure.ac +++ b/configure.ac @@ -3,10 +3,6 @@ AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) AC_CONFIG_MACRO_DIR([m4]) AC_GNU_SOURCE -LT_INIT - -## ugly, disables shared library build (not wanted yet) -enable_shared=no TUXBOX_APPS TUXBOX_APPS_DIRECTORY @@ -15,9 +11,14 @@ TUXBOX_BOXTYPE AC_PROG_CC AC_PROG_CXX +## both disabled => libtool still defaults to static +## at least the libtool I tested with ;-) +## --enable-shared => build only shared +## --enable-shared --enable-static => build both +AC_DISABLE_SHARED AC_DISABLE_STATIC AC_SYS_LARGEFILE -AM_PROG_LIBTOOL +AC_PROG_LIBTOOL if test x"$BOXTYPE" = x"tripledragon"; then TUXBOX_APPS_LIB_PKGCONFIG(DIRECTFB, directfb)