From f66dfa7d4bb4a58ac1f72c6f746c0c5a71c9d9c7 Mon Sep 17 00:00:00 2001 From: Randall Leeds Date: Wed, 8 Jun 2011 08:44:03 +0000 Subject: [PATCH] include pkg-config macros git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1133284 13f79535-47bb-0310-9956-ffa450edef68 --- NOTICE | 4 ++++ bootstrap | 1 + configure.ac | 2 ++ m4/pkg.m4.gz | Bin 0 -> 2202 bytes 4 files changed, 7 insertions(+) create mode 100644 m4/pkg.m4.gz diff --git a/NOTICE b/NOTICE index 7f107607bb5..bf195d58a2e 100644 --- a/NOTICE +++ b/NOTICE @@ -14,6 +14,10 @@ This product also includes the following third-party components: Copyright 2008, Akos Maroy + * pkg.m4 (http://http://pkg-config.freedesktop.org/wiki/) + + Copyright 2004, Scott James Remnant + * jQuery (http://jquery.com/) Copyright 2010, John Resig diff --git a/bootstrap b/bootstrap index 0c576c405fd..bdb35a3b5af 100755 --- a/bootstrap +++ b/bootstrap @@ -47,6 +47,7 @@ fi gunzip -c m4/ac_check_icu.m4.gz > m4/ac_check_icu.m4 gunzip -c m4/ac_check_curl.m4.gz > m4/ac_check_curl.m4 +gunzip -c m4/pkg.m4.gz > m4/pkg.m4 if test -x "`which glibtoolize 2> /dev/null || true`"; then glibtoolize -f -c --automake diff --git a/configure.ac b/configure.ac index 7dbae60f2bb..e4929749496 100644 --- a/configure.ac +++ b/configure.ac @@ -31,6 +31,8 @@ AC_PROG_CC AC_PROG_LIBTOOL AC_PROG_LN_S +PKG_PROG_PKG_CONFIG + dnl Config for google snappy m4_define([snappy_major], [1]) m4_define([snappy_minor], [0]) diff --git a/m4/pkg.m4.gz b/m4/pkg.m4.gz new file mode 100644 index 0000000000000000000000000000000000000000..08b9e6b5963f439a6ca6c6190d8e677733ed08d4 GIT binary patch literal 2202 zcmV;L2xa#liwFqZFz-zO16Y1NKx{d2H2|ep|8m;O75>|Lic^P4aSPbk>2z*#oqH7m z4!t%|e%zasx{8n%*ji|*w8CMgFVxrQll40*350<-nKB*^((d`rk3Hu*XL&)(hgog$ zimG(ydXb7rD+-k7YC&%3Q=(-cW5K(so(iXOR-?kF`iCmniB`PC57rBcMI_yT>Qvs! zR4;0mug7A{f(y<3CY}qQCJe&@Ew*5g zSwJlXTvtmKz9Av89??ofF`nr%SCQdWNJYRXyPD08NG)0H47RQ*zzJ+54|~3K&?gxh z;JI4Dn>hgC-=hoyng~i_F-?LBVJA?2YY#tkM?j{+3AYp*3tBVS~ zQ?cf)cQ##I*6a0Z{p#Y+6&elf)FC^D>G4u{TqNR)C(N1W%8&a|VQY~kfG8xk@nscB|3YLnBOa;}(CTDWWEmKP+x*py6` z_Av@}Ym0Hhl#x-&vPpKTyg3rFP7e!1vo5IxuP?{qp!9&QH8&Y*+v0-2brz zRfSD%5U5A&DcI%o?BR!hJGbq3@7w*epI88D?f#APtKCl(=lW<2oH-xsmIYHX)$5~T z2A^epi9FXTlEUz@>-)P%zmGw)Zsg60wH(JwE!|k7Kqry(C8}WuYm&%7S3x1WpcXPt z^SPaVDY>5GtsD`q3Q=`pp-<^|*I4IoZ}^}?>jbv2AI`Abz1<7SMlJBCa-*Rd(rIbC zb%W(Vz*)%9$%yb82jq*Xn*_Q%F4YSR{Gv7<0I`8jyUUj;| z?Dd)9q{du$51e5!sPAzuOw)1=pGYqW+z1P%deJ?T068hXpzLF2cDayPXGTy3b22;1 zXQt_puOI`aH83j|^TC8sKn=@CqS+%WRg@8akHgJ;u@H-iY0o$~%qQZ@5-mI?gs!{st9^M0#<10X8O&Q#n1YWK?Z>7DB@~d&dQG4HGP^zlq_# zgZ+w1nEIZL8RyxtQlytJ>F*W~dkiz`IJaHY)^3rc`G7CxJgez>0;Ya?f0k7R(N5`J zaz?&R8COnMZV=+-6~8oPLWBon)>JYRy`Y``0G?~x?{1sCztO$Bv(pUE((W5uMlpV= zZ88+)@sqZ(6BanMafg^gnH0zOrTVp5vq%KbFdED4m96pIqC=l?QOW1ssN>xwlw6(C z<=b;#tj@zE2tEVpy(2i3vOzAwv>eE;KJV_oF_zM9tR(~{h`zB_q+Xp zGZ^)Hcx=9ZF4Tq8{0ho9WvTTY7#XNnhy?(RR{)l1mIBx^sICEpMqjWy;8y3R=&CQOMDvssE%o_!AGd!f# zA*(WyW1613Ah|Fd0JGtnxetuVT$Yc6ZU`9AGKN&SK|a)~m~+kjrbxV*`Tq~=9pSy4 z1-_N|in9|&im}sZ-P$(;!!0m*u|$fVxIs%6w%zy|G?w=|4d@d6~-<-xosWH*!-%EOS4V~!2I_m_TGiku!@z? zcOxGoEb8P-EvrIPC#HP!h$5}FQ^9URW}Ua#rw(5ajz+0vw{J&aH)}lHt&i+x?-}yu zAWgVbaDC^gTk@?^kqUf_@OSP*#_dvDSjoxSL`OxN(k`UY!I)*gU`#QCSo?S1Vtg!X zsAvY*?Q+FjJ${^Py?lLsUJ&D7_k0mQXtk`VXmR^p8x;= literal 0 HcmV?d00001