From: Mika Laitio Date: Mon, 11 Apr 2011 13:41:22 +0000 (+0300) Subject: Hardcoded the linking to libuci X-Git-Url: http://pilppa.org/gitweb/?p=libplp.git;a=commitdiff_plain;h=ebb173cc24adaca6fa0555e075aafedc9a4fb6d8 Hardcoded the linking to libuci Removed the pkoconfig check for uci as the patch has not been accepted to upsteam. Signed-off-by: Mika Laitio --- diff --git a/configure.ac b/configure.ac index ebfa5b1..2849d4f 100644 --- a/configure.ac +++ b/configure.ac @@ -5,12 +5,12 @@ AC_CONFIG_MACRO_DIR([m4]) PACKAGE=libplp VERSION=0.1.0 -CFLAGS="$CFLAGS -g -Wall -Werror" +CFLAGS="$CFLAGS -g -Wall -Werror -luci" LDFLAGS="$LDFLAGS -lpthread" AC_SUBST(CFLAGS) AC_SUBST(LDFLAGS) -CXXFLAGS="$CXXFLAGS -ggdb -Wall -Werror" +CXXFLAGS="$CXXFLAGS -ggdb -Wall -Werror -luci" AC_SUBST(CXXFLAGS) AC_MSG_NOTICE([libplp Makefile]) @@ -25,9 +25,9 @@ AC_PROG_INSTALL PKG_PROG_PKG_CONFIG() -PKG_CHECK_MODULES(SRC, libuci) -AC_SUBST(SRC_CFLAGS) -AC_SUBST(SRC_LIBS) +#PKG_CHECK_MODULES(SRC, libuci) +#AC_SUBST(SRC_CFLAGS) +#AC_SUBST(SRC_LIBS) AC_OUTPUT([ libplp.pc diff --git a/libplp.pc.in b/libplp.pc.in index b663fc4..d0a6861 100644 --- a/libplp.pc.in +++ b/libplp.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: libplp Description: pilppa common utility library Version: @VERSION@ -Requires: libuci +Requires: Cflags: -I${includedir} -I${includedir}/libplp -Libs: -L${libdir} -lplp +Libs: -L${libdir} -lplp -luci