[pisa-src] r1167 - in trunk: community-operator/Makefile.am configure.ac pairing/Makefile.am pisacd/Makefile.am pisand/Makefile.am pisasd/Makefile.am test/Makefile.am
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Thu, 15 Oct 2009 15:07:25 +0200
Author: biurrun
Date: Thu Oct 15 15:07:24 2009
New Revision: 1167
Log:
Remove check/warning about shared libconfig and related Makefile cruft.
Modified:
trunk/community-operator/Makefile.am
trunk/configure.ac
trunk/pairing/Makefile.am
trunk/pisacd/Makefile.am
trunk/pisand/Makefile.am
trunk/pisasd/Makefile.am
trunk/test/Makefile.am
Modified: trunk/community-operator/Makefile.am
==============================================================================
--- trunk/community-operator/Makefile.am Thu Oct 15 14:53:17 2009
(r1166)
+++ trunk/community-operator/Makefile.am Thu Oct 15 15:07:24 2009
(r1167)
@@ -11,11 +11,7 @@
if PISA_FORCE_SHLIB
LDADD += -lpisa -lconfig
else
-if PISA_FORCE_SHLIBCONFIG
LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig
-else
- LDADD += @PISA_LIBPISA_LIB_STATIC@ @PISA_LIBCONFIG_LIB_STATIC@
-endif
endif
if PISA_WITH_HIPL
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac Thu Oct 15 14:53:17 2009 (r1166)
+++ trunk/configure.ac Thu Oct 15 15:07:24 2009 (r1167)
@@ -99,17 +99,6 @@
fi
AM_CONDITIONAL(PISA_FORCE_SHLIB, test x"$ac_cv_use_force_shlib" = x"yes")
-# If the system-wide libconfig is to be used, e.g. /usr/lib/libconfig.{a,so},
-# and at the same time its static library libconfig.a does not exist, then
-# you have to link binaries with libconfig.so, setting PISA_FORCE_SHLIB as yes.
- if test ! -f "$ac_default_prefix/lib/libconfig.a"; then
- AC_MSG_WARN("$ac_default_prefix/lib/libconfig.a does not exist!
Being forced to link to shared library libconfig.so...")
- ac_cv_use_force_shlibconfig=yes
- AC_DEFINE(CONFIG_PISA_FORCE_SHLIBCONFIG, AC_PREREQ(2.53))
- AH_TEMPLATE(CONFIG_PISA_FORCE_SHLIBCONFIG)
- fi
-AM_CONDITIONAL(PISA_FORCE_SHLIBCONFIG, test x"$ac_cv_use_force_shlibconfig" =
x"yes")
-
AC_ARG_ENABLE(openwrt,
AC_HELP_STRING([--enable-openwrt],
[enable building of OpenWRT supporting parts
(default=no)]),
Modified: trunk/pairing/Makefile.am
==============================================================================
--- trunk/pairing/Makefile.am Thu Oct 15 14:53:17 2009 (r1166)
+++ trunk/pairing/Makefile.am Thu Oct 15 15:07:24 2009 (r1167)
@@ -22,11 +22,7 @@
if PISA_FORCE_SHLIB
LDADD += -lpisa -lconfig -lm
else
-if PISA_FORCE_SHLIBCONFIG
LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig
-else
- LDADD += @PISA_LIBPISA_LIB_STATIC@ @PISA_LIBCONFIG_LIB_STATIC@
-endif
endif
COMMON_SRCS = common.c common_headers.c libconfig_wrapper.c
Modified: trunk/pisacd/Makefile.am
==============================================================================
--- trunk/pisacd/Makefile.am Thu Oct 15 14:53:17 2009 (r1166)
+++ trunk/pisacd/Makefile.am Thu Oct 15 15:07:24 2009 (r1167)
@@ -17,11 +17,7 @@
if PISA_FORCE_SHLIB
LDADD += -lpisa -lconfig
else
-if PISA_FORCE_SHLIBCONFIG
LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig
-else
- LDADD += @PISA_LIBPISA_LIB_STATIC@ @PISA_LIBCONFIG_LIB_STATIC@
-endif
endif
if PISA_PERFORMANCE
Modified: trunk/pisand/Makefile.am
==============================================================================
--- trunk/pisand/Makefile.am Thu Oct 15 14:53:17 2009 (r1166)
+++ trunk/pisand/Makefile.am Thu Oct 15 15:07:24 2009 (r1167)
@@ -16,11 +16,7 @@
if PISA_FORCE_SHLIB
LDADD += -lpisa -lconfig
else
-if PISA_FORCE_SHLIBCONFIG
LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig
-else
- LDADD += @PISA_LIBPISA_LIB_STATIC@ @PISA_LIBCONFIG_LIB_STATIC@
-endif
endif
if PISA_PERFORMANCE
Modified: trunk/pisasd/Makefile.am
==============================================================================
--- trunk/pisasd/Makefile.am Thu Oct 15 14:53:17 2009 (r1166)
+++ trunk/pisasd/Makefile.am Thu Oct 15 15:07:24 2009 (r1167)
@@ -17,11 +17,7 @@
if PISA_FORCE_SHLIB
LDADD += -lpisa -lconfig
else
-if PISA_FORCE_SHLIBCONFIG
LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig
-else
- LDADD += @PISA_LIBPISA_LIB_STATIC@ @PISA_LIBCONFIG_LIB_STATIC@
-endif
endif
if PISA_PERFORMANCE
Modified: trunk/test/Makefile.am
==============================================================================
--- trunk/test/Makefile.am Thu Oct 15 14:53:17 2009 (r1166)
+++ trunk/test/Makefile.am Thu Oct 15 15:07:24 2009 (r1167)
@@ -46,11 +46,7 @@
if PISA_FORCE_SHLIB
LDADD += -lpisa -lconfig
else
-if PISA_FORCE_SHLIBCONFIG
LDADD += @PISA_LIBPISA_LIB_STATIC@ -lconfig
-else
- LDADD += @PISA_LIBPISA_LIB_STATIC@ @PISA_LIBCONFIG_LIB_STATIC@
-endif
endif
checkhipd_SOURCES = checkhipd.c
Other related posts:
- » [pisa-src] r1167 - in trunk: community-operator/Makefile.am configure.ac pairing/Makefile.am pisacd/Makefile.am pisand/Makefile.am pisasd/Makefile.am test/Makefile.am - Diego Biurrun
