From c222009ae2041c53e2fce319c12b1c1b08dfe4fa Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 11 Mar 2011 22:37:27 +0100 Subject: set PATH to perl --- package/intltool/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package') diff --git a/package/intltool/Makefile b/package/intltool/Makefile index 9ba13fe84..64b54f566 100644 --- a/package/intltool/Makefile +++ b/package/intltool/Makefile @@ -15,6 +15,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,INTLTOOL,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +XAKE_FLAGS+= PERL="/usr/bin/perl" + post-install: $(INSTALL_DIR) $(IDIR_INTLTOOL)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/intltool* \ -- cgit v1.2.3 From f10b10839148312478ddaace130cf9ad1ea09ea9 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 13 Mar 2011 21:28:46 +0100 Subject: remove libnsl, it is not available and/or required --- package/eglibc/Makefile | 2 +- package/glibc/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'package') diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 6f947f515..422171c0c 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -70,7 +70,7 @@ ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) $(CP) $(STAGING_TARGET_DIR)/lib/libssp.so* $(IDIR_EGLIBC)/lib/ endif $(CP) $(STAGING_TARGET_DIR)/lib/ld* $(IDIR_EGLIBC)/lib/ - -for file in libc libcrypt libdl libm libresolv librt libnsl libutil libnss_dns libnss_files; do \ + -for file in libc libcrypt libdl libm libresolv librt libutil libnss_dns libnss_files; do \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_EGLIBC)/lib/; \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_EGLIBC)/lib/; \ done diff --git a/package/glibc/Makefile b/package/glibc/Makefile index 54a0567ac..f992abdf1 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -46,7 +46,7 @@ ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) $(CP) $(STAGING_TARGET_DIR)/lib/libssp.so* $(IDIR_GLIBC)/lib/ endif $(CP) $(STAGING_TARGET_DIR)/lib/ld*.so* $(IDIR_GLIBC)/lib/ - -for file in libc libcrypt libdl libm libresolv librt libnsl libutil libnss_compat libnss_dns libnss_files; do \ + -for file in libc libcrypt libdl libm libresolv librt libutil libnss_compat libnss_dns libnss_files; do \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_GLIBC)/lib/; \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/lib/; \ done -- cgit v1.2.3 From 56e554d65183edf7bcbab7ff04f0d13fa5a4a403 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 13 Mar 2011 22:07:11 +0100 Subject: add a lot of new devel subpackages and fix native builds of packages --- package/apr-util/Makefile | 8 +- package/apr/Makefile | 23 +- package/atk/Makefile | 11 +- package/autoconf/Makefile | 3 +- package/automake/Makefile | 7 +- package/cairo/Makefile | 15 +- package/dbus-glib/Makefile | 17 +- package/dbus/Makefile | 31 +- package/dsniff/patches/patch-confdefs_h | 8 +- package/dsniff/patches/patch-configure | 41 +- package/gettext/Makefile | 4 + package/gtk+/Makefile | 16 +- package/libXdmcp/Makefile | 5 +- package/libffi/Makefile | 15 +- package/libgcrypt/Makefile | 7 +- package/libnet/Makefile | 20 +- package/libnetfilter_log/Makefile | 17 +- package/libnids/Makefile | 16 +- package/libnids/patches/autotool.patch | 2329 +++++++++-------------------- package/libpng/Makefile | 9 +- package/libusb-compat/Makefile | 3 + package/lynx/Makefile | 2 +- package/mysql/Makefile | 3 + package/ncurses/Makefile | 3 + package/neon/patches/patch-neon-config_in | 11 + package/nspr/Makefile | 17 +- package/nss/Makefile | 10 +- package/openldap/Makefile | 2 - package/pango/Makefile | 17 +- package/postgresql/Makefile | 12 +- package/sdl/Makefile | 2 +- package/sqlite/Makefile | 3 - 32 files changed, 983 insertions(+), 1704 deletions(-) create mode 100644 package/neon/patches/patch-neon-config_in (limited to 'package') diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile index 655e2e1c8..53824599e 100644 --- a/package/apr-util/Makefile +++ b/package/apr-util/Makefile @@ -19,13 +19,13 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,APR_UTIL,apr-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ARGS+= --without-berkeley-db \ - --with-apr=${STAGING_TARGET_DIR}/usr \ + --with-apr=${STAGING_DIR}/usr \ --with-expat=${STAGING_TARGET_DIR}/usr -XAKE_FLAGS+= apr_builddir=${STAGING_TARGET_DIR}/usr/share/build-1 \ - apr_builders=${STAGING_TARGET_DIR}/usr/share/build-1 +XAKE_FLAGS+= apr_builddir=${STAGING_DIR}/usr/share/build-1 \ + apr_builders=${STAGING_DIR}/usr/share/build-1 apr-util-install: ${INSTALL_DIR} ${IDIR_APR_UTIL}/usr/lib - ${CP} ${WRKINST}/usr/lib/libaprutil-1.so* ${IDIR_APR_UTIL}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libaprutil-1.so* ${IDIR_APR_UTIL}/usr/lib include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/apr/Makefile b/package/apr/Makefile index 2b6c05305..21052d3a1 100644 --- a/package/apr/Makefile +++ b/package/apr/Makefile @@ -13,12 +13,17 @@ PKG_DEPENDS:= libpthread PKG_URL:= http://apr.apache.org/ PKG_SITES:= http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/ +PKG_SUBPKGS:= APR APR_DEV +PKGSC_APR_DEV:= devel +PKGSD_APR_DEV:= apr headers + PKG_FLAVOURS_APR:= WITH_IPV6 PKGFD_WITH_IPV6:= enable IPv6 support include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,APR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,APR,apr,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,APR_DEV,apr-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_APR_DEV},${PKGSC_APR_DEV})) # uClibc setpgrp does not take arguments CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes @@ -31,21 +36,25 @@ CONFIGURE_ENV+= apr_cv_tcp_nodelay_with_cork=no CONFIGURE_ARGS+= --with-devrandom=/dev/urandom \ --enable-threads -ifneq (${ADK_PACKAGE_LIBPCAP_WITH_IPV6},) +ifneq (${ADK_PACKAGE_APR_WITH_IPV6},) CONFIGURE_ARGS+= --enable-ipv6 else CONFIGURE_ARGS+= --disable-ipv6 endif -post-install: +apr-install: ${INSTALL_DIR} ${IDIR_APR}/usr/lib ${CP} ${WRKINST}/usr/lib/libapr-1.so* ${IDIR_APR}/usr/lib/ - ${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/share/build-1 - ${CP} ${WRKINST}/usr/share/build-1/* ${STAGING_TARGET_DIR}/usr/share/build-1/ + ${INSTALL_DIR} ${STAGING_DIR}/usr/share/build-1 + ${CP} ${WRKINST}/usr/share/build-1/* ${STAGING_DIR}/usr/share/build-1/ # we need to patch paths to get apr-util compiling - $(SED) "s,\(^installbuilddir=\"\)\(.*\),\1${STAGING_TARGET_DIR}\2," \ + $(SED) "s,\(^installbuilddir=\"\)\(.*\),\1${STAGING_DIR}\2," \ ${WRKINST}/usr/bin/apr-1-config - $(SED) "s,\(^datadir=\"\)\(.*\),\1${STAGING_TARGET_DIR}\2," \ + $(SED) "s,\(^datadir=\"\)\(.*\),\1${STAGING_DIR}\2," \ ${WRKINST}/usr/bin/apr-1-config +apr-dev-install: + ${INSTALL_DIR} ${IDIR_APR_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/* ${IDIR_APR_DEV}/usr/include + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/atk/Makefile b/package/atk/Makefile index 5cb821053..b8085ab24 100644 --- a/package/atk/Makefile +++ b/package/atk/Makefile @@ -13,7 +13,9 @@ PKG_BUILDDEP:= glib PKG_URL:= http://www.gnome.org/ PKG_SITES:= ${MASTER_SITE_GNOME:=/atk/1.33/} -PKG_SUBPKGS:= LIBATK +PKG_SUBPKGS:= LIBATK LIBATK_DEV +PKGSC_LIBATK_DEV:= devel +PKGSD_LIBATK_DEV:= libatk headers ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly @@ -22,9 +24,16 @@ endif include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBATK,libatk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,LIBATK_DEV,libatk-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBATK_DEV},${PKGSC_LIBATK_DEV},${PKG_OPTS})) libatk-install: ${INSTALL_DIR} ${IDIR_LIBATK}/usr/lib ${CP} ${WRKINST}/usr/lib/libatk-*.so* ${IDIR_LIBATK}/usr/lib +libatk-dev-install: + ${INSTALL_DIR} ${IDIR_LIBATK_DEV}/usr/lib/pkgconfig + ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc ${IDIR_LIBATK_DEV}/usr/lib/pkgconfig + ${INSTALL_DIR} ${IDIR_LIBATK_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBATK_DEV}/usr/include + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/autoconf/Makefile b/package/autoconf/Makefile index cfe1ee2cc..c499b6127 100644 --- a/package/autoconf/Makefile +++ b/package/autoconf/Makefile @@ -17,7 +17,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,AUTOCONF,autoconf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -XAKE_FLAGS+= PERL="/usr/bin/perl" +XAKE_FLAGS+= PERL="/usr/bin/perl" \ + M4="/usr/bin/m4" autoconf-install: ${INSTALL_DIR} ${IDIR_AUTOCONF}/usr/bin diff --git a/package/automake/Makefile b/package/automake/Makefile index bd2dd204b..97525341e 100644 --- a/package/automake/Makefile +++ b/package/automake/Makefile @@ -25,8 +25,11 @@ automake-install: ${INSTALL_DIR} ${IDIR_AUTOMAKE}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/automake ${IDIR_AUTOMAKE}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/aclocal ${IDIR_AUTOMAKE}/usr/bin - ${INSTALL_DIR} ${IDIR_AUTOMAKE}/usr/share/automake-${PKG_EXTRAVER}/ + ${INSTALL_DIR} ${IDIR_AUTOMAKE}/usr/share/aclocal-${PKG_EXTRAVER} + ${CP} ${WRKINST}/usr/share/aclocal-${PKG_EXTRAVER} \ + ${IDIR_AUTOMAKE}/usr/share/aclocal-${PKG_EXTRAVER} + ${INSTALL_DIR} ${IDIR_AUTOMAKE}/usr/share/automake-${PKG_EXTRAVER} ${CP} ${WRKINST}/usr/share/automake-${PKG_EXTRAVER}/Automake \ - ${IDIR_AUTOMAKE}/usr/share/automake-${PKG_EXTRAVER}/ + ${IDIR_AUTOMAKE}/usr/share/automake-${PKG_EXTRAVER} include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/cairo/Makefile b/package/cairo/Makefile index 5c2a6f96c..a3d957acd 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -14,19 +14,30 @@ PKG_BUILDDEP:= libpng pixman freetype fontconfig libX11 PKG_URL:= http://cairographics.org/ PKG_SITES:= http://cairographics.org/releases/ +PKG_SUBPKGS:= CAIRO CAIRO_DEV +PKGSC_CAIRO_DEV:= devel +PKGSD_CAIRO_DEV:= cairo headers + ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly endif include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,CAIRO,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,CAIRO_DEV,cairo-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_CAIRO_DEV},${PKGSC_CAIRO_DEV},${PKG_OPTS})) CONFIGURE_ARGS+= --enable-ft=yes \ --enable-xlib=yes -post-install: +cairo-install: ${INSTALL_DIR} ${IDIR_CAIRO}/usr/lib ${CP} ${WRKINST}/usr/lib/libcairo.so* ${IDIR_CAIRO}/usr/lib +cairo-dev-install: + ${INSTALL_DIR} ${IDIR_CAIRO_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/* ${IDIR_CAIRO_DEV}/usr/include + ${INSTALL_DIR} ${IDIR_CAIRO_DEV}/usr/lib/pkgconfig + ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc ${IDIR_CAIRO_DEV}/usr/lib/pkgconfig + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/dbus-glib/Makefile b/package/dbus-glib/Makefile index 8ee9e7b97..3ab81d067 100644 --- a/package/dbus-glib/Makefile +++ b/package/dbus-glib/Makefile @@ -14,16 +14,29 @@ PKG_BUILDDEP:= dbus glib PKG_URL:= http://www.freedesktop.org/wiki/Software/DBusBindings PKG_SITES:= http://dbus.freedesktop.org/releases/dbus-glib/ +PKG_SUBPKGS:= DBUS_GLIB DBUS_GLIB_DEV +PKGSC_DBUS_GLIB_DEV:= devel +PKGSD_DBUS_GLIB_DEV:= dbus-glib headers + include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,DBUS_GLIB,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,DBUS_GLIB,dbus-glib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,DBUS_GLIB_DEV,dbus-glib-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBUS_GLIB_DEV},${PKGSC_DBUS_GLIB_DEV})) CONFIGURE_ARGS+= --disable-checks CONFIGURE_ENV+= ac_cv_have_abstract_sockets=no -post-install: +dbus-glib-install: $(INSTALL_DIR) $(IDIR_DBUS_GLIB)/usr/lib $(CP) $(WRKINST)/usr/lib/libdbus-glib-1.so* \ $(IDIR_DBUS_GLIB)/usr/lib +dbus-glib-dev-install: + $(INSTALL_DIR) $(IDIR_DBUS_GLIB_DEV)/usr/include + $(CP) $(WRKINST)/usr/include/* \ + $(IDIR_DBUS_GLIB_DEV)/usr/include + $(INSTALL_DIR) $(IDIR_DBUS_GLIB_DEV)/usr/lib/pkgconfig + ${CP} $(WRKINST)/usr/lib/pkgconfig/*.pc \ + $(IDIR_DBUS_GLIB_DEV)/usr/lib/pkgconfig + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/dbus/Makefile b/package/dbus/Makefile index 2a400abad..fb4f05b67 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -14,13 +14,18 @@ PKG_BUILDDEP:= expat PKG_URL:= http://dbus.freedesktop.org/ PKG_SITES:= http://dbus.freedesktop.org/releases/dbus/ +PKG_SUBPKGS:= DBUS DBUS_DEV +PKGSC_DBUS_DEV:= devel +PKGSD_DBUS_DEV:= DBUS headers + ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly endif include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,DBUS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,DBUS_DEV,dbus-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBUS_DEV},${PKGSC_DBUS_DEV},${PKG_OPTS})) CONFIGURE_ARGS+= --disable-tests \ --disable-abstract-sockets \ @@ -34,16 +39,26 @@ CONFIGURE_ARGS+= --disable-tests \ CONFIGURE_ENV+= ac_cv_have_abstract_sockets=no pre-install: - ${INSTALL_DIR} $(STAGING_TARGET_DIR)/usr/include/dbus-1.0/dbus + ${INSTALL_DIR} $(STAGING_DIR)/usr/include/dbus-1.0/dbus $(CP) $(WRKBUILD)/dbus/dbus-arch-deps.h \ - $(STAGING_TARGET_DIR)/usr/include/dbus-1.0/dbus/ + $(STAGING_DIR)/usr/include/dbus-1.0/dbus -post-install: +dbus-install: ${INSTALL_DIR} ${IDIR_DBUS}/etc ${IDIR_DBUS}/usr/lib \ ${IDIR_DBUS}/usr/bin - ${CP} ${WRKINST}/etc/dbus-1 ${IDIR_DBUS}/etc/ - ${CP} ${WRKINST}/usr/lib/libdbus-1.so* ${IDIR_DBUS}/usr/lib/ - ${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-daemon ${IDIR_DBUS}/usr/bin/ - ${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-launch ${IDIR_DBUS}/usr/bin/ + ${CP} ${WRKINST}/etc/dbus-1 ${IDIR_DBUS}/etc + ${CP} ${WRKINST}/usr/lib/libdbus-1.so* ${IDIR_DBUS}/usr/lib + ${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-daemon ${IDIR_DBUS}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-launch ${IDIR_DBUS}/usr/bin + +dbus-dev-install: + ${INSTALL_DIR} ${IDIR_DBUS_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/* ${IDIR_DBUS_DEV}/usr/include + ${INSTALL_DIR} $(IDIR_DBUS_DEV)/usr/include/dbus-1.0/dbus + $(CP) $(WRKBUILD)/dbus/dbus-arch-deps.h \ + $(IDIR_DBUS_DEV)/usr/include/dbus-1.0/dbus + ${INSTALL_DIR} ${IDIR_DBUS_DEV}/usr/lib/pkgconfig + ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \ + ${IDIR_DBUS_DEV}/usr/lib/pkgconfig include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/dsniff/patches/patch-confdefs_h b/package/dsniff/patches/patch-confdefs_h index 4f38843f8..cf80d6940 100644 --- a/package/dsniff/patches/patch-confdefs_h +++ b/package/dsniff/patches/patch-confdefs_h @@ -1,7 +1,7 @@ $Id$ --- dsniff-2.4.orig/confdefs.h 1970-01-01 00:00:00.000000000 +0100 -+++ dsniff-2.4/confdefs.h 2007-01-23 00:20:53.000000000 +0100 -@@ -0,0 +1,24 @@ ++++ dsniff-2.4/confdefs.h 2011-03-11 21:17:49.000000000 +0100 +@@ -0,0 +1,22 @@ + +#define X_DISPLAY_MISSING 1 +#define STDC_HEADERS 1 @@ -19,10 +19,8 @@ $Id$ +#define HAVE_SOCKET 1 +#define HAVE_STRDUP 1 +#define HAVE_STRSTR 1 -+#define HAVE_LIBNSL 1 ++#define HAVE_LIBRESOLV 1 +#define HAVE_DIRNAME 1 -+#define HAVE_STRLCPY 1 -+#define HAVE_STRLCAT 1 +#define HAVE_STRSEP 1 +#define HAVE_WARNX 1 +#define HAVE_ETHER_NTOA 1 diff --git a/package/dsniff/patches/patch-configure b/package/dsniff/patches/patch-configure index 4808be06d..fe11b83e1 100644 --- a/package/dsniff/patches/patch-configure +++ b/package/dsniff/patches/patch-configure @@ -1,6 +1,6 @@ $Id$ --- dsniff-2.4.orig/configure 2001-03-19 07:52:37.000000000 +0100 -+++ dsniff-2.4/configure 2007-01-23 00:24:04.000000000 +0100 ++++ dsniff-2.4/configure 2011-03-11 21:41:08.000000000 +0100 @@ -16,6 +16,8 @@ ac_help="$ac_help ac_help="$ac_help --with-db=DIR use Berkeley DB (with --enable-compat185) in DIR" @@ -10,9 +10,18 @@ $Id$ --with-libpcap=DIR use libpcap in DIR" ac_help="$ac_help --with-libnet=DIR use libnet in DIR" -@@ -3031,7 +3033,7 @@ if test "${with_libpcap+set}" = set; the - PCAPINC="-I$withval -I$withval/bpf" - PCAPLIB="-L$withval -lpcap" +@@ -3025,13 +3027,13 @@ if test "${with_libpcap+set}" = set; the + ;; + *) + echo "$ac_t""$withval" 1>&6 +- if test -f $withval/pcap.h -a -f $withval/libpcap.a; then ++ if test -f $withval/include/pcap.h -a -f $withval/lib/libpcap.so; then + owd=`pwd` + if cd $withval; then withval=`pwd`; cd $owd; fi +- PCAPINC="-I$withval -I$withval/bpf" +- PCAPLIB="-L$withval -lpcap" ++ PCAPINC="-I$withval/include -I$withval/include/bpf" ++ PCAPLIB="-L$withval/lib -lpcap" elif test -f $withval/include/pcap.h -a \ - -f $withval/include/net/bpf.h -a \ + -f $withval/include/pcap-bpf.h -a \ @@ -102,3 +111,27 @@ $Id$ fi ;; esac +@@ -3183,19 +3218,19 @@ if test "${with_openssl+set}" = set; the + ;; + *) + echo "$ac_t""$withval" 1>&6 +- if test -f $withval/include/openssl/ssl.h -a -f $withval/libssl.a; then ++ if test -f $withval/include/openssl/ssl.h -a -f $withval/lib/libssl.so; then + owd=`pwd` + if cd $withval; then withval=`pwd`; cd $owd; fi + SSLINC="-I$withval/include" +- SSLLIB="-L$withval -lssl -lcrypto" ++ SSLLIB="-L$withval/lib -lssl -lcrypto" + elif test -f $withval/include/openssl/ssl.h -a \ +- -f $withval/lib/libssl.a; then ++ -f $withval/lib/libssl.so; then + owd=`pwd` + if cd $withval; then withval=`pwd`; cd $owd; fi + SSLINC="-I$withval/include" + SSLLIB="-L$withval/lib -lssl -lcrypto" + else +- { echo "configure: error: ssl.h or libssl.a not found in $withval" 1>&2; exit 1; } ++ { echo "configure: error: ssl.h or libssl.so not found in $withval" 1>&2; exit 1; } + fi + WEBMITM="webmitm" + ;; diff --git a/package/gettext/Makefile b/package/gettext/Makefile index 55723a49b..665115d06 100644 --- a/package/gettext/Makefile +++ b/package/gettext/Makefile @@ -64,6 +64,8 @@ libintl-dev-install: gettext-install: ${INSTALL_DIR} ${IDIR_GETTEXT}/usr/bin + $(INSTALL_BIN) $(WRKBUILD)/gettext-tools/src/.libs/xgettext \ + $(IDIR_GETTEXT)/usr/bin $(INSTALL_BIN) $(WRKBUILD)/gettext-runtime/src/.libs/gettext \ $(IDIR_GETTEXT)/usr/bin @@ -78,5 +80,7 @@ msgfmt-install: ${IDIR_MSGFMT}/usr/lib $(INSTALL_BIN) $(WRKBUILD)/gettext-tools/src/.libs/msgfmt \ $(IDIR_MSGFMT)/usr/bin + $(INSTALL_BIN) $(WRKBUILD)/gettext-tools/src/.libs/msgmerge \ + $(IDIR_MSGFMT)/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile index 267962b73..47fad3fa0 100644 --- a/package/gtk+/Makefile +++ b/package/gtk+/Makefile @@ -17,7 +17,9 @@ PKG_URL:= http://www.gtk.org/ PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/gtk+/$(PKG_EXTRAVER)/ PKG_NEED_CXX:= 1 -PKG_SUBPKGS:= LIBGTK +PKG_SUBPKGS:= LIBGTK LIBGTK_DEV +PKGSC_LIBGTK_DEV:= devel +PKGSD_LIBGTK_DEV:= GTK+ headers ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly @@ -26,6 +28,7 @@ endif include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBGTK,libgtk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,LIBGTK_DEV,libgtk-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBGTK_DEV},${PKGSC_LIBGTK_DEV},${PKG_OPTS})) CONFIGURE_ARGS+= --disable-gtk-doc-html \ --disable-modules \ @@ -38,10 +41,19 @@ CONFIGURE_ARGS+= --disable-gtk-doc-html \ CONFIGURE_ENV+= gio_can_sniff=no \ ac_cv_path_GTK_UPDATE_ICON_CACHE="" -post-install: +libgtk-install: ${INSTALL_DIR} ${IDIR_LIBGTK}/usr/lib ${CP} ${WRKINST}/usr/lib/libgdk-x11*so* ${IDIR_LIBGTK}/usr/lib ${CP} ${WRKINST}/usr/lib/libgtk-x11*so* ${IDIR_LIBGTK}/usr/lib ${CP} ${WRKINST}/usr/lib/libgailutil*so* ${IDIR_LIBGTK}/usr/lib +libgtk-dev-install: + ${INSTALL_DIR} ${IDIR_LIBGTK_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBGTK_DEV}/usr/include + ${INSTALL_DIR} ${IDIR_LIBGTK_DEV}/usr/lib/gtk-2.0/include + ${CP} ${WRKINST}/usr/lib/gtk-2.0/include/* \ + ${IDIR_LIBGTK_DEV}/usr/lib/gtk-2.0/include + ${INSTALL_DIR} ${IDIR_LIBGTK_DEV}/usr/lib/pkgconfig + ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc ${IDIR_LIBGTK_DEV}/usr/lib/pkgconfig + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libXdmcp/Makefile b/package/libXdmcp/Makefile index 449c16f67..0bfa0042c 100644 --- a/package/libXdmcp/Makefile +++ b/package/libXdmcp/Makefile @@ -34,5 +34,8 @@ libxdmcp-dev-install: ${INSTALL_DIR} ${IDIR_LIBXDMCP_DEV}/usr/include/X11 ${CP} ${WRKINST}/usr/include/X11/* \ ${IDIR_LIBXDMCP_DEV}/usr/include/X11 - + ${INSTALL_DIR} ${IDIR_LIBXDMCP_DEV}/usr/lib/pkgconfig + ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \ + ${IDIR_LIBXDMCP_DEV}/usr/lib/pkgconfig + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libffi/Makefile b/package/libffi/Makefile index 7f30ccd96..15548dabf 100644 --- a/package/libffi/Makefile +++ b/package/libffi/Makefile @@ -12,12 +12,21 @@ PKG_SECTION:= libs PKG_URL:= http://sourceware.org/libffi/ PKG_SITES:= ftp://sourceware.org/pub/libffi/ +PKG_SUBPKGS:= LIBFFI LIBFFI_DEV +PKGSC_LIBFFI_DEV:= devel +PKGSD_LIBFFI_DEV:= libffi headers + include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBFFI,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBFFI,libffi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBFFI_DEV,libffi-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBFFI_DEV},${PKGSC_LIBFFI_DEV})) -post-install: +libffi-install: ${INSTALL_DIR} ${IDIR_LIBFFI}/usr/lib - ${CP} ${WRKINST}/usr/lib/libffi.so* ${IDIR_LIBFFI}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libffi.so* ${IDIR_LIBFFI}/usr/lib + +libffi-dev-install: + ${INSTALL_DIR} ${IDIR_LIBFFI_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBFFI_DEV}/usr/include include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile index 3da73861c..5f1db374e 100644 --- a/package/libgcrypt/Makefile +++ b/package/libgcrypt/Makefile @@ -32,8 +32,11 @@ libgcrypt-install: ${IDIR_LIBGCRYPT}/usr/lib libgcrypt-dev-install: - ${INSTALL_DIR} ${IDIR_LIBGCRYPT}/usr/include + ${INSTALL_DIR} ${IDIR_LIBGCRYPT_DEV}/usr/include ${CP} ${WRKINST}/usr/include/* \ - ${IDIR_LIBGCRYPT}/usr/include + ${IDIR_LIBGCRYPT_DEV}/usr/include + ${INSTALL_DIR} ${IDIR_LIBGCRYPT_DEV}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/libgcrypt-config \ + ${IDIR_LIBGCRYPT_DEV}/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libnet/Makefile b/package/libnet/Makefile index 04adb4836..7023e0b40 100644 --- a/package/libnet/Makefile +++ b/package/libnet/Makefile @@ -15,8 +15,15 @@ PKG_URL:= http://sourceforge.net/projects/libnet-dev/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libnet-dev/} PKG_NEED_CXX:= 1 +PKG_SUBPKGS:= LIBNET LIBNET_DEV +PKGSC_LIBNET_DEV:= devel +PKGSD_LIBNET_DEV:= libnet headers + include ${TOPDIR}/mk/package.mk +$(eval $(call PKG_template,LIBNET,libnet,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBNET_DEV,libnet-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBNET_DEV},${PKGSC_LIBNET_DEV})) + ENDIAN:=lil ifeq (${CPU_ARCH},mips) ENDIAN:=big @@ -28,13 +35,18 @@ ifeq (${CPU_ARCH},ppc) ENDIAN:=big endif -$(eval $(call PKG_template,LIBNET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - CONFIGURE_ENV+= ac_cv_libnet_endianess=${ENDIAN} \ ac_cv_lbl_unaligned_fail=no -post-install: +libnet-install: ${INSTALL_DIR} ${IDIR_LIBNET}/usr/lib - ${CP} ${WRKINST}/usr/lib/libnet.so* ${IDIR_LIBNET}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libnet.so* ${IDIR_LIBNET}/usr/lib + +libnet-dev-install: + ${INSTALL_DIR} ${IDIR_LIBNET_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBNET_DEV}/usr/include + ${INSTALL_DIR} ${IDIR_LIBNET_DEV}/usr/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/libnet-config \ + ${IDIR_LIBNET_DEV}/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libnetfilter_log/Makefile b/package/libnetfilter_log/Makefile index 8fb6c91df..64047b3e5 100644 --- a/package/libnetfilter_log/Makefile +++ b/package/libnetfilter_log/Makefile @@ -16,13 +16,26 @@ PKG_SITES:= http://www.netfilter.org/projects/libnetfilter_log/files/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +PKG_SUBPKGS:= LIBNETFILTER_LOG LIBNETFILTER_LOG_DEV +PKGSC_LIBNETFILTER_LOG_DEV:= devel +PKGSD_LIBNETFILTER_LOG_DEV:= libnetfilter-log headers + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBNETFILTER_LOG,libnetfilter-log,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBNETFILTER_LOG_DEV,libnetfilter-log-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBNETFILTER_LOG_DEV},${PKGSC_LIBNETFILTER_LOG_DEV})) -post-install: +libnetfilter-log-install: $(INSTALL_DIR) $(IDIR_LIBNETFILTER_LOG)/usr/lib $(CP) $(WRKINST)/usr/lib/libnetfilter_log*so* \ - $(IDIR_LIBNETFILTER_LOG)/usr/lib/ + $(IDIR_LIBNETFILTER_LOG)/usr/lib + +libnetfilter-log-dev-install: + $(INSTALL_DIR) $(IDIR_LIBNETFILTER_LOG_DEV)/usr/include + $(CP) $(WRKINST)/usr/include/* \ + $(IDIR_LIBNETFILTER_LOG_DEV)/usr/include + $(INSTALL_DIR) $(IDIR_LIBNETFILTER_LOG_DEV)/usr/lib/pkgconfig + $(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc \ + $(IDIR_LIBNETFILTER_LOG_DEV)/usr/lib/pkgconfig include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libnids/Makefile b/package/libnids/Makefile index 671aa5f57..0b5ab1dee 100644 --- a/package/libnids/Makefile +++ b/package/libnids/Makefile @@ -14,15 +14,25 @@ PKG_BUILDDEP:= libnet libpcap glib PKG_URL:= http://libnids.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libnids/} +PKG_SUBPKGS:= LIBNIDS LIBNIDS_DEV +PKGSC_LIBNIDS_DEV:= devel +PKGSD_LIBNIDS_DEV:= libnids headers + include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBNIDS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBNIDS,libnids,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBNIDS_DEV,libnids-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBNIDS_DEV},${PKGSC_LIBNIDS_DEV})) +CONFIGURE_ENV+= ac_cv_lib_nsl_gethostbyname=no CONFIGURE_ARGS+= --with-libpcap=${STAGING_TARGET_DIR}/usr XAKE_FLAGS+= install_prefix="${WRKINST}" -post-install: +libnids-install: ${INSTALL_DIR} ${IDIR_LIBNIDS}/usr/lib - ${CP} ${WRKINST}/usr/lib/libnids.so* ${IDIR_LIBNIDS}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libnids.so* ${IDIR_LIBNIDS}/usr/lib + +libnids-dev-install: + ${INSTALL_DIR} ${IDIR_LIBNIDS_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBNIDS_DEV}/usr/include include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libnids/patches/autotool.patch b/package/libnids/patches/autotool.patch index 90a281f0e..b61da48bc 100644 --- a/package/libnids/patches/autotool.patch +++ b/package/libnids/patches/autotool.patch @@ -1,957 +1,16 @@ -diff -Nur libnids-1.23.orig/aclocal.m4 libnids-1.23/aclocal.m4 ---- libnids-1.23.orig/aclocal.m4 2006-05-01 19:14:51.000000000 +0200 -+++ libnids-1.23/aclocal.m4 2010-02-18 22:19:09.952858667 +0100 -@@ -1,833 +1,15 @@ --dnl aclocal.m4 generated automatically by aclocal 1.4-p6 -+# generated automatically by aclocal 1.11.1 -*- Autoconf -*- - --dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. --dnl This file is free software; the Free Software Foundation --dnl gives unlimited permission to copy and/or distribute it, --dnl with or without modifications, as long as this notice is preserved. -- --dnl This program is distributed in the hope that it will be useful, --dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without --dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A --dnl PARTICULAR PURPOSE. -- --# lib-prefix.m4 serial 4 (gettext-0.14.2) --dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. --dnl This file is free software; the Free Software Foundation --dnl gives unlimited permission to copy and/or distribute it, --dnl with or without modifications, as long as this notice is preserved. -- --dnl From Bruno Haible. -- --dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and --dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't --dnl require excessive bracketing. --ifdef([AC_HELP_STRING], --[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], --[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) -- --dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed --dnl to access previously installed libraries. The basic assumption is that --dnl a user will want packages to use other packages he previously installed --dnl with the same --prefix option. --dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate --dnl libraries, but is otherwise very convenient. --AC_DEFUN([AC_LIB_PREFIX], --[ -- AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) -- AC_REQUIRE([AC_PROG_CC]) -- AC_REQUIRE([AC_CANONICAL_HOST]) -- AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) -- dnl By default, look in $includedir and $libdir. -- use_additional=yes -- AC_LIB_WITH_FINAL_PREFIX([ -- eval additional_includedir=\"$includedir\" -- eval additional_libdir=\"$libdir\" -- ]) -- AC_LIB_ARG_WITH([lib-prefix], --[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib -- --without-lib-prefix don't search for libraries in includedir and libdir], --[ -- if test "X$withval" = "Xno"; then -- use_additional=no -- else -- if test "X$withval" = "X"; then -- AC_LIB_WITH_FINAL_PREFIX([ -- eval additional_includedir=\"$includedir\" -- eval additional_libdir=\"$libdir\" -- ]) -- else -- additional_includedir="$withval/include" -- additional_libdir="$withval/lib" -- fi -- fi --]) -- if test $use_additional = yes; then -- dnl Potentially add $additional_includedir to $CPPFLAGS. -- dnl But don't add it -- dnl 1. if it's the standard /usr/include, -- dnl 2. if it's already present in $CPPFLAGS, -- dnl 3. if it's /usr/local/include and we are using GCC on Linux, -- dnl 4. if it doesn't exist as a directory. -- if test "X$additional_includedir" != "X/usr/include"; then -- haveit= -- for x in $CPPFLAGS; do -- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -- if test "X$x" = "X-I$additional_includedir"; then -- haveit=yes -- break -- fi -- done -- if test -z "$haveit"; then -- if test "X$additional_includedir" = "X/usr/local/include"; then -- if test -n "$GCC"; then -- case $host_os in -- linux* | gnu* | k*bsd*-gnu) haveit=yes;; -- esac -- fi -- fi -- if test -z "$haveit"; then -- if test -d "$additional_includedir"; then -- dnl Really add $additional_includedir to $CPPFLAGS. -- CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" -- fi -- fi -- fi -- fi -- dnl Potentially add $additional_libdir to $LDFLAGS. -- dnl But don't add it -- dnl 1. if it's the standard /usr/lib, -- dnl 2. if it's already present in $LDFLAGS, -- dnl 3. if it's /usr/local/lib and we are using GCC on Linux, -- dnl 4. if it doesn't exist as a directory. -- if test "X$additional_libdir" != "X/usr/lib"; then -- haveit= -- for x in $LDFLAGS; do -- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -- if test "X$x" = "X-L$additional_libdir"; then -- haveit=yes -- break -- fi -- done -- if test -z "$haveit"; then -- if test "X$additional_libdir" = "X/usr/local/lib"; then -- if test -n "$GCC"; then -- case $host_os in -- linux*) haveit=yes;; -- esac -- fi -- fi -- if test -z "$haveit"; then -- if test -d "$additional_libdir"; then -- dnl Really add $additional_libdir to $LDFLAGS. -- LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" -- fi -- fi -- fi -- fi -- fi --]) -- --dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, --dnl acl_final_exec_prefix, containing the values to which $prefix and --dnl $exec_prefix will expand at the end of the configure script. --AC_DEFUN([AC_LIB_PREPARE_PREFIX], --[ -- dnl Unfortunately, prefix and exec_prefix get only finally determined -- dnl at the end of configure. -- if test "X$prefix" = "XNONE"; then -- acl_final_prefix="$ac_default_prefix" -- else -- acl_final_prefix="$prefix" -- fi -- if test "X$exec_prefix" = "XNONE"; then -- acl_final_exec_prefix='${prefix}' -- else -- acl_final_exec_prefix="$exec_prefix" -- fi -- acl_save_prefix="$prefix" -- prefix="$acl_final_prefix" -- eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" -- prefix="$acl_save_prefix" --]) -- --dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the --dnl variables prefix and exec_prefix bound to the values they will have --dnl at the end of the configure script. --AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], --[ -- acl_save_prefix="$prefix" -- prefix="$acl_final_prefix" -- acl_save_exec_prefix="$exec_prefix" -- exec_prefix="$acl_final_exec_prefix" -- $1 -- exec_prefix="$acl_save_exec_prefix" -- prefix="$acl_save_prefix" --]) -- --# lib-link.m4 serial 6 (gettext-0.14.3) --dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. --dnl This file is free software; the Free Software Foundation --dnl gives unlimited permission to copy and/or distribute it, --dnl with or without modifications, as long as this notice is preserved. -- --dnl From Bruno Haible. -- --AC_PREREQ(2.50) -- --dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and --dnl the libraries corresponding to explicit and implicit dependencies. --dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and --dnl augments the CPPFLAGS variable. --AC_DEFUN([AC_LIB_LINKFLAGS], --[ -- AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) -- AC_REQUIRE([AC_LIB_RPATH]) -- define([Name],[translit([$1],[./-], [___])]) -- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], -- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) -- AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ -- AC_LIB_LINKFLAGS_BODY([$1], [$2]) -- ac_cv_lib[]Name[]_libs="$LIB[]NAME" -- ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" -- ac_cv_lib[]Name[]_cppflags="$INC[]NAME" -- ]) -- LIB[]NAME="$ac_cv_lib[]Name[]_libs" -- LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" -- INC[]NAME="$ac_cv_lib[]Name[]_cppflags" -- AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) -- AC_SUBST([LIB]NAME) -- AC_SUBST([LTLIB]NAME) -- dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the -- dnl results of this search when this library appears as a dependency. -- HAVE_LIB[]NAME=yes -- undefine([Name]) -- undefine([NAME]) --]) -- --dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) --dnl searches for libname and the libraries corresponding to explicit and --dnl implicit dependencies, together with the specified include files and --dnl the ability to compile and link the specified testcode. If found, it --dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and --dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and --dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs --dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. --AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], --[ -- AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) -- AC_REQUIRE([AC_LIB_RPATH]) -- define([Name],[translit([$1],[./-], [___])]) -- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], -- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) -- -- dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME -- dnl accordingly. -- AC_LIB_LINKFLAGS_BODY([$1], [$2]) -- -- dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, -- dnl because if the user has installed lib[]Name and not disabled its use -- dnl via --without-lib[]Name-prefix, he wants to use it. -- ac_save_CPPFLAGS="$CPPFLAGS" -- AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) -- -- AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ -- ac_save_LIBS="$LIBS" -- LIBS="$LIBS $LIB[]NAME" -- AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) -- LIBS="$ac_save_LIBS" -- ]) -- if test "$ac_cv_lib[]Name" = yes; then -- HAVE_LIB[]NAME=yes -- AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) -- AC_MSG_CHECKING([how to link with lib[]$1]) -- AC_MSG_RESULT([$LIB[]NAME]) -- else -- HAVE_LIB[]NAME=no -- dnl If $LIB[]NAME didn't lead to a usable library, we don't need -- dnl $INC[]NAME either. -- CPPFLAGS="$ac_save_CPPFLAGS" -- LIB[]NAME= -- LTLIB[]NAME= -- fi -- AC_SUBST([HAVE_LIB]NAME) -- AC_SUBST([LIB]NAME) -- AC_SUBST([LTLIB]NAME) -- undefine([Name]) -- undefine([NAME]) --]) -- --dnl Determine the platform dependent parameters needed to use rpath: --dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, --dnl hardcode_direct, hardcode_minus_L. --AC_DEFUN([AC_LIB_RPATH], --[ -- dnl Tell automake >= 1.10 to complain if config.rpath is missing. -- m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])]) -- AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS -- AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld -- AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host -- AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir -- AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ -- CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ -- ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh -- . ./conftest.sh -- rm -f ./conftest.sh -- acl_cv_rpath=done -- ]) -- wl="$acl_cv_wl" -- libext="$acl_cv_libext" -- shlibext="$acl_cv_shlibext" -- hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" -- hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" -- hardcode_direct="$acl_cv_hardcode_direct" -- hardcode_minus_L="$acl_cv_hardcode_minus_L" -- dnl Determine whether the user wants rpath handling at all. -- AC_ARG_ENABLE(rpath, -- [ --disable-rpath do not hardcode runtime library paths], -- :, enable_rpath=yes) --]) -- --dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and --dnl the libraries corresponding to explicit and implicit dependencies. --dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. --AC_DEFUN([AC_LIB_LINKFLAGS_BODY], --[ -- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], -- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) -- dnl By default, look in $includedir and $libdir. -- use_additional=yes -- AC_LIB_WITH_FINAL_PREFIX([ -- eval additional_includedir=\"$includedir\" -- eval additional_libdir=\"$libdir\" -- ]) -- AC_LIB_ARG_WITH([lib$1-prefix], --[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib -- --without-lib$1-prefix don't search for lib$1 in includedir and libdir], --[ -- if test "X$withval" = "Xno"; then -- use_additional=no -- else -- if test "X$withval" = "X"; then -- AC_LIB_WITH_FINAL_PREFIX([ -- eval additional_includedir=\"$includedir\" -- eval additional_libdir=\"$libdir\" -- ]) -- else -- additional_includedir="$withval/include" -- additional_libdir="$withval/lib" -- fi -- fi --]) -- dnl Search the library and its dependencies in $additional_libdir and -- dnl $LDFLAGS. Using breadth-first-seach. -- LIB[]NAME= -- LTLIB[]NAME= -- INC[]NAME= -- rpathdirs= -- ltrpathdirs= -- names_already_handled= -- names_next_round='$1 $2' -- while test -n "$names_next_round"; do -- names_this_round="$names_next_round" -- names_next_round= -- for name in $names_this_round; do -- already_handled= -- for n in $names_already_handled; do -- if test "$n" = "$name"; then -- already_handled=yes -- break -- fi -- done -- if test -z "$already_handled"; then -- names_already_handled="$names_already_handled $name" -- dnl See if it was already located by an earlier AC_LIB_LINKFLAGS -- dnl or AC_LIB_HAVE_LINKFLAGS call. -- uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` -- eval value=\"\$HAVE_LIB$uppername\" -- if test -n "$value"; then -- if test "$value" = yes; then -- eval value=\"\$LIB$uppername\" -- test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" -- eval value=\"\$LTLIB$uppername\" -- test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" -- else -- dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined -- dnl that this library doesn't exist. So just drop it. -- : -- fi -- else -- dnl Search the library lib$name in $additional_libdir and $LDFLAGS -- dnl and the already constructed $LIBNAME/$LTLIBNAME. -- found_dir= -- found_la= -- found_so= -- found_a= -- if test $use_additional = yes; then -- if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then -- found_dir="$additional_libdir" -- found_so="$additional_libdir/lib$name.$shlibext" -- if test -f "$additional_libdir/lib$name.la"; then -- found_la="$additional_libdir/lib$name.la" -- fi -- else -- if test -f "$additional_libdir/lib$name.$libext"; then -- found_dir="$additional_libdir" -- found_a="$additional_libdir/lib$name.$libext" -- if test -f "$additional_libdir/lib$name.la"; then -- found_la="$additional_libdir/lib$name.la" -- fi -- fi -- fi -- fi -- if test "X$found_dir" = "X"; then -- for x in $LDFLAGS $LTLIB[]NAME; do -- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -- case "$x" in -- -L*) -- dir=`echo "X$x" | sed -e 's/^X-L//'` -- if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then -- found_dir="$dir" -- found_so="$dir/lib$name.$shlibext" -- if test -f "$dir/lib$name.la"; then -- found_la="$dir/lib$name.la" -- fi -- else -- if test -f "$dir/lib$name.$libext"; then -- found_dir="$dir" -- found_a="$dir/lib$name.$libext" -- if test -f "$dir/lib$name.la"; then -- found_la="$dir/lib$name.la" -- fi -- fi -- fi -- ;; -- esac -- if test "X$found_dir" != "X"; then -- break -- fi -- done -- fi -- if test "X$found_dir" != "X"; then -- dnl Found the library. -- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" -- if test "X$found_so" != "X"; then -- dnl Linking with a shared library. We attempt to hardcode its -- dnl directory into the executable's runpath, unless it's the -- dnl standard /usr/lib. -- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then -- dnl No hardcoding is needed. -- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" -- else -- dnl Use an explicit option to hardcode DIR into the resulting -- dnl binary. -- dnl Potentially add DIR to ltrpathdirs. -- dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. -- haveit= -- for x in $ltrpathdirs; do -- if test "X$x" = "X$found_dir"; then -- haveit=yes -- break -- fi -- done -- if test -z "$haveit"; then -- ltrpathdirs="$ltrpathdirs $found_dir" -- fi -- dnl The hardcoding into $LIBNAME is system dependent. -- if test "$hardcode_direct" = yes; then -- dnl Using DIR/libNAME.so during linking hardcodes DIR into the -- dnl resulting binary. -- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" -- else -- if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then -- dnl Use an explicit option to hardcode DIR into the resulting -- dnl binary. -- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" -- dnl Potentially add DIR to rpathdirs. -- dnl The rpathdirs will be appended to $LIBNAME at the end. -- haveit= -- for x in $rpathdirs; do -- if test "X$x" = "X$found_dir"; then -- haveit=yes -- break -- fi -- done -- if test -z "$haveit"; then -- rpathdirs="$rpathdirs $found_dir" -- fi -- else -- dnl Rely on "-L$found_dir". -- dnl But don't add it if it's already contained in the LDFLAGS -- dnl or the already constructed $LIBNAME -- haveit= -- for x in $LDFLAGS $LIB[]NAME; do -- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -- if test "X$x" = "X-L$found_dir"; then -- haveit=yes -- break -- fi -- done -- if test -z "$haveit"; then -- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" -- fi -- if test "$hardcode_minus_L" != no; then -- dnl FIXME: Not sure whether we should use -- dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" -- dnl here. -- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" -- else -- dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH -- dnl here, because this doesn't fit in flags passed to the -- dnl compiler. So give up. No hardcoding. This affects only -- dnl very old systems. -- dnl FIXME: Not sure whether we should use -- dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" -- dnl here. -- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" -- fi -- fi -- fi -- fi -- else -- if test "X$found_a" != "X"; then -- dnl Linking with a static library. -- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" -- else -- dnl We shouldn't come here, but anyway it's good to have a -- dnl fallback. -- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" -- fi -- fi -- dnl Assume the include files are nearby. -- additional_includedir= -- case "$found_dir" in -- */lib | */lib/) -- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` -- additional_includedir="$basedir/include" -- ;; -- esac -- if test "X$additional_includedir" != "X"; then -- dnl Potentially add $additional_includedir to $INCNAME. -- dnl But don't add it -- dnl 1. if it's the standard /usr/include, -- dnl 2. if it's /usr/local/include and we are using GCC on Linux, -- dnl 3. if it's already present in $CPPFLAGS or the already -- dnl constructed $INCNAME, -- dnl 4. if it doesn't exist as a directory. -- if test "X$additional_includedir" != "X/usr/include"; then -- haveit= -- if test "X$additional_includedir" = "X/usr/local/include"; then -- if test -n "$GCC"; then -- case $host_os in -- linux* | gnu* | k*bsd*-gnu) haveit=yes;; -- esac -- fi -- fi -- if test -z "$haveit"; then -- for x in $CPPFLAGS $INC[]NAME; do -- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -- if test "X$x" = "X-I$additional_includedir"; then -- haveit=yes -- break -- fi -- done -- if test -z "$haveit"; then -- if test -d "$additional_includedir"; then -- dnl Really add $additional_includedir to $INCNAME. -- INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" -- fi -- fi -- fi -- fi -- fi -- dnl Look for dependencies. -- if test -n "$found_la"; then -- dnl Read the .la file. It defines the variables -- dnl dlname, library_names, old_library, dependency_libs, current, -- dnl age, revision, installed, dlopen, dlpreopen, libdir. -- save_libdir="$libdir" -- case "$found_la" in -- */* | *\\*) . "$found_la" ;; -- *) . "./$found_la" ;; -- esac -- libdir="$save_libdir" -- dnl We use only dependency_libs. -- for dep in $dependency_libs; do -- case "$dep" in -- -L*) -- additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` -- dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. -- dnl But don't add it -- dnl 1. if it's the standard /usr/lib, -- dnl 2. if it's /usr/local/lib and we are using GCC on Linux, -- dnl 3. if it's already present in $LDFLAGS or the already -- dnl constructed $LIBNAME, -- dnl 4. if it doesn't exist as a directory. -- if test "X$additional_libdir" != "X/usr/lib"; then -- haveit= -- if test "X$additional_libdir" = "X/usr/local/lib"; then -- if test -n "$GCC"; then -- case $host_os in -- linux* | gnu* | k*bsd*-gnu) haveit=yes;; -- esac -- fi -- fi -- if test -z "$haveit"; then -- haveit= -- for x in $LDFLAGS $LIB[]NAME; do -- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -- if test "X$x" = "X-L$additional_libdir"; then -- haveit=yes -- break -- fi -- done -- if test -z "$haveit"; then -- if test -d "$additional_libdir"; then -- dnl Really add $additional_libdir to $LIBNAME. -- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" -- fi -- fi -- haveit= -- for x in $LDFLAGS $LTLIB[]NAME; do -- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -- if test "X$x" = "X-L$additional_libdir"; then -- haveit=yes -- break -- fi -- done -- if test -z "$haveit"; then -- if test -d "$additional_libdir"; then -- dnl Really add $additional_libdir to $LTLIBNAME. -- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" -- fi -- fi -- fi -- fi -- ;; -- -R*) -- dir=`echo "X$dep" | sed -e 's/^X-R//'` -- if test "$enable_rpath" != no; then -- dnl Potentially add DIR to rpathdirs. -- dnl The rpathdirs will be appended to $LIBNAME at the end. -- haveit= -- for x in $rpathdirs; do -- if test "X$x" = "X$dir"; then -- haveit=yes -- break -- fi -- done -- if test -z "$haveit"; then -- rpathdirs="$rpathdirs $dir" -- fi -- dnl Potentially add DIR to ltrpathdirs. -- dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. -- haveit= -- for x in $ltrpathdirs; do -- if test "X$x" = "X$dir"; then -- haveit=yes -- break -- fi -- done -- if test -z "$haveit"; then -- ltrpathdirs="$ltrpathdirs $dir" -- fi -- fi -- ;; -- -l*) -- dnl Handle this in the next round. -- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` -- ;; -- *.la) -- dnl Handle this in the next round. Throw away the .la's -- dnl directory; it is already contained in a preceding -L -- dnl option. -- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` -- ;; -- *) -- dnl Most likely an immediate library name. -- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" -- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" -- ;; -- esac -- done -- fi -- else -- dnl Didn't find the library; assume it is in the system directories -- dnl known to the linker and runtime loader. (All the system -- dnl directories known to the linker should also be known to the -- dnl runtime loader, otherwise the system is severely misconfigured.) -- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" -- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" -- fi -- fi -- fi -- done -- done -- if test "X$rpathdirs" != "X"; then -- if test -n "$hardcode_libdir_separator"; then -- dnl Weird platform: only the last -rpath option counts, the user must -- dnl pass all path elements in one option. We can arrange that for a -- dnl single library, but not when more than one $LIBNAMEs are used. -- alldirs= -- for found_dir in $rpathdirs; do -- alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" -- done -- dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. -- acl_save_libdir="$libdir" -- libdir="$alldirs" -- eval flag=\"$hardcode_libdir_flag_spec\" -- libdir="$acl_save_libdir" -- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" -- else -- dnl The -rpath options are cumulative. -- for found_dir in $rpathdirs; do -- acl_save_libdir="$libdir" -- libdir="$found_dir" -- eval flag=\"$hardcode_libdir_flag_spec\" -- libdir="$acl_save_libdir" -- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" -- done -- fi -- fi -- if test "X$ltrpathdirs" != "X"; then -- dnl When using libtool, the option that works for both libraries and -- dnl executables is -R. The -R options are cumulative. -- for found_dir in $ltrpathdirs; do -- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" -- done -- fi --]) -- --dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, --dnl unless already present in VAR. --dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes --dnl contains two or three consecutive elements that belong together. --AC_DEFUN([AC_LIB_APPENDTOVAR], --[ -- for element in [$2]; do -- haveit= -- for x in $[$1]; do -- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -- if test "X$x" = "X$element"; then -- haveit=yes -- break -- fi -- done -- if test -z "$haveit"; then -- [$1]="${[$1]}${[$1]:+ }$element" -- fi -- done --]) -- --# lib-ld.m4 serial 3 (gettext-0.13) --dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. --dnl This file is free software; the Free Software Foundation --dnl gives unlimited permission to copy and/or distribute it, --dnl with or without modifications, as long as this notice is preserved. -- --dnl Subroutines of libtool.m4, --dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision --dnl with libtool.m4. -- --dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. --AC_DEFUN([AC_LIB_PROG_LD_GNU], --[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, --[# I'd rather use --version here, but apparently some GNU ld's only accept -v. --case `$LD -v 2>&1 conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh --fi --ac_prog=ld --if test "$GCC" = yes; then -- # Check if gcc -print-prog-name=ld gives a path. -- AC_MSG_CHECKING([for ld used by GCC]) -- case $host in -- *-*-mingw*) -- # gcc leaves a trailing carriage return which upsets mingw -- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; -- *) -- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; -- esac -- case $ac_prog in -- # Accept absolute paths. -- [[\\/]* | [A-Za-z]:[\\/]*)] -- [re_direlt='/[^/][^/]*/\.\./'] -- # Canonicalize the path of ld -- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` -- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do -- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` -- done -- test -z "$LD" && LD="$ac_prog" -- ;; -- "") -- # If it fails, then pretend we aren't using GCC. -- ac_prog=ld -- ;; -- *) -- # If it is relative, then search for the first ld in PATH. -- with_gnu_ld=unknown -- ;; -- esac --elif test "$with_gnu_ld" = yes; then -- AC_MSG_CHECKING([for GNU ld]) --else -- AC_MSG_CHECKING([for non-GNU ld]) --fi --AC_CACHE_VAL(acl_cv_path_LD, --[if test -z "$LD"; then -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" -- for ac_dir in $PATH; do -- test -z "$ac_dir" && ac_dir=. -- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then -- acl_cv_path_LD="$ac_dir/$ac_prog" -- # Check to see if the program is GNU ld. I'd rather use --version, -- # but apparently some GNU ld's only accept -v. -- # Break only if it was the GNU/non-GNU ld that we prefer. -- case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in -- *GNU* | *'with BFD'*) -- test "$with_gnu_ld" != no && break ;; -- *) -- test "$with_gnu_ld" != yes && break ;; -- esac -- fi -- done -- IFS="$ac_save_ifs" --else -- acl_cv_path_LD="$LD" # Let the user override the test with a path. --fi]) --LD="$acl_cv_path_LD" --if test -n "$LD"; then -- AC_MSG_RESULT($LD) --else -- AC_MSG_RESULT(no) --fi --test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) --AC_LIB_PROG_LD_GNU --]) -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -+# PARTICULAR PURPOSE. - - # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- - # -@@ -862,7 +44,7 @@ - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) - fi - if test -n "$PKG_CONFIG"; then -- _pkg_min_version=m4_ifval([$1], [$1], [0.9.0]) -+ _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) -@@ -898,14 +80,30 @@ - # --------------------------------------------- - m4_define([_PKG_CONFIG], - [if test -n "$PKG_CONFIG"; then -+ if test -n "$$1"; then -+ pkg_cv_[]$1="$$1" -+ else - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) -+ fi - else - pkg_failed=untried - fi[]dnl - ])# _PKG_CONFIG - -+# _PKG_SHORT_ERRORS_SUPPORTED -+# ----------------------------- -+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi[]dnl -+])# _PKG_SHORT_ERRORS_SUPPORTED -+ -+ - # PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], - # [ACTION-IF-NOT-FOUND]) - # -@@ -927,31 +125,41 @@ - _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) - _PKG_CONFIG([$1][_LIBS], [libs], [$2]) - -+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -+and $1[]_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details.]) -+ - if test $pkg_failed = yes; then -- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` -+