[Eliot-dev] eliot/extras/contrib Makefile

[Olivier Teulière]

CVSROOT:        /cvsroot/eliot
Module name:    eliot
Changes by:     Olivier Teulière <address@hidden>       11/07/30 14:23:43

Modified files:
        extras/contrib : Makefile 

Log message:
        Use libconfig 1.4.7

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/eliot/extras/contrib/Makefile?cvsroot=eliot&r1=1.10&r2=1.11

Patches:
Index: Makefile
===================================================================
RCS file: /cvsroot/eliot/eliot/extras/contrib/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- Makefile    16 Jan 2011 21:41:38 -0000      1.10
+++ Makefile    30 Jul 2011 14:23:43 -0000      1.11
@@ -1,5 +1,5 @@
 ICONV_VERSION = 1.13.1
-LIBCONFIG_VERSION = 1.4.6
+LIBCONFIG_VERSION = 1.4.7
 BOOST_VERSION = 1_42_0
 QT_VERSION = 4.5.3
 EXPAT_VERSION = 2.0.1
@@ -119,7 +119,7 @@
        touch $@
 
 .libconfig: $(LIBCONFIG_DIR_FLAG)
-       (cd $(LIBCONFIG_DIR) && CFLAGS=-DLIBCONFIG_STATIC 
CXXFLAGS=-DLIBCONFIG_STATIC $(CONFIGURE) --disable-examples --enable-static 
--disable-shared && make && make install)
+       (cd $(LIBCONFIG_DIR) && patch -p0 < ../libconfig++-static-build.patch 
&& CFLAGS=-DLIBCONFIG_STATIC CXXFLAGS=-DLIBCONFIGXX_STATIC $(CONFIGURE) 
--disable-examples --enable-static --disable-shared && make && make install)
        touch $@