diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 22:45:29 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 22:45:29 +0100 |
| commit | 220a96f9926788ed531717f78e44fdf1e7ab3b34 (patch) | |
| tree | 406f65eea71fabd8cf66c2bd1108ec63f8c349ee /package | |
| parent | 38af8185ea05a1c5d1abb32a68a025e3b4afa4d6 (diff) | |
rework architecture / embedded systems concept
Make configuration of new targets cheap.
Just add a new file in target/arch/sys-enabled/foo.
See other files for syntax. While doing runtime tests
with the new infrastructure I've updated a lot of other
stuff:
- gcc 4.5.2
- uClibc 0.9.32-rc1 (NPTL)
- strongswan, php, miredo, parted, util-linux-ng, e2fsprogs
I promise, this is the last big fat commit this year ;)
Diffstat (limited to 'package')
209 files changed, 1736 insertions, 15085 deletions
diff --git a/package/DirectFB/Makefile b/package/DirectFB/Makefile index 056fbb350..8c0522ff2 100644 --- a/package/DirectFB/Makefile +++ b/package/DirectFB/Makefile @@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --with-inputdrivers=linuxinput,keyboard,ps2mouse \ # which then chooses the wrong default emulation (which is # probably the real problem here). LDEMULATION overrides ld's # wrong choice. -ifeq (${ADK_HARDWARE_LEMOTE_YEELONG},y) +ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y) XAKE_FLAGS+= LDEMULATION=elf64ltsmip endif @@ -51,5 +51,4 @@ post-install: ${CP} ${WRKINST}/usr/lib/directfb-1.4-0/interfaces/IDirectFBVideoProvider/*.so \ ${IDIR_DIRECTFB}/usr/lib/directfb-1.4-0/interfaces/IDirectFBVideoProvider/ - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index 430142eaa..6e752a8da 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -21,7 +21,7 @@ PKGSC_GLXINFO:= x11/apps PKGSD_GLXGEARS:= Nice little OpenGL demo application PKGSC_GLXGEARS:= x11/apps -PKG_TARGET_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el +PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el WRKDIST= ${WRKDIR}/Mesa-${PKG_VERSION} @@ -31,7 +31,7 @@ $(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D $(eval $(call PKG_template,GLXINFO,glxinfo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_GLXINFO},${PKGSC_GLXINFO})) $(eval $(call PKG_template,GLXGEARS,glxgears,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_GLXGEARS},${PKGSC_GLXGEARS})) -ifeq (${ADK_HARDWARE_IBM_X40},y) +ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y) DRI_DRIVERS:=i915 endif @@ -42,7 +42,7 @@ CONFIGURE_ARGS+= --disable-static \ --with-dri-drivers=${DRI_DRIVERS},swrast \ --with-demos=xdemos -XAKE_FLAGS+= HOST_CC=${HOSTCC} GLSL_CL=${STAGING_TOOLS}/bin/glslcompile +XAKE_FLAGS+= HOST_CC=${HOSTCC} GLSL_CL=${STAGING_HOST_DIR}/bin/glslcompile post-extract: (cd ${WRKBUILD}; rm -rf config.{cache,status}; \ @@ -55,7 +55,7 @@ post-extract: ${MAKE} -C ${WRKBUILD}/src/glsl ${MAKE} -C ${WRKBUILD}/src/glsl/apps ${CP} ${WRKBUILD}/src/glsl/apps/compile \ - ${STAGING_TOOLS}/bin/glslcompile + ${STAGING_HOST_DIR}/bin/glslcompile ${MAKE} -C ${WRKBUILD}/src/glsl clean pre-configure: @@ -66,7 +66,7 @@ post-install: $(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib/dri $(CP) $(WRKINST)/usr/lib/libGL*.so* \ $(IDIR_MESALIB)/usr/lib -ifeq (${ADK_HARDWARE_IBM_X40},y) +ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y) ${CP} $(WRKINST)/usr/lib/dri/i915_dri.so \ ${IDIR_MESALIB}/usr/lib/dri/ endif diff --git a/package/MesaLib/patches/patch-configs_default b/package/MesaLib/patches/patch-configs_default index e1fb0b669..f954d9831 100644 --- a/package/MesaLib/patches/patch-configs_default +++ b/package/MesaLib/patches/patch-configs_default @@ -5,7 +5,7 @@ # Misc tools and flags SHELL = /bin/sh -MKLIB = $(SHELL) $(TOP)/bin/mklib -+MKLIB = env RANLIB=/Volumes/adk/openadk/cross_x86_glibc/host/bin/i686-openadk-linux-gnu-ranlib AR=/Volumes/adk/openadk/cross_x86_glibc/host/bin/i686-openadk-linux-gnu-ar $(SHELL) $(TOP)/bin/mklib ++MKLIB = env RANLIB=$(RANLIB) AR=$(AR) $(SHELL) $(TOP)/bin/mklib MKLIB_OPTIONS = MKDEP = makedepend MKDEP_OPTIONS = -fdepend diff --git a/package/adkinstall/Makefile b/package/adkinstall/Makefile index 5a64ae14d..d4202d78a 100644 --- a/package/adkinstall/Makefile +++ b/package/adkinstall/Makefile @@ -5,13 +5,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= adkinstall PKG_VERSION:= 1.0 -PKG_RELEASE:= 5 +PKG_RELEASE:= 7 PKG_DESCR:= openadk installer PKG_SECTION:= base PKG_DEPENDS:= parted sfdisk e2fsprogs -PKG_URL:= http://www.openadk.org/ - -PKG_TARGET_DEPENDS:= alix wrap routerboard foxg20 +PKG_URL:= http://openadk.org/ WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 @@ -29,13 +27,16 @@ pre-configure: do-install: ${INSTALL_DIR} $(IDIR_ADKINSTALL)/sbin -ifeq ($(ADK_LINUX_MIPS_RB532),y) +ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB532),y) ${INSTALL_BIN} ./src/adkinstall.rb532 \ $(IDIR_ADKINSTALL)/sbin/adkinstall -else ifeq ($(ADK_LINUX_ARM_FOXG20),y) +else ifeq ($(ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20),y) ${INSTALL_BIN} ./src/adkinstall.foxg20 \ $(IDIR_ADKINSTALL)/sbin/adkinstall -else ifeq ($(ADK_LINUX_MIPS_RB4XX),y) +else ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB411),y) + ${INSTALL_BIN} ./src/adkinstall.rb4xx \ + $(IDIR_ADKINSTALL)/sbin/adkinstall +else ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB433),y) ${INSTALL_BIN} ./src/adkinstall.rb4xx \ $(IDIR_ADKINSTALL)/sbin/adkinstall else diff --git a/package/adkinstall/src/adkinstall b/package/adkinstall/src/adkinstall index 62ab3225a..b9b0e3109 100644 --- a/package/adkinstall/src/adkinstall +++ b/package/adkinstall/src/adkinstall @@ -52,11 +52,18 @@ if [ $rescue -eq 1 ];then rootp=3 cfgfsp=4 start=2 - parted -s /dev/sda unit cyl mkpartfs primary ext2 0 1 - parted -s /dev/sda unit cyl mkpartfs primary ext2 1 2 + parted -s /dev/sda unit cyl mkpart primary ext2 0 1 + check_exit + mke2fs /dev/sda1 + check_exit + parted -s /dev/sda unit cyl mkpart primary ext2 1 2 + check_exit + mke2fs /dev/sda2 check_exit fi -parted -s /dev/sda unit cyl mkpartfs primary ext2 $start $rootsize +parted -s /dev/sda unit cyl mkpart primary ext2 $start $rootsize +check_exit +mke2fs /dev/sda1 check_exit parted -s /dev/sda unit cyl mkpart primary fat32 $rootsize $maxsize check_exit @@ -124,7 +131,7 @@ menuentry "GNU/Linux (OpenADK)" { recordfail insmod ext2 set root=(hd0,3) - linux /boot/vmlinuz-adk root=/dev/sda$rootp ro init=/init panic=10 + linux /boot/kernel root=/dev/sda$rootp ro init=/init panic=10 } menuentry "GNU/Linux (OpenADK) Rescue Mode" { @@ -145,7 +152,7 @@ terminal_input serial menuentry "GNU/Linux (OpenADK)" { insmod ext2 set root=(hd0,1) - linux /boot/vmlinuz-adk root=/dev/sda$rootp ro init=/init panic=10 + linux /boot/kernel root=/dev/sda$rootp ro init=/init panic=10 } EOF fi diff --git a/package/adkinstall/src/adkinstall.foxg20 b/package/adkinstall/src/adkinstall.foxg20 index 4b0251309..61ab65d9d 100644 --- a/package/adkinstall/src/adkinstall.foxg20 +++ b/package/adkinstall/src/adkinstall.foxg20 @@ -17,7 +17,7 @@ parted -s /dev/mmcblk0 mklabel msdos sleep 2 maxsize=$(env LC_ALL=C parted /dev/mmcblk0 -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//') rootsize=$(($maxsize-2)) -parted -s /dev/mmcblk0 unit cyl mkpartfs primary fat32 0 5 +parted -s /dev/mmcblk0 unit cyl mkpart primary fat32 0 5 parted -s /dev/mmcblk0 unit cyl mkpart primary ext2 5 $rootsize parted -s /dev/mmcblk0 unit cyl mkpart primary fat32 $rootsize $maxsize parted -s /dev/mmcblk0 set 1 boot on @@ -25,6 +25,7 @@ sfdisk --change-id /dev/mmcblk0 3 88 >/dev/null 2>&1 sleep 2 sync printf "Creating ext2 filesystem\n" +mkfs.vfat /dev/mmcblk0p1 >/dev/null 2>&1 mke2fs /dev/mmcblk0p2 >/dev/null 2>&1 tune2fs -c0 -i0 /dev/mmcblk0p2 >/dev/null 2>&1 mount -t ext2 /dev/mmcblk0p2 /mnt diff --git a/package/adkinstall/src/adkinstall.rb4xx b/package/adkinstall/src/adkinstall.rb4xx index f96cc7f05..afaea0c39 100644 --- a/package/adkinstall/src/adkinstall.rb4xx +++ b/package/adkinstall/src/adkinstall.rb4xx @@ -1,6 +1,5 @@ #!/bin/sh -# installs a rootfs tar archive from OpenADK onto -# a NAND device +# installs a rootfs tar archive from OpenADK onto a NAND device # special script for routerboard rb4xx if [ -z $1 ];then diff --git a/package/adkinstall/src/adkinstall.rb532 b/package/adkinstall/src/adkinstall.rb532 index e71848325..9f1af0bb6 100644 --- a/package/adkinstall/src/adkinstall.rb532 +++ b/package/adkinstall/src/adkinstall.rb532 @@ -14,12 +14,6 @@ if [ -z $2 ];then printf "Please give your root tar archive as second parameter\n" exit 1 fi -if [ $cfinstall -eq 1 ];then - if [ -z $3 ];then - printf "Please give your kernel as third parameter\n" - exit 1 - fi -fi case $1 in nand) nandinstall=1 @@ -34,6 +28,13 @@ case $1 in esac if [ $cfinstall -eq 1 ];then + if [ -z $3 ];then + printf "Please give your kernel as third parameter\n" + exit 1 + fi +fi + +if [ $cfinstall -eq 1 ];then # create empty partition table printf "Creating partition scheme\n" parted -s /dev/sda mklabel msdos @@ -41,12 +42,13 @@ if [ $cfinstall -eq 1 ];then maxsize=$(env LC_ALL=C parted /dev/sda -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//') rootsize=$(($maxsize-2)) parted -s /dev/sda unit cyl mkpart primary ext2 0 1 - parted -s /dev/sda unit cyl mkpartfs primary ext2 1 $rootsize + parted -s /dev/sda unit cyl mkpart primary ext2 1 $rootsize parted -s /dev/sda unit cyl mkpart primary fat32 $rootsize $maxsize parted -s /dev/sda set 1 boot on sfdisk --change-id /dev/sda 1 27 >/dev/null 2>&1 sfdisk --change-id /dev/sda 3 88 >/dev/null 2>&1 sleep 2 + mke2fs /dev/sda2 sync printf "Installing kernel\n" dd if=$3 of=/dev/sda1 bs=2048 >/dev/null 2>&1 @@ -71,7 +73,6 @@ fi chmod 1777 /mnt/tmp chmod 4755 /mnt/bin/busybox - sync if [ $nandinstall -eq 1 ];then diff --git a/package/alix-switch/Makefile b/package/alix-switch/Makefile index 8fa705bb9..0317fdf7d 100644 --- a/package/alix-switch/Makefile +++ b/package/alix-switch/Makefile @@ -10,8 +10,6 @@ PKG_DESCR:= daemon listening on button events PKG_SECTION:= base PKG_URL:= http://openadk.org/ -PKG_TARGET_DEPENDS:= alix - NO_DISTFILES:= 1 include ${TOPDIR}/mk/package.mk diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile index 86ddd34ca..2d533ef76 100644 --- a/package/apr-util/Makefile +++ b/package/apr-util/Makefile @@ -19,10 +19,10 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,APR_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ARGS+= --without-berkeley-db -CONFIGURE_ARGS+= --with-apr=${STAGING_DIR}/usr -CONFIGURE_ARGS+= --with-expat=${STAGING_DIR}/usr -XAKE_FLAGS+= apr_builddir=${STAGING_DIR}/usr/share/build-1 \ - apr_builders=${STAGING_DIR}/usr/share/build-1 +CONFIGURE_ARGS+= --with-apr=${STAGING_TARGET_DIR}/usr +CONFIGURE_ARGS+= --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 post-install: ${INSTALL_DIR} ${IDIR_APR_UTIL}/usr/lib diff --git a/package/apr/Makefile b/package/apr/Makefile index 08faf55d9..096981833 100644 --- a/package/apr/Makefile +++ b/package/apr/Makefile @@ -41,12 +41,12 @@ endif post-install: ${INSTALL_DIR} ${IDIR_APR}/usr/lib ${CP} ${WRKINST}/usr/lib/libapr-1.so* ${IDIR_APR}/usr/lib/ - ${INSTALL_DIR} ${STAGING_DIR}/usr/share/build-1 - ${CP} ${WRKINST}/usr/share/build-1/* ${STAGING_DIR}/usr/share/build-1/ + ${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/share/build-1 + ${CP} ${WRKINST}/usr/share/build-1/* ${STAGING_TARGET_DIR}/usr/share/build-1/ # we need to patch paths to get apr-util compiling - $(SED) "s,\(^installbuilddir=\"\)\(.*\),\1${STAGING_DIR}\2," \ + $(SED) "s,\(^installbuilddir=\"\)\(.*\),\1${STAGING_TARGET_DIR}\2," \ ${WRKINST}/usr/bin/apr-1-config - $(SED) "s,\(^datadir=\"\)\(.*\),\1${STAGING_DIR}\2," \ + $(SED) "s,\(^datadir=\"\)\(.*\),\1${STAGING_TARGET_DIR}\2," \ ${WRKINST}/usr/bin/apr-1-config include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/arpd/Makefile b/package/arpd/Makefile index 071e4eb7d..3494c2115 100644 --- a/package/arpd/Makefile +++ b/package/arpd/Makefile @@ -20,12 +20,12 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,ARPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ARGS+= --with-libdnet=${STAGING_DIR}/usr \ - --with-libevent=${STAGING_DIR}/usr \ - --with-libpcap=${STAGING_DIR}/usr +CONFIGURE_ARGS+= --with-libdnet=${STAGING_TARGET_DIR}/usr \ + --with-libevent=${STAGING_TARGET_DIR}/usr \ + --with-libpcap=${STAGING_TARGET_DIR}/usr MAKE_FLAGS+= CCOPT="${TARGET_CFLAGS}" \ - INCLS="-I. -I${STAGING_DIR}/usr/include" \ - LIBS="-L${STAGING_DIR}/usr/lib -lpcap -ldnet -levent" + INCLS="-I. -I${STAGING_TARGET_DIR}/usr/include" \ + LIBS="-L${STAGING_TARGET_DIR}/usr/lib -lpcap -ldnet -levent" post-install: ${INSTALL_DIR} ${IDIR_ARPD}/usr/sbin diff --git a/package/arpwatch/Makefile b/package/arpwatch/Makefile index a3e437f64..38444971a 100644 --- a/package/arpwatch/Makefile +++ b/package/arpwatch/Makefile @@ -22,8 +22,8 @@ INSTALL_STYLE:= manual MAKE_FLAGS+= ARPDIR=/etc/arpwatch \ CCOPT="$(TARGET_CFLAGS)" \ - INCLS="-I. -I$(STAGING_DIR)/usr/include" \ - LIBS="-L$(STAGING_DIR)/usr/lib -lpcap" + INCLS="-I. -I$(STAGING_TARGET_DIR)/usr/include" \ + LIBS="-L$(STAGING_TARGET_DIR)/usr/lib -lpcap" do-install: $(INSTALL_DIR) $(IDIR_ARPWATCH)/usr/sbin $(IDIR_ARPWATCH)/etc/arpwatch diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 70baefbd9..bdf44fb96 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -16,7 +16,7 @@ PKG_SITES:= http://downloads.asterisk.org/pub/telephony/asterisk/releases/ PKG_MULTI:= 1 PKG_NOPARALLEL:= 1 -PKG_TARGET_DEPENDS:= !foxboard +PKG_ARCH_DEPENDS:= !cris PKG_SUBPKGS:= ASTERISK ASTERISK_PGSQL ASTERISK_VOICEMAIL ASTERISK_SOUNDS ASTERISK_CHAN_MGCP PKG_SUBPKGS+= ASTERISK_CHAN_SKINNY ASTERISK_CHAN_IAX2 ASTERISK_CODEC_SPEEX ASTERISK_CODEC_GSM @@ -57,9 +57,9 @@ SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_CODEC_GSM}+= asterisk-codec-gsm-install SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_PBX_DUNDI}+= asterisk-pbx-dundi-install SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_RES_AGI}+= asterisk-res-agi-install -CONFIGURE_ARGS= --with-z=${STAGING_DIR}/usr \ - --with-ncurses=${STAGING_DIR}/usr \ - --with-ssl=${STAGING_DIR}/usr \ +CONFIGURE_ARGS= --with-z=${STAGING_TARGET_DIR}/usr \ + --with-ncurses=${STAGING_TARGET_DIR}/usr \ + --with-ssl=${STAGING_TARGET_DIR}/usr \ --disable-xmldoc \ --without-tonezone \ --without-asound \ @@ -91,21 +91,21 @@ else CONFIGURE_ARGS+= --without-gsm endif ifneq (${ADK_PACKAGE_ASTERISK_CODEC_SPEEX},) -CONFIGURE_ARGS+= --with-speex=${STAGING_DIR}/usr -EXTRA_CFLAGS+= -I$(STAGING_DIR)/usr/include/speex +CONFIGURE_ARGS+= --with-speex=${STAGING_TARGET_DIR}/usr +EXTRA_CFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/speex endif ifneq (${ADK_PACKAGE_ASTERISK_FORMAT_VORBIS},) -CONFIGURE_ARGS+= --with-ogg=${STAGING_DIR}/usr \ - --with-vorbis=${STAGING_DIR}/usr +CONFIGURE_ARGS+= --with-ogg=${STAGING_TARGET_DIR}/usr \ + --with-vorbis=${STAGING_TARGET_DIR}/usr TLDFLAGS+= -logg endif ifneq (${ADK_PACKAGE_ASTERISK_CURL},) -CONFIGURE_ARGS+= --with-libcurl=${STAGING_DIR}/usr +CONFIGURE_ARGS+= --with-libcurl=${STAGING_TARGET_DIR}/usr else CONFIGURE_ARGS+= --without-libcurl endif ifneq (${ADK_PACKAGE_ASTERISK_PGSQL},) -CONFIGURE_ARGS+= --with-postgres=${STAGING_DIR}/usr +CONFIGURE_ARGS+= --with-postgres=${STAGING_TARGET_DIR}/usr else CONFIGURE_ARGS+= --without-postgres endif diff --git a/package/aufs2-util/src/Makefile b/package/aufs2-util/src/Makefile index 35c5f6645..544dfc538 100644 --- a/package/aufs2-util/src/Makefile +++ b/package/aufs2-util/src/Makefile @@ -1,5 +1,5 @@ -# Copyright (C) 2005-2009 Junjiro Okajima +# Copyright (C) 2005-2010 Junjiro R. Okajima # # This program, aufs is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,11 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -ifndef KDIR -KDIR = /lib/modules/$(shell uname -r)/build -endif - -CFLAGS += -I${KDIR}/include +CFLAGS += -I./libau CFLAGS += -O -Wall Cmd = umount.aufs auchk aubrsync @@ -27,32 +23,23 @@ Man = aufs.5 Etc = etc_default_aufs Bin = auplink mount.aufs #auctl BinObj = $(addsuffix .o, ${Bin}) -LibSo = libau.so -LibSoObj = rdu.o -LibSoHdr = compat.h LibUtil = libautil.a LibUtilObj = proc_mnt.o br.o plink.o mtab.o LibUtilHdr = au_util.h +export -all: ${Bin} ${Etc} #${LibSo} +all: ${Man} ${Bin} ${Etc} + ${MAKE} -C libau $@ + ln -sf ./libau/libau*.so . ${Bin}: LDFLAGS += -static -s ${Bin}: LDLIBS = -L. -lautil ${BinObj}: %.o: %.c ${LibUtilHdr} ${LibUtil} ${LibUtilObj}: %.o: %.c ${LibUtilHdr} -${LibUtil}: ${LibUtil}(${LibUtilObj}) - -${LibSoObj}: CFLAGS += -fPIC -${LibSoObj}: %.o: %.c ${LibSolHdr} - -# in order to reuse the default rule -Dummy = $(basename $(word 1,${LibSoObj})) -${Dummy}: LDFLAGS += --shared -${Dummy}: LDLIBS += -ldl -lpthread -${Dummy}: ${LibSoObj} -${LibSo}: ${Dummy} - ln -f $< $@ +#${LibUtil}: ${LibUtil}(${LibUtilObj}) +${LibUtil}: $(foreach o, ${LibUtilObj}, ${LibUtil}(${o})) +.NOTPARALLEL: ${LibUtil} etc_default_aufs: c2sh aufs.shlib ${RM} $@ @@ -75,29 +62,32 @@ aufs.5: aufs.in.5 c2tmac .INTERMEDIATE: c2sh c2tmac +Install = install -o root -g root -p install_sbin: File = mount.aufs umount.aufs auplink install_sbin: Tgt = ${DESTDIR}/sbin install_ubin: File = auchk aubrsync #auctl install_ubin: Tgt = ${DESTDIR}/usr/bin -install_man: File = aufs.5 -install_man: Tgt = ${DESTDIR}/usr/share/man/man5 -install_ulib: Opt = -s -install_ulib: File = ${LibSo} -install_ulib: Tgt = ${DESTDIR}/ulib -install_sbin install_ubin install_man install_ulib: ${File} +install_sbin install_ubin: ${File} install -d ${Tgt} - install -m 755 -o root -g root -p ${Opt} ${File} ${Tgt} + ${Install} -m 755 ${File} ${Tgt} install_etc: File = etc_default_aufs install_etc: Tgt = ${DESTDIR}/etc/default/aufs install_etc: ${File} install -d $(dir ${Tgt}) - install -m 644 -o root -g root -p -T ${File} ${Tgt} + ${Install} -m 644 -T ${File} ${Tgt} +install_man: File = aufs.5 +install_man: Tgt = ${DESTDIR}/usr/share/man/man5 +install_man: ${File} + install -d ${Tgt} + ${Install} -m 644 ${File} ${Tgt} +install_ulib: + ${MAKE} -C libau $@ -# do not inlcude install_ulib here -install: install_sbin install_ubin install_etc +install: install_man install_sbin install_ubin install_etc install_ulib clean: - ${RM} ${Man} ${Bin} ${Etc} ${LibUtil} ${LibSo} *~ - ${RM} ${BinObj} ${LibUtilObj} ${LibSoObj} ${Dummy} + ${RM} ${Man} ${Bin} ${Etc} ${LibUtil} libau.so* *~ + ${RM} ${BinObj} ${LibUtilObj} + ${MAKE} -C libau $@ -include priv.mk diff --git a/package/base-files/Config.in.manual b/package/base-files/Config.in.manual index a3180f4dc..68d22bbd2 100644 --- a/package/base-files/Config.in.manual +++ b/package/base-files/Config.in.manual @@ -6,9 +6,9 @@ config ADK_COMPILE_BASE_FILES config ADK_PACKAGE_BASE_FILES prompt "base-files............. basic filesystem structure and scripts" tristate - default y if !ADK_TOOLCHAIN_ONLY select ADK_COMPILE_BASE_FILES depends on !ADK_TOOLCHAIN_ONLY + default y if !ADK_TOOLCHAIN_ONLY help basic filesystem structure and scripts diff --git a/package/base-files/Makefile b/package/base-files/Makefile index f0695966e..7091c8541 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -24,13 +24,14 @@ INSTALL_STYLE:= manual do-install: $(CP) ./src/* $(IDIR_BASE_FILES) # allow this to fail, as there might be no target-specific files to copy - -$(CP) $(TOPDIR)/target/$(ADK_TARGET)/files/* $(IDIR_BASE_FILES) + -$(CP) $(TOPDIR)/target/$(ADK_TARGET_ARCH)/files/* $(IDIR_BASE_FILES) ifeq (${ADK_TARGET_ROOTFS_NFSROOT},y) @echo "#" > $(IDIR_BASE_FILES)/etc/network/interfaces endif - $(SED) 's,@TARGET@,$(ADK_TARGET),g' $(IDIR_BASE_FILES)/etc/ipkg.conf + $(SED) 's,@ARCH@,$(ADK_TARGET_ARCH),g' $(IDIR_BASE_FILES)/etc/ipkg.conf + $(SED) 's,@SYSTEM@,$(ADK_TARGET_SYSTEM),g' $(IDIR_BASE_FILES)/etc/ipkg.conf + $(SED) 's,@LIBC@,$(ADK_TARGET_LIBC),g' $(IDIR_BASE_FILES)/etc/ipkg.conf $(SED) 's,@HOST@,$(ADK_HOST),g' $(IDIR_BASE_FILES)/etc/ipkg.conf - $(SED) 's,@LIBC@,$(ADK_LIBC),g' $(IDIR_BASE_FILES)/etc/ipkg.conf $(SED) 's,@VENDOR@,$(ADK_VENDOR),g' $(IDIR_BASE_FILES)/etc/ipkg.conf echo /bin/sh >${IDIR_BASE_FILES}/etc/shells echo /bin/ash >>${IDIR_BASE_FILES}/etc/shells @@ -61,6 +62,7 @@ endif cat ./files/inittab.serial >> $(IDIR_BASE_FILES)/etc/inittab test -z $(ADK_RUNTIME_CONSOLE_BOTH) || \ cat ./files/inittab.vga >> $(IDIR_BASE_FILES)/etc/inittab + $(SED) 's#@SPEED@#$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)#' $(IDIR_BASE_FILES)/etc/inittab test -z $(ADK_RUNTIME_HOSTNAME) || \ echo $(ADK_RUNTIME_HOSTNAME) > $(IDIR_BASE_FILES)/etc/hostname; \ echo "127.0.0.1 $(ADK_RUNTIME_HOSTNAME)" >> $(IDIR_BASE_FILES)/etc/hosts @@ -69,8 +71,8 @@ endif ${ADK_RUNTIME_PASSWORD}),g" $(IDIR_BASE_FILES)/etc/shadow git log -1|head -1|sed -e 's#commit ##' \ > $(IDIR_BASE_FILES)/etc/adkversion - test -z $(ADK_HW) || \ - echo $(ADK_HW) > $(IDIR_BASE_FILES)/etc/adktarget + test -z $(ADK_TARGET_SYSTEM) || \ + echo $(ADK_TARGET_SYSTEM) > $(IDIR_BASE_FILES)/etc/adktarget ifneq (${ADK_PACKAGE_CONFIG_IN_ETC},) gzip -9c ${TOPDIR}/.config >$(IDIR_BASE_FILES)/etc/adkconfig.gz chmod 600 $(IDIR_BASE_FILES)/etc/adkconfig.gz diff --git a/package/base-files/files/inittab.serial b/package/base-files/files/inittab.serial index b50bddb0c..5de880f2a 100644 --- a/package/base-files/files/inittab.serial +++ b/package/base-files/files/inittab.serial @@ -1 +1 @@ -ttyS0::respawn:/sbin/getty -i -L ttyS0 115200 vt100 +ttyS0::respawn:/sbin/getty -i -L ttyS0 @SPEED@ vt100 diff --git a/package/base-files/src/etc/ipkg.conf b/package/base-files/src/etc/ipkg.conf index edb050116..cef6d2845 100644 --- a/package/base-files/src/etc/ipkg.conf +++ b/package/base-files/src/etc/ipkg.conf @@ -1,3 +1,3 @@ -src @VENDOR@ http://@HOST@/@TARGET@_@LIBC@/packages +src @VENDOR@ http://@HOST@/@SYSTEM@_@ARCH@_@LIBC@/packages dest root / dest ram /tmp diff --git a/package/bind/Makefile b/package/bind/Makefile index 9adff33fd..fdde3bf10 100644 --- a/package/bind/Makefile +++ b/package/bind/Makefile @@ -40,8 +40,8 @@ $(eval $(call PKG_template,BIND_DIG,bind-dig,${PKG_VERSION}-${PKG_RELEASE},${PKG CONFIGURE_ARGS+= --with-randomdev=/dev/urandom \ --disable-threads \ - --with-openssl=${STAGING_DIR}/usr/ \ - --with-libxml2=${STAGING_DIR}/usr/ \ + --with-openssl=${STAGING_TARGET_DIR}/usr/ \ + --with-libxml2=${STAGING_TARGET_DIR}/usr/ \ --enable-epoll \ --with-libtool diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile index 41319a738..9c18f0c13 100644 --- a/package/bitlbee/Makefile +++ b/package/bitlbee/Makefile @@ -37,9 +37,9 @@ CONFIGURE_ARGS:= --target=${REAL_GNU_TARGET_NAME} \ INSTALL_TARGET= install-etc install-bin post-configure: - @echo 'CFLAGS+="-I${STAGING_DIR}/usr/include/iconv"' >> \ + @echo 'CFLAGS+="-I${STAGING_TARGET_DIR}/usr/include/iconv"' >> \ ${WRKBUILD}/Makefile.settings - @echo 'LFLAGS+="-L${STAGING_DIR}/usr/lib"' >> \ + @echo 'LFLAGS+="-L${STAGING_TARGET_DIR}/usr/lib"' >> \ ${WRKBUILD}/Makefile.settings post-install: diff --git a/package/bkeymaps/Makefile b/package/bkeymaps/Makefile index 74f37f91d..0a6bf90d8 100644 --- a/package/bkeymaps/Makefile +++ b/package/bkeymaps/Makefile @@ -9,8 +9,7 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= a68058ab4a81cf9a8dcbaaa7a5df5b11 PKG_DESCR:= binary keymaps for busybox loadkmap PKG_SECTION:= utils -PKG_URL:= http://dev.alpinelinux.org/bkeymaps/ -PKG_SITES:= http://dev.alpinelinux.org/bkeymaps/ +PKG_SITES:= http://openadk.org/distfiles/ PKG_DFLT_BKEYMAPS:= y if ADK_TARGET_WITH_INPUT diff --git a/package/bogofilter/Makefile b/package/bogofilter/Makefile index c56aceddc..4f83f73f4 100644 --- a/package/bogofilter/Makefile +++ b/package/bogofilter/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV+= LIBS="-liconv" \ CONFIGURE_ARGS+= --without-libsqlite3-prefix \ --without-libqdbm-prefix \ --with-included-gsl \ - --with-libdb-prefix=${STAGING_DIR}/usr \ + --with-libdb-prefix=${STAGING_TARGET_DIR}/usr \ --disable-transactions post-install: diff --git a/package/busybox/Makefile b/package/busybox/Makefile index d4b9e8c6a..46752cb72 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= busybox -PKG_VERSION:= 1.17.2 -PKG_RELEASE:= 5 -PKG_MD5SUM:= 7360b7138b899ee7fc885791c740c3c3 +PKG_VERSION:= 1.18.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= f15fe752d8b7012aa5e59f83b88ccb1c PKG_DESCR:= Core utilities for embedded systems PKG_SECTION:= base PKG_URL:= http://www.busybox.net/ diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in index 6fe8f7d33..5462ee98a 100644 --- a/package/busybox/config/util-linux/Config.in +++ b/package/busybox/config/util-linux/Config.in @@ -253,6 +253,7 @@ config BUSYBOX_MKFS_REISER config BUSYBOX_MKFS_VFAT bool "mkfs_vfat" + default y if ADK_TARGET_WITH_MMC default n help Utility to create FAT32 filesystems. diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch index 10519636b..8269c0718 100644 --- a/package/busybox/patches/001-ipkg.patch +++ b/package/busybox/patches/001-ipkg.patch @@ -1,17 +1,17 @@ -diff -Nur busybox-1.17.2.orig/Makefile busybox-1.17.2/Makefile ---- busybox-1.17.2.orig/Makefile 2010-08-23 02:51:08.000000000 +0200 -+++ busybox-1.17.2/Makefile 2010-12-01 22:25:23.000000000 +0100 -@@ -464,6 +464,7 @@ - +diff -Nur busybox-1.18.1.orig/Makefile busybox-1.18.1/Makefile +--- busybox-1.18.1.orig/Makefile 2010-12-21 05:31:43.000000000 +0100 ++++ busybox-1.18.1/Makefile 2010-12-25 22:38:55.000000000 +0100 +@@ -465,6 +465,7 @@ libs-y := \ archival/ \ + archival/libarchive/ \ + archival/libipkg/ \ - archival/libunarchive/ \ console-tools/ \ coreutils/ \ -diff -Nur busybox-1.17.2.orig/archival/Config.src busybox-1.17.2/archival/Config.src ---- busybox-1.17.2.orig/archival/Config.src 2010-08-22 10:21:38.000000000 +0200 -+++ busybox-1.17.2/archival/Config.src 2010-12-01 22:25:23.000000000 +0100 + coreutils/libcoreutils/ \ +diff -Nur busybox-1.18.1.orig/archival/Config.src busybox-1.18.1/archival/Config.src +--- busybox-1.18.1.orig/archival/Config.src 2010-12-20 01:41:26.000000000 +0100 ++++ busybox-1.18.1/archival/Config.src 2010-12-25 22:38:07.000000000 +0100 @@ -202,6 +202,12 @@ are actually slower than gzip at equivalent compression ratios and take up 3.2K of code. @@ -25,20 +25,20 @@ diff -Nur busybox-1.17.2.orig/archival/Config.src busybox-1.17.2/archival/Config config RPM2CPIO bool "rpm2cpio" default y -diff -Nur busybox-1.17.2.orig/archival/Kbuild.src busybox-1.17.2/archival/Kbuild.src ---- busybox-1.17.2.orig/archival/Kbuild.src 2010-08-23 02:44:35.000000000 +0200 -+++ busybox-1.17.2/archival/Kbuild.src 2010-12-01 22:25:23.000000000 +0100 -@@ -23,6 +23,7 @@ - lib-$(CONFIG_LZOP_COMPR_HIGH) += lzo1x_9x.o +diff -Nur busybox-1.18.1.orig/archival/Kbuild.src busybox-1.18.1/archival/Kbuild.src +--- busybox-1.18.1.orig/archival/Kbuild.src 2010-12-20 01:41:26.000000000 +0100 ++++ busybox-1.18.1/archival/Kbuild.src 2010-12-25 22:38:07.000000000 +0100 +@@ -22,6 +22,7 @@ + lib-$(CONFIG_LZOP) += lzop.o bbunzip.o lib-$(CONFIG_GZIP) += gzip.o bbunzip.o lib-$(CONFIG_BZIP2) += bzip2.o bbunzip.o +lib-$(CONFIG_IPKG) += ipkg.o lib-$(CONFIG_UNXZ) += bbunzip.o lib-$(CONFIG_UNLZMA) += bbunzip.o -diff -Nur busybox-1.17.2.orig/archival/ipkg.c busybox-1.17.2/archival/ipkg.c ---- busybox-1.17.2.orig/archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/ipkg.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/ipkg.c busybox-1.18.1/archival/ipkg.c +--- busybox-1.18.1.orig/archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/ipkg.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,28 @@ +/* ipkg.c - the itsy package management system + @@ -68,9 +68,9 @@ diff -Nur busybox-1.17.2.orig/archival/ipkg.c busybox-1.17.2/archival/ipkg.c +{ + return ipkg_op(argc, argv); +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/Kbuild busybox-1.17.2/archival/libipkg/Kbuild ---- busybox-1.17.2.orig/archival/libipkg/Kbuild 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/Kbuild 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/Kbuild busybox-1.18.1/archival/libipkg/Kbuild +--- busybox-1.18.1.orig/archival/libipkg/Kbuild 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/Kbuild 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,60 @@ +# Makefile for busybox +# @@ -132,9 +132,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/Kbuild busybox-1.17.2/archival/li +IPKG_ARCH:=$(TARGET_ARCH) +endif +CFLAGS += -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\"" -diff -Nur busybox-1.17.2.orig/archival/libipkg/args.c busybox-1.17.2/archival/libipkg/args.c ---- busybox-1.17.2.orig/archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/args.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/args.c busybox-1.18.1/archival/libipkg/args.c +--- busybox-1.18.1.orig/archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/args.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,242 @@ +/* args.c - parse command-line args + @@ -378,9 +378,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/args.c busybox-1.17.2/archival/li +{ + bb_error_msg("version %s\n", IPKG_VERSION); +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/args.h busybox-1.17.2/archival/libipkg/args.h ---- busybox-1.17.2.orig/archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/args.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/args.h busybox-1.18.1/archival/libipkg/args.h +--- busybox-1.18.1.orig/archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/args.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,72 @@ +/* args.h - parse command-line args + @@ -454,9 +454,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/args.h busybox-1.17.2/archival/li +void args_usage(const char *complaint); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile.c busybox-1.17.2/archival/libipkg/conffile.c ---- busybox-1.17.2.orig/archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/conffile.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile.c busybox-1.18.1/archival/libipkg/conffile.c +--- busybox-1.18.1.orig/archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/conffile.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,65 @@ +/* conffile.c - the itsy package management system + @@ -523,9 +523,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile.c busybox-1.17.2/archiva + + return ret; +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile.h busybox-1.17.2/archival/libipkg/conffile.h ---- busybox-1.17.2.orig/archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/conffile.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile.h busybox-1.18.1/archival/libipkg/conffile.h +--- busybox-1.18.1.orig/archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/conffile.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,30 @@ +/* conffile.h - the itsy package management system + @@ -557,9 +557,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile.h busybox-1.17.2/archiva + +#endif + -diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile_list.c busybox-1.17.2/archival/libipkg/conffile_list.c ---- busybox-1.17.2.orig/archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/conffile_list.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile_list.c busybox-1.18.1/archival/libipkg/conffile_list.c +--- busybox-1.18.1.orig/archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/conffile_list.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,47 @@ +/* conffile_list.c - the itsy package management system + @@ -608,9 +608,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile_list.c busybox-1.17.2/ar + return nv_pair_list_pop(list); +} + -diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile_list.h busybox-1.17.2/archival/libipkg/conffile_list.h ---- busybox-1.17.2.orig/archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/conffile_list.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/conffile_list.h busybox-1.18.1/archival/libipkg/conffile_list.h +--- busybox-1.18.1.orig/archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/conffile_list.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,36 @@ +/* conffile_list.h - the itsy package management system + @@ -648,9 +648,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/conffile_list.h busybox-1.17.2/ar + +#endif + -diff -Nur busybox-1.17.2.orig/archival/libipkg/file_util.c busybox-1.17.2/archival/libipkg/file_util.c ---- busybox-1.17.2.orig/archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/file_util.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/file_util.c busybox-1.18.1/archival/libipkg/file_util.c +--- busybox-1.18.1.orig/archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/file_util.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,186 @@ +/* file_util.c - convenience routines for common stat operations + @@ -838,9 +838,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/file_util.c busybox-1.17.2/archiv + return hash_file(file_name, HASH_MD5); +} + -diff -Nur busybox-1.17.2.orig/archival/libipkg/file_util.h busybox-1.17.2/archival/libipkg/file_util.h ---- busybox-1.17.2.orig/archival/libipkg/file_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/file_util.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/file_util.h busybox-1.18.1/archival/libipkg/file_util.h +--- busybox-1.18.1.orig/archival/libipkg/file_util.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/file_util.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,29 @@ +/* file_util.h - convenience routines for common file operations + @@ -871,9 +871,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/file_util.h busybox-1.17.2/archiv +uint8_t *file_md5sum_alloc(const char *file_name); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/hash_table.c busybox-1.17.2/archival/libipkg/hash_table.c ---- busybox-1.17.2.orig/archival/libipkg/hash_table.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/hash_table.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/hash_table.c busybox-1.18.1/archival/libipkg/hash_table.c +--- busybox-1.18.1.orig/archival/libipkg/hash_table.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/hash_table.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,155 @@ +/* hash.c - hash tables for ipkg + @@ -1030,9 +1030,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/hash_table.c busybox-1.17.2/archi + } +} + -diff -Nur busybox-1.17.2.orig/archival/libipkg/hash_table.h busybox-1.17.2/archival/libipkg/hash_table.h ---- busybox-1.17.2.orig/archival/libipkg/hash_table.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/hash_table.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/hash_table.h busybox-1.18.1/archival/libipkg/hash_table.h +--- busybox-1.18.1.orig/archival/libipkg/hash_table.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/hash_table.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,44 @@ +/* hash.h - hash tables for ipkg + @@ -1078,9 +1078,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/hash_table.h busybox-1.17.2/archi +void hash_table_foreach(hash_table_t *hash, void (*f)(const char *key, void *entry, void *data), void *data); + +#endif /* _HASH_TABLE_H_ */ -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg.h busybox-1.17.2/archival/libipkg/ipkg.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg.h busybox-1.18.1/archival/libipkg/ipkg.h +--- busybox-1.18.1.orig/archival/libipkg/ipkg.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,68 @@ +/* ipkg.h - the itsy package management system + @@ -1150,9 +1150,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg.h busybox-1.17.2/archival/li +typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t; + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.c busybox-1.17.2/archival/libipkg/ipkg_cmd.c ---- busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_cmd.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.18.1/archival/libipkg/ipkg_cmd.c +--- busybox-1.18.1.orig/archival/libipkg/ipkg_cmd.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_cmd.c 2010-12-25 22:47:47.000000000 +0100 @@ -0,0 +1,1366 @@ +/* ipkg_cmd.c - the itsy package management system + @@ -1193,7 +1193,7 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.c busybox-1.17.2/archiva +#include "pkg.h" +#include "file_util.h" +#include "str_util.h" -+#include "unarchive.h" ++#include "archive.h" + +#include <fnmatch.h> + @@ -2520,9 +2520,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.c busybox-1.17.2/archiva +} + + -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.h busybox-1.17.2/archival/libipkg/ipkg_cmd.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_cmd.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.18.1/archival/libipkg/ipkg_cmd.h +--- busybox-1.18.1.orig/archival/libipkg/ipkg_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_cmd.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,41 @@ +/* ipkg_cmd.h - the itsy package management system + @@ -2565,9 +2565,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_cmd.h busybox-1.17.2/archiva +int pkg_mark_provides(pkg_t *pkg); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_conf.c busybox-1.17.2/archival/libipkg/ipkg_conf.c ---- busybox-1.17.2.orig/archival/libipkg/ipkg_conf.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_conf.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_conf.c busybox-1.18.1/archival/libipkg/ipkg_conf.c +--- busybox-1.18.1.orig/archival/libipkg/ipkg_conf.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_conf.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,711 @@ +/* ipkg_conf.c - the itsy package management system + @@ -3280,9 +3280,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_conf.c busybox-1.17.2/archiv + sprintf_alloc(&root_filename, "%s%s", (conf->offline_root ? conf->offline_root : ""), filename); + return root_filename; +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_conf.h busybox-1.17.2/archival/libipkg/ipkg_conf.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg_conf.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_conf.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_conf.h busybox-1.18.1/archival/libipkg/ipkg_conf.h +--- busybox-1.18.1.orig/archival/libipkg/ipkg_conf.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_conf.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,107 @@ +/* ipkg_conf.h - the itsy package management system + @@ -3391,9 +3391,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_conf.h busybox-1.17.2/archiv +char *root_filename_alloc(ipkg_conf_t *conf, char *filename); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_configure.c busybox-1.17.2/archival/libipkg/ipkg_configure.c ---- busybox-1.17.2.orig/archival/libipkg/ipkg_configure.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_configure.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_configure.c busybox-1.18.1/archival/libipkg/ipkg_configure.c +--- busybox-1.18.1.orig/archival/libipkg/ipkg_configure.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_configure.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,40 @@ +/* ipkg_configure.c - the itsy package management system + @@ -3435,9 +3435,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_configure.c busybox-1.17.2/a + return 0; +} + -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_configure.h busybox-1.17.2/archival/libipkg/ipkg_configure.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg_configure.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_configure.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_configure.h busybox-1.18.1/archival/libipkg/ipkg_configure.h +--- busybox-1.18.1.orig/archival/libipkg/ipkg_configure.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_configure.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,25 @@ +/* ipkg_configure.h - the itsy package management system + @@ -3464,9 +3464,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_configure.h busybox-1.17.2/a +int ipkg_configure(ipkg_conf_t *ipkg_conf, pkg_t *pkg); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_download.c busybox-1.17.2/archival/libipkg/ipkg_download.c ---- busybox-1.17.2.orig/archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_download.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_download.c busybox-1.18.1/archival/libipkg/ipkg_download.c +--- busybox-1.18.1.orig/archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_download.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,195 @@ +/* ipkg_download.c - the itsy package management system + @@ -3663,9 +3663,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_download.c busybox-1.17.2/ar + } + return 0; +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_download.h busybox-1.17.2/archival/libipkg/ipkg_download.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg_download.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_download.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_download.h busybox-1.18.1/archival/libipkg/ipkg_download.h +--- busybox-1.18.1.orig/archival/libipkg/ipkg_download.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_download.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,30 @@ +/* ipkg_download.h - the itsy package management system + @@ -3697,9 +3697,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_download.h busybox-1.17.2/ar +int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_includes.h busybox-1.17.2/archival/libipkg/ipkg_includes.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg_includes.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_includes.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_includes.h busybox-1.18.1/archival/libipkg/ipkg_includes.h +--- busybox-1.18.1.orig/archival/libipkg/ipkg_includes.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_includes.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,82 @@ +#ifndef IPKG_INCLUDES_H +#define IPKG_INCLUDES_H @@ -3783,9 +3783,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_includes.h busybox-1.17.2/ar +#include <mntent.h> + +#endif /* IPKG_INCLUDES_H */ -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_install.c busybox-1.17.2/archival/libipkg/ipkg_install.c ---- busybox-1.17.2.orig/archival/libipkg/ipkg_install.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_install.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_install.c busybox-1.18.1/archival/libipkg/ipkg_install.c +--- busybox-1.18.1.orig/archival/libipkg/ipkg_install.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_install.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,1982 @@ +/* ipkg_install.c - the itsy package management system + @@ -5769,9 +5769,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_install.c busybox-1.17.2/arc +} + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_install.h busybox-1.17.2/archival/libipkg/ipkg_install.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg_install.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_install.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_install.h busybox-1.18.1/archival/libipkg/ipkg_install.h +--- busybox-1.18.1.orig/archival/libipkg/ipkg_install.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_install.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,35 @@ +/* ipkg_install.h - the itsy package management system + @@ -5808,9 +5808,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_install.h busybox-1.17.2/arc +int name_mark_dependencies_for_installation(ipkg_conf_t *conf, const char *pkg_name, pkg_vec_t *pkgs_needed); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_message.c busybox-1.17.2/archival/libipkg/ipkg_message.c ---- busybox-1.17.2.orig/archival/libipkg/ipkg_message.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_message.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_message.c busybox-1.18.1/archival/libipkg/ipkg_message.c +--- busybox-1.18.1.orig/archival/libipkg/ipkg_message.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_message.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,35 @@ +/* ipkg_message.c - the itsy package management system + @@ -5847,9 +5847,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_message.c busybox-1.17.2/arc + ipkg_cb_message(conf,level,ts); + } +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_message.h busybox-1.17.2/archival/libipkg/ipkg_message.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg_message.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_message.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_message.h busybox-1.18.1/archival/libipkg/ipkg_message.h +--- busybox-1.18.1.orig/archival/libipkg/ipkg_message.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_message.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,32 @@ +/* ipkg_message.h - the itsy package management system + @@ -5883,9 +5883,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_message.h busybox-1.17.2/arc +extern void ipkg_message(ipkg_conf_t *conf, message_level_t level, const char *fmt, ...); + +#endif /* _IPKG_MESSAGE_H_ */ -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_remove.c busybox-1.17.2/archival/libipkg/ipkg_remove.c ---- busybox-1.17.2.orig/archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_remove.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_remove.c busybox-1.18.1/archival/libipkg/ipkg_remove.c +--- busybox-1.18.1.orig/archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_remove.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,385 @@ +/* ipkg_remove.c - the itsy package management system + @@ -6272,9 +6272,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_remove.c busybox-1.17.2/arch + + return 0; +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_remove.h busybox-1.17.2/archival/libipkg/ipkg_remove.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg_remove.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_remove.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_remove.h busybox-1.18.1/archival/libipkg/ipkg_remove.h +--- busybox-1.18.1.orig/archival/libipkg/ipkg_remove.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_remove.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,33 @@ +/* ipkg_remove.h - the itsy package management system + @@ -6309,9 +6309,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_remove.h busybox-1.17.2/arch + + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_upgrade.c busybox-1.17.2/archival/libipkg/ipkg_upgrade.c ---- busybox-1.17.2.orig/archival/libipkg/ipkg_upgrade.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_upgrade.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.18.1/archival/libipkg/ipkg_upgrade.c +--- busybox-1.18.1.orig/archival/libipkg/ipkg_upgrade.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_upgrade.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,79 @@ +/* ipkg_upgrade.c - the itsy package management system + @@ -6392,9 +6392,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_upgrade.c busybox-1.17.2/arc + new->state_flag |= SF_USER; + return ipkg_install_pkg(conf, new,1); +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_upgrade.h busybox-1.17.2/archival/libipkg/ipkg_upgrade.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg_upgrade.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_upgrade.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.18.1/archival/libipkg/ipkg_upgrade.h +--- busybox-1.18.1.orig/archival/libipkg/ipkg_upgrade.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_upgrade.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,18 @@ +/* ipkg_upgrade.c - the itsy package management system + @@ -6414,9 +6414,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_upgrade.h busybox-1.17.2/arc +#include "ipkg.h" + +int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old); -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_utils.c busybox-1.17.2/archival/libipkg/ipkg_utils.c ---- busybox-1.17.2.orig/archival/libipkg/ipkg_utils.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_utils.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_utils.c busybox-1.18.1/archival/libipkg/ipkg_utils.c +--- busybox-1.18.1.orig/archival/libipkg/ipkg_utils.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_utils.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,185 @@ +/* ipkg_utils.c - the itsy package management system + @@ -6603,9 +6603,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_utils.c busybox-1.17.2/archi +} + + -diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_utils.h busybox-1.17.2/archival/libipkg/ipkg_utils.h ---- busybox-1.17.2.orig/archival/libipkg/ipkg_utils.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/ipkg_utils.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/ipkg_utils.h busybox-1.18.1/archival/libipkg/ipkg_utils.h +--- busybox-1.18.1.orig/archival/libipkg/ipkg_utils.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/ipkg_utils.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,29 @@ +/* ipkg_utils.h - the itsy package management system + @@ -6636,9 +6636,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/ipkg_utils.h busybox-1.17.2/archi +int line_is_blank(const char *line); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/libipkg.c busybox-1.17.2/archival/libipkg/libipkg.c ---- busybox-1.17.2.orig/archival/libipkg/libipkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/libipkg.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/libipkg.c busybox-1.18.1/archival/libipkg/libipkg.c +--- busybox-1.18.1.orig/archival/libipkg/libipkg.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/libipkg.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,583 @@ +/* ipkglib.c - the itsy package management system + @@ -7223,9 +7223,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/libipkg.c busybox-1.17.2/archival + + return err; +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/libipkg.h busybox-1.17.2/archival/libipkg/libipkg.h ---- busybox-1.17.2.orig/archival/libipkg/libipkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/libipkg.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/libipkg.h busybox-1.18.1/archival/libipkg/libipkg.h +--- busybox-1.18.1.orig/archival/libipkg/libipkg.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/libipkg.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,78 @@ +/* ipkglib.h - the itsy package management system + @@ -7305,9 +7305,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/libipkg.h busybox-1.17.2/archival +extern void free_error_list(struct errlist **errors); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/nv_pair.c busybox-1.17.2/archival/libipkg/nv_pair.c ---- busybox-1.17.2.orig/archival/libipkg/nv_pair.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/nv_pair.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/nv_pair.c busybox-1.18.1/archival/libipkg/nv_pair.c +--- busybox-1.18.1.orig/archival/libipkg/nv_pair.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/nv_pair.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,40 @@ +/* nv_pair.c - the itsy package management system + @@ -7349,9 +7349,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/nv_pair.c busybox-1.17.2/archival +} + + -diff -Nur busybox-1.17.2.orig/archival/libipkg/nv_pair.h busybox-1.17.2/archival/libipkg/nv_pair.h ---- busybox-1.17.2.orig/archival/libipkg/nv_pair.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/nv_pair.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/nv_pair.h busybox-1.18.1/archival/libipkg/nv_pair.h +--- busybox-1.18.1.orig/archival/libipkg/nv_pair.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/nv_pair.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,32 @@ +/* nv_pair.h - the itsy package management system + @@ -7385,9 +7385,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/nv_pair.h busybox-1.17.2/archival + +#endif + -diff -Nur busybox-1.17.2.orig/archival/libipkg/nv_pair_list.c busybox-1.17.2/archival/libipkg/nv_pair_list.c ---- busybox-1.17.2.orig/archival/libipkg/nv_pair_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/nv_pair_list.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/nv_pair_list.c busybox-1.18.1/archival/libipkg/nv_pair_list.c +--- busybox-1.18.1.orig/archival/libipkg/nv_pair_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/nv_pair_list.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,98 @@ +/* nv_pair_list.c - the itsy package management system + @@ -7487,9 +7487,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/nv_pair_list.c busybox-1.17.2/arc + } + return NULL; +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/nv_pair_list.h busybox-1.17.2/archival/libipkg/nv_pair_list.h ---- busybox-1.17.2.orig/archival/libipkg/nv_pair_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/nv_pair_list.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/nv_pair_list.h busybox-1.18.1/archival/libipkg/nv_pair_list.h +--- busybox-1.18.1.orig/archival/libipkg/nv_pair_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/nv_pair_list.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,60 @@ +/* nv_pair_list.h - the itsy package management system + @@ -7551,9 +7551,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/nv_pair_list.h busybox-1.17.2/arc + +#endif + -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg.c busybox-1.17.2/archival/libipkg/pkg.c ---- busybox-1.17.2.orig/archival/libipkg/pkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg.c busybox-1.18.1/archival/libipkg/pkg.c +--- busybox-1.18.1.orig/archival/libipkg/pkg.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,1757 @@ +/* pkg.c - the itsy package management system + @@ -9312,9 +9312,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg.c busybox-1.17.2/archival/lib + } + return 0; +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg.h busybox-1.17.2/archival/libipkg/pkg.h ---- busybox-1.17.2.orig/archival/libipkg/pkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg.h busybox-1.18.1/archival/libipkg/pkg.h +--- busybox-1.18.1.orig/archival/libipkg/pkg.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,229 @@ +/* pkg.h - the itsy package management system + @@ -9545,9 +9545,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg.h busybox-1.17.2/archival/lib +int pkg_write_changed_filelists(ipkg_conf_t *conf); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_depends.c busybox-1.17.2/archival/libipkg/pkg_depends.c ---- busybox-1.17.2.orig/archival/libipkg/pkg_depends.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_depends.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_depends.c busybox-1.18.1/archival/libipkg/pkg_depends.c +--- busybox-1.18.1.orig/archival/libipkg/pkg_depends.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_depends.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,1032 @@ +/* pkg_depends.c - the itsy package management system + @@ -10581,9 +10581,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_depends.c busybox-1.17.2/arch + + return 0; +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_depends.h busybox-1.17.2/archival/libipkg/pkg_depends.h ---- busybox-1.17.2.orig/archival/libipkg/pkg_depends.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_depends.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_depends.h busybox-1.18.1/archival/libipkg/pkg_depends.h +--- busybox-1.18.1.orig/archival/libipkg/pkg_depends.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_depends.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,105 @@ +/* pkg_depends.h - the itsy package management system + @@ -10690,9 +10690,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_depends.h busybox-1.17.2/arch +int pkg_dependence_satisfied(depend_t *depend); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_dest.c busybox-1.17.2/archival/libipkg/pkg_dest.c ---- busybox-1.17.2.orig/archival/libipkg/pkg_dest.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_dest.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_dest.c busybox-1.18.1/archival/libipkg/pkg_dest.c +--- busybox-1.18.1.orig/archival/libipkg/pkg_dest.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_dest.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,92 @@ +/* pkg_dest.c - the itsy package management system + @@ -10786,9 +10786,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_dest.c busybox-1.17.2/archiva + + dest->root_dir = NULL; +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_dest.h busybox-1.17.2/archival/libipkg/pkg_dest.h ---- busybox-1.17.2.orig/archival/libipkg/pkg_dest.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_dest.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_dest.h busybox-1.18.1/archival/libipkg/pkg_dest.h +--- busybox-1.18.1.orig/archival/libipkg/pkg_dest.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_dest.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,38 @@ +/* pkg_dest.h - the itsy package management system + @@ -10828,9 +10828,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_dest.h busybox-1.17.2/archiva + +#endif + -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_dest_list.c busybox-1.17.2/archival/libipkg/pkg_dest_list.c ---- busybox-1.17.2.orig/archival/libipkg/pkg_dest_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_dest_list.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.18.1/archival/libipkg/pkg_dest_list.c +--- busybox-1.18.1.orig/archival/libipkg/pkg_dest_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_dest_list.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,85 @@ +/* pkg_dest_list.c - the itsy package management system + @@ -10917,9 +10917,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_dest_list.c busybox-1.17.2/ar +{ + return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list); +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_dest_list.h busybox-1.17.2/archival/libipkg/pkg_dest_list.h ---- busybox-1.17.2.orig/archival/libipkg/pkg_dest_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_dest_list.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.18.1/archival/libipkg/pkg_dest_list.h +--- busybox-1.18.1.orig/archival/libipkg/pkg_dest_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_dest_list.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,50 @@ +/* pkg_dest_list.h - the itsy package management system + @@ -10971,9 +10971,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_dest_list.h busybox-1.17.2/ar + +#endif + -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_extract.c busybox-1.17.2/archival/libipkg/pkg_extract.c ---- busybox-1.17.2.orig/archival/libipkg/pkg_extract.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_extract.c 2010-12-01 22:27:00.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_extract.c busybox-1.18.1/archival/libipkg/pkg_extract.c +--- busybox-1.18.1.orig/archival/libipkg/pkg_extract.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_extract.c 2010-12-25 22:48:39.000000000 +0100 @@ -0,0 +1,255 @@ +/* pkg_extract.c - the itsy package management system + @@ -11002,7 +11002,7 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_extract.c busybox-1.17.2/arch +#include "libbb.h" +#include "file_util.h" +#include "sprintf_alloc.h" -+#include "unarchive.h" ++#include "archive.h" + +#define IPKG_CONTROL_ARCHIVE "control.tar.gz" +#define IPKG_DATA_ARCHIVE "data.tar.gz" @@ -11230,9 +11230,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_extract.c busybox-1.17.2/arch + + return 0; +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_extract.h busybox-1.17.2/archival/libipkg/pkg_extract.h ---- busybox-1.17.2.orig/archival/libipkg/pkg_extract.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_extract.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_extract.h busybox-1.18.1/archival/libipkg/pkg_extract.h +--- busybox-1.18.1.orig/archival/libipkg/pkg_extract.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_extract.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,32 @@ +/* pkg_extract.c - the itsy package management system + @@ -11266,9 +11266,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_extract.h busybox-1.17.2/arch +int pkg_extract_data_file_names_to_stream(pkg_t *pkg, FILE *file); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_hash.c busybox-1.17.2/archival/libipkg/pkg_hash.c ---- busybox-1.17.2.orig/archival/libipkg/pkg_hash.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_hash.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_hash.c busybox-1.18.1/archival/libipkg/pkg_hash.c +--- busybox-1.18.1.orig/archival/libipkg/pkg_hash.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_hash.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,623 @@ +/* ipkg_hash.c - the itsy package management system + @@ -11893,9 +11893,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_hash.c busybox-1.17.2/archiva +} + + -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_hash.h busybox-1.17.2/archival/libipkg/pkg_hash.h ---- busybox-1.17.2.orig/archival/libipkg/pkg_hash.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_hash.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_hash.h busybox-1.18.1/archival/libipkg/pkg_hash.h +--- busybox-1.18.1.orig/archival/libipkg/pkg_hash.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_hash.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,61 @@ +/* pkg_hash.h - the itsy package management system + @@ -11958,9 +11958,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_hash.h busybox-1.17.2/archiva + +#endif + -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_parse.c busybox-1.17.2/archival/libipkg/pkg_parse.c ---- busybox-1.17.2.orig/archival/libipkg/pkg_parse.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_parse.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_parse.c busybox-1.18.1/archival/libipkg/pkg_parse.c +--- busybox-1.18.1.orig/archival/libipkg/pkg_parse.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_parse.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,368 @@ +/* pkg_parse.c - the itsy package management system + @@ -12330,9 +12330,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_parse.c busybox-1.17.2/archiv + + return 0; +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_parse.h busybox-1.17.2/archival/libipkg/pkg_parse.h ---- busybox-1.17.2.orig/archival/libipkg/pkg_parse.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_parse.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_parse.h busybox-1.18.1/archival/libipkg/pkg_parse.h +--- busybox-1.18.1.orig/archival/libipkg/pkg_parse.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_parse.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,31 @@ +/* pkg_parse.h - the itsy package management system + @@ -12365,9 +12365,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_parse.h busybox-1.17.2/archiv +int pkg_valorize_other_field(pkg_t *pkg, char ***raw); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_src.c busybox-1.17.2/archival/libipkg/pkg_src.c ---- busybox-1.17.2.orig/archival/libipkg/pkg_src.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_src.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_src.c busybox-1.18.1/archival/libipkg/pkg_src.c +--- busybox-1.18.1.orig/archival/libipkg/pkg_src.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_src.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,43 @@ +/* pkg_src.c - the itsy package management system + @@ -12412,9 +12412,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_src.c busybox-1.17.2/archival +} + + -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_src.h busybox-1.17.2/archival/libipkg/pkg_src.h ---- busybox-1.17.2.orig/archival/libipkg/pkg_src.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_src.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_src.h busybox-1.18.1/archival/libipkg/pkg_src.h +--- busybox-1.18.1.orig/archival/libipkg/pkg_src.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_src.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,34 @@ +/* pkg_src.h - the itsy package management system + @@ -12450,9 +12450,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_src.h busybox-1.17.2/archival +void pkg_src_deinit(pkg_src_t *src); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_src_list.c busybox-1.17.2/archival/libipkg/pkg_src_list.c ---- busybox-1.17.2.orig/archival/libipkg/pkg_src_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_src_list.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_src_list.c busybox-1.18.1/archival/libipkg/pkg_src_list.c +--- busybox-1.18.1.orig/archival/libipkg/pkg_src_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_src_list.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,75 @@ +/* pkg_src_list.c - the itsy package management system + @@ -12529,9 +12529,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_src_list.c busybox-1.17.2/arc +{ + return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list); +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_src_list.h busybox-1.17.2/archival/libipkg/pkg_src_list.h ---- busybox-1.17.2.orig/archival/libipkg/pkg_src_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_src_list.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_src_list.h busybox-1.18.1/archival/libipkg/pkg_src_list.h +--- busybox-1.18.1.orig/archival/libipkg/pkg_src_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_src_list.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,57 @@ +/* pkg_src_list.h - the itsy package management system + @@ -12590,9 +12590,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_src_list.h busybox-1.17.2/arc + +#endif + -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_vec.c busybox-1.17.2/archival/libipkg/pkg_vec.c ---- busybox-1.17.2.orig/archival/libipkg/pkg_vec.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_vec.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_vec.c busybox-1.18.1/archival/libipkg/pkg_vec.c +--- busybox-1.18.1.orig/archival/libipkg/pkg_vec.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_vec.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,231 @@ +/* pkg_vec.c - the itsy package management system + @@ -12825,9 +12825,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_vec.c busybox-1.17.2/archival + qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar); +} + -diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_vec.h busybox-1.17.2/archival/libipkg/pkg_vec.h ---- busybox-1.17.2.orig/archival/libipkg/pkg_vec.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/pkg_vec.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/pkg_vec.h busybox-1.18.1/archival/libipkg/pkg_vec.h +--- busybox-1.18.1.orig/archival/libipkg/pkg_vec.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/pkg_vec.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,62 @@ +/* pkg_vec.h - the itsy package management system + @@ -12891,9 +12891,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/pkg_vec.h busybox-1.17.2/archival +void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *)); +#endif + -diff -Nur busybox-1.17.2.orig/archival/libipkg/sprintf_alloc.h busybox-1.17.2/archival/libipkg/sprintf_alloc.h ---- busybox-1.17.2.orig/archival/libipkg/sprintf_alloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/sprintf_alloc.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.18.1/archival/libipkg/sprintf_alloc.h +--- busybox-1.18.1.orig/archival/libipkg/sprintf_alloc.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/sprintf_alloc.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,25 @@ +/* sprintf_alloca.c -- like sprintf with memory allocation + @@ -12920,9 +12920,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/sprintf_alloc.h busybox-1.17.2/ar +#define sprintf_alloc(str, fmt, args...) *str = xasprintf(fmt, ## args) + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/str_list.c busybox-1.17.2/archival/libipkg/str_list.c ---- busybox-1.17.2.orig/archival/libipkg/str_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/str_list.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/str_list.c busybox-1.18.1/archival/libipkg/str_list.c +--- busybox-1.18.1.orig/archival/libipkg/str_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/str_list.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,76 @@ +/* str_list.c - the itsy package management system + @@ -13000,9 +13000,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/str_list.c busybox-1.17.2/archiva + (void *)target_str, + (void_list_cmp_t)strcmp); +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/str_list.h busybox-1.17.2/archival/libipkg/str_list.h ---- busybox-1.17.2.orig/archival/libipkg/str_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/str_list.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/str_list.h busybox-1.18.1/archival/libipkg/str_list.h +--- busybox-1.18.1.orig/archival/libipkg/str_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/str_list.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,51 @@ +/* str_list.h - the itsy package management system + @@ -13055,9 +13055,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/str_list.h busybox-1.17.2/archiva +char *str_list_remove_elt(str_list_t *list, const char *target_str); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/str_util.c busybox-1.17.2/archival/libipkg/str_util.c ---- busybox-1.17.2.orig/archival/libipkg/str_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/str_util.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/str_util.c busybox-1.18.1/archival/libipkg/str_util.c +--- busybox-1.18.1.orig/archival/libipkg/str_util.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/str_util.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,69 @@ +/* str_utils.c - the itsy package management system + @@ -13128,9 +13128,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/str_util.c busybox-1.17.2/archiva + return str ? strdup(str) : NULL; +} + -diff -Nur busybox-1.17.2.orig/archival/libipkg/str_util.h busybox-1.17.2/archival/libipkg/str_util.h ---- busybox-1.17.2.orig/archival/libipkg/str_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/str_util.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/str_util.h busybox-1.18.1/archival/libipkg/str_util.h +--- busybox-1.18.1.orig/archival/libipkg/str_util.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/str_util.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,27 @@ +/* str_utils.h - the itsy package management system + @@ -13159,9 +13159,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/str_util.h busybox-1.17.2/archiva +char *str_dup_safe(const char *str); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/user.c busybox-1.17.2/archival/libipkg/user.c ---- busybox-1.17.2.orig/archival/libipkg/user.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/user.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/user.c busybox-1.18.1/archival/libipkg/user.c +--- busybox-1.18.1.orig/archival/libipkg/user.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/user.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,49 @@ +/* user.c - the itsy package management system + @@ -13212,9 +13212,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/user.c busybox-1.17.2/archival/li + + return response; +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/user.h busybox-1.17.2/archival/libipkg/user.h ---- busybox-1.17.2.orig/archival/libipkg/user.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/user.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/user.h busybox-1.18.1/archival/libipkg/user.h +--- busybox-1.18.1.orig/archival/libipkg/user.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/user.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,23 @@ +/* user.c - the itsy package management system + @@ -13239,9 +13239,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/user.h busybox-1.17.2/archival/li + +char *get_user_response(const char *format, ...); + -diff -Nur busybox-1.17.2.orig/archival/libipkg/void_list.c busybox-1.17.2/archival/libipkg/void_list.c ---- busybox-1.17.2.orig/archival/libipkg/void_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/void_list.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/void_list.c busybox-1.18.1/archival/libipkg/void_list.c +--- busybox-1.18.1.orig/archival/libipkg/void_list.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/void_list.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,194 @@ +/* void_list.c - the itsy package management system + @@ -13437,9 +13437,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/void_list.c busybox-1.17.2/archiv + else + return NULL; +} -diff -Nur busybox-1.17.2.orig/archival/libipkg/void_list.h busybox-1.17.2/archival/libipkg/void_list.h ---- busybox-1.17.2.orig/archival/libipkg/void_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/void_list.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/void_list.h busybox-1.18.1/archival/libipkg/void_list.h +--- busybox-1.18.1.orig/archival/libipkg/void_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/void_list.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,59 @@ +/* void_list.h - the itsy package management system + @@ -13500,9 +13500,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/void_list.h busybox-1.17.2/archiv +void *void_list_remove_elt(void_list_t *list, const void *target_data, void_list_cmp_t cmp); + +#endif -diff -Nur busybox-1.17.2.orig/archival/libipkg/xsystem.c busybox-1.17.2/archival/libipkg/xsystem.c ---- busybox-1.17.2.orig/archival/libipkg/xsystem.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/xsystem.c 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/xsystem.c busybox-1.18.1/archival/libipkg/xsystem.c +--- busybox-1.18.1.orig/archival/libipkg/xsystem.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/xsystem.c 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,64 @@ +/* xsystem.c - system(3) with error messages + @@ -13568,9 +13568,9 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/xsystem.c busybox-1.17.2/archival + return -1; +} + -diff -Nur busybox-1.17.2.orig/archival/libipkg/xsystem.h busybox-1.17.2/archival/libipkg/xsystem.h ---- busybox-1.17.2.orig/archival/libipkg/xsystem.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.2/archival/libipkg/xsystem.h 2010-12-01 22:25:23.000000000 +0100 +diff -Nur busybox-1.18.1.orig/archival/libipkg/xsystem.h busybox-1.18.1/archival/libipkg/xsystem.h +--- busybox-1.18.1.orig/archival/libipkg/xsystem.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.18.1/archival/libipkg/xsystem.h 2010-12-25 22:38:07.000000000 +0100 @@ -0,0 +1,34 @@ +/* xsystem.h - system(3) with error messages + @@ -13606,21 +13606,10 @@ diff -Nur busybox-1.17.2.orig/archival/libipkg/xsystem.h busybox-1.17.2/archival + +#endif + -diff -Nur busybox-1.17.2.orig/archival/libunarchive/Kbuild.src busybox-1.17.2/archival/libunarchive/Kbuild.src ---- busybox-1.17.2.orig/archival/libunarchive/Kbuild.src 2010-08-23 02:44:35.000000000 +0200 -+++ busybox-1.17.2/archival/libunarchive/Kbuild.src 2010-12-01 22:25:23.000000000 +0100 -@@ -43,6 +43,7 @@ - lib-$(CONFIG_DPKG) += $(DPKG_FILES) - lib-$(CONFIG_DPKG_DEB) += $(DPKG_FILES) - lib-$(CONFIG_GUNZIP) += decompress_unzip.o -+lib-$(CONFIG_IPKG) += open_transformer.o get_header_tar.o get_header_tar_gz.o - lib-$(CONFIG_RPM2CPIO) += decompress_unzip.o get_header_cpio.o - lib-$(CONFIG_RPM) += open_transformer.o decompress_unzip.o get_header_cpio.o - lib-$(CONFIG_TAR) += get_header_tar.o -diff -Nur busybox-1.17.2.orig/include/applets.src.h busybox-1.17.2/include/applets.src.h ---- busybox-1.17.2.orig/include/applets.src.h 2010-08-23 02:44:35.000000000 +0200 -+++ busybox-1.17.2/include/applets.src.h 2010-12-01 22:25:23.000000000 +0100 -@@ -209,6 +209,7 @@ +diff -Nur busybox-1.18.1.orig/include/applets.src.h busybox-1.18.1/include/applets.src.h +--- busybox-1.18.1.orig/include/applets.src.h 2010-12-21 05:31:04.000000000 +0100 ++++ busybox-1.18.1/include/applets.src.h 2010-12-25 22:38:09.000000000 +0100 +@@ -195,6 +195,7 @@ IF_IPCALC(APPLET(ipcalc, _BB_DIR_BIN, _BB_SUID_DROP)) IF_IPCRM(APPLET(ipcrm, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE)) IF_IPCS(APPLET(ipcs, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE)) @@ -13628,18 +13617,9 @@ diff -Nur busybox-1.17.2.orig/include/applets.src.h busybox-1.17.2/include/apple IF_IPLINK(APPLET(iplink, _BB_DIR_BIN, _BB_SUID_DROP)) IF_IPROUTE(APPLET(iproute, _BB_DIR_BIN, _BB_SUID_DROP)) IF_IPRULE(APPLET(iprule, _BB_DIR_BIN, _BB_SUID_DROP)) -diff -Nur busybox-1.17.2.orig/include/unarchive.h busybox-1.17.2/include/unarchive.h ---- busybox-1.17.2.orig/include/unarchive.h 2010-08-22 10:21:38.000000000 +0200 -+++ busybox-1.17.2/include/unarchive.h 2010-12-01 22:25:23.000000000 +0100 -@@ -76,7 +76,7 @@ - off_t offset; - - /* Archiver specific. Can make it a union if it ever gets big */ --#if ENABLE_TAR || ENABLE_DPKG || ENABLE_DPKG_DEB -+#if ENABLE_TAR || ENABLE_DPKG || ENABLE_DPKG_DEB || ENABLE_IPKG - smallint tar__end; - # if ENABLE_FEATURE_TAR_GNU_EXTENSIONS - char* tar__longname; +diff -Nur busybox-1.18.1.orig/include/archive.h busybox-1.18.1/include/archive.h +--- busybox-1.18.1.orig/include/archive.h 2010-12-20 01:41:27.000000000 +0100 ++++ busybox-1.18.1/include/archive.h 2010-12-25 22:51:31.000000000 +0100 @@ -95,7 +95,7 @@ struct hardlinks_t *cpio__hardlinks_to_create; struct hardlinks_t *cpio__created_hardlinks; @@ -13649,12 +13629,12 @@ diff -Nur busybox-1.17.2.orig/include/unarchive.h busybox-1.17.2/include/unarchi /* Temporary storage */ char *dpkg__buffer; /* How to process any sub archive, e.g. get_header_tar_gz */ -diff -Nur busybox-1.17.2.orig/include/usage.src.h busybox-1.17.2/include/usage.src.h ---- busybox-1.17.2.orig/include/usage.src.h 2010-08-23 02:44:35.000000000 +0200 -+++ busybox-1.17.2/include/usage.src.h 2010-12-01 22:25:23.000000000 +0100 -@@ -1556,6 +1556,82 @@ - "$ ls -la /tmp/busybox*\n" \ - "-rw-rw-r-- 1 andersen andersen 554058 Apr 14 17:49 /tmp/busybox.tar.gz\n" +diff -Nur busybox-1.18.1.orig/include/usage.src.h busybox-1.18.1/include/usage.src.h +--- busybox-1.18.1.orig/include/usage.src.h 2010-12-21 05:29:45.000000000 +0100 ++++ busybox-1.18.1/include/usage.src.h 2010-12-25 22:45:09.000000000 +0100 +@@ -1919,6 +1919,82 @@ + "\n -l Limits" \ + "\n -u Summary" \ +#define ipkg_trivial_usage \ + "[options]... sub-command [arguments]..." @@ -13732,6 +13712,6 @@ diff -Nur busybox-1.17.2.orig/include/usage.src.h busybox-1.17.2/include/usage.s + "\tregexp could be something like 'pkgname*' '*file*' or similar\n" \ + "\teg: ipkg info 'libstd*' or ipkg search '*libop*' or ipkg remove 'libncur*'\n" + - #define halt_trivial_usage \ - "[-d DELAY] [-n] [-f]" IF_FEATURE_WTMP(" [-w]") - #define halt_full_usage "\n\n" \ + #define iplink_trivial_usage \ + "{ set DEVICE { up | down | arp { on | off } | show [DEVICE] }" + #define iplink_full_usage "\n\n" \ diff --git a/package/busybox/patches/003-defaults-no.patch b/package/busybox/patches/003-defaults.patch index 1bc448165..d65bd788d 100644 --- a/package/busybox/patches/003-defaults-no.patch +++ b/package/busybox/patches/003-defaults.patch @@ -1,6 +1,6 @@ -diff -Nur busybox-1.17.1.orig/Config.in busybox-1.17.1/Config.in ---- busybox-1.17.1.orig/Config.in 2010-07-25 00:12:56.000000000 +0200 -+++ busybox-1.17.1/Config.in 2010-07-26 14:32:24.000000000 +0200 +diff -Nur busybox-1.18.1.orig/Config.in busybox-1.18.1/Config.in +--- busybox-1.18.1.orig/Config.in 2010-12-21 05:31:04.000000000 +0100 ++++ busybox-1.18.1/Config.in 2010-12-25 23:20:18.000000000 +0100 @@ -15,7 +15,7 @@ config DESKTOP @@ -19,9 +19,9 @@ diff -Nur busybox-1.17.1.orig/Config.in busybox-1.17.1/Config.in help This option will enable backwards compatibility with SuSv2, specifically, old-style numeric options ('command -1 <file>') -diff -Nur busybox-1.17.1.orig/archival/Config.src busybox-1.17.1/archival/Config.src ---- busybox-1.17.1.orig/archival/Config.src 2010-07-25 00:12:56.000000000 +0200 -+++ busybox-1.17.1/archival/Config.src 2010-07-26 14:30:27.000000000 +0200 +diff -Nur busybox-1.18.1.orig/archival/Config.src busybox-1.18.1/archival/Config.src +--- busybox-1.18.1.orig/archival/Config.src 2010-12-20 01:41:26.000000000 +0100 ++++ busybox-1.18.1/archival/Config.src 2010-12-25 23:21:02.000000000 +0100 @@ -79,7 +79,7 @@ config BUNZIP2 @@ -56,7 +56,7 @@ diff -Nur busybox-1.17.1.orig/archival/Config.src busybox-1.17.1/archival/Config - default y + default n help - Converts an RPM file into a CPIO archive. + Converts a RPM file into a CPIO archive. config RPM bool "rpm" @@ -90,9 +90,9 @@ diff -Nur busybox-1.17.1.orig/archival/Config.src busybox-1.17.1/archival/Config help unxz is a unlzma successor. -diff -Nur busybox-1.17.1.orig/editors/Config.src busybox-1.17.1/editors/Config.src ---- busybox-1.17.1.orig/editors/Config.src 2010-07-06 04:25:53.000000000 +0200 -+++ busybox-1.17.1/editors/Config.src 2010-07-26 14:30:27.000000000 +0200 +diff -Nur busybox-1.18.1.orig/editors/Config.src busybox-1.18.1/editors/Config.src +--- busybox-1.18.1.orig/editors/Config.src 2010-12-20 01:41:27.000000000 +0100 ++++ busybox-1.18.1/editors/Config.src 2010-12-25 23:21:57.000000000 +0100 @@ -31,7 +31,7 @@ config DIFF @@ -102,14 +102,7 @@ diff -Nur busybox-1.17.1.orig/editors/Config.src busybox-1.17.1/editors/Config.s help diff compares two files or directories and outputs the differences between them in a form that can be given to -@@ -62,13 +62,13 @@ - - config PATCH - bool "patch" -- default y -+ default n - help - Apply a unified diff formatted patch. +@@ -62,7 +62,7 @@ config SED bool "sed" @@ -118,10 +111,22 @@ diff -Nur busybox-1.17.1.orig/editors/Config.src busybox-1.17.1/editors/Config.s help sed is used to perform text transformations on a file or input from a pipeline. -diff -Nur busybox-1.17.1.orig/networking/Config.src busybox-1.17.1/networking/Config.src ---- busybox-1.17.1.orig/networking/Config.src 2010-07-25 00:12:43.000000000 +0200 -+++ busybox-1.17.1/networking/Config.src 2010-07-26 14:30:27.000000000 +0200 -@@ -961,7 +961,7 @@ +diff -Nur busybox-1.18.1.orig/editors/patch.c busybox-1.18.1/editors/patch.c +--- busybox-1.18.1.orig/editors/patch.c 2010-12-21 05:29:45.000000000 +0100 ++++ busybox-1.18.1/editors/patch.c 2010-12-25 23:22:38.000000000 +0100 +@@ -27,7 +27,7 @@ + + //config:config PATCH + //config: bool "patch" +-//config: default y ++//config: default n + //config: help + //config: Apply a unified diff formatted patch. + +diff -Nur busybox-1.18.1.orig/networking/Config.src busybox-1.18.1/networking/Config.src +--- busybox-1.18.1.orig/networking/Config.src 2010-12-21 05:29:45.000000000 +0100 ++++ busybox-1.18.1/networking/Config.src 2010-12-25 23:20:19.000000000 +0100 +@@ -986,7 +986,7 @@ config WGET bool "wget" diff --git a/package/busybox/patches/004-wget-accept-long-opts.patch b/package/busybox/patches/004-wget-accept-long-opts.patch deleted file mode 100644 index 5d3891db0..000000000 --- a/package/busybox/patches/004-wget-accept-long-opts.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Nur busybox-1.17.0.orig/networking/wget.c busybox-1.17.0/networking/wget.c ---- busybox-1.17.0.orig/networking/wget.c 2010-06-24 04:40:43.000000000 +0200 -+++ busybox-1.17.0/networking/wget.c 2010-07-16 15:00:51.819609996 +0200 -@@ -542,8 +542,8 @@ - "proxy\0" Required_argument "Y" - "user-agent\0" Required_argument "U" - /* Ignored: */ -- // "tries\0" Required_argument "t" -- // "timeout\0" Required_argument "T" -+ "tries\0" Required_argument "t" -+ "timeout\0" Required_argument "T" - /* Ignored (we always use PASV): */ - "passive-ftp\0" No_argument "\xff" - "header\0" Required_argument "\xfe" -@@ -560,7 +560,7 @@ - #endif - /* server.allocated = target.allocated = NULL; */ - opt_complementary = "-1" IF_FEATURE_WGET_LONG_OPTIONS(":\xfe::"); -- opt = getopt32(argv, "csqO:P:Y:U:" /*ignored:*/ "t:T:", -+ opt = getopt32(argv, "csqO:P:Y:U:t:T:", - &fname_out, &dir_prefix, - &proxy_flag, &user_agent, - NULL, /* -t RETRIES */ diff --git a/package/busybox/patches/005-dot-find.patch b/package/busybox/patches/005-dot-find.patch deleted file mode 100644 index aaa76b77c..000000000 --- a/package/busybox/patches/005-dot-find.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur busybox-1.17.2.orig/scripts/gen_build_files.sh busybox-1.17.2/scripts/gen_build_files.sh ---- busybox-1.17.2.orig/scripts/gen_build_files.sh 2010-08-23 02:44:35.000000000 +0200 -+++ busybox-1.17.2/scripts/gen_build_files.sh 2010-09-28 15:15:51.000000000 +0200 -@@ -48,7 +48,7 @@ - fi - - # (Re)generate */Kbuild and */Config.in --{ cd -- "$srctree" && find -type d; } | while read -r d; do -+{ cd -- "$srctree" && find . -type d; } | while read -r d; do - d="${d#./}" - - src="$srctree/$d/Kbuild.src" diff --git a/package/busybox/patches/006-od-bloat.patch b/package/busybox/patches/006-od-bloat.patch index 8c608ca87..ff501acdb 100644 --- a/package/busybox/patches/006-od-bloat.patch +++ b/package/busybox/patches/006-od-bloat.patch @@ -1,12 +1,12 @@ -diff -Nur busybox-1.17.1.orig/coreutils/od.c busybox-1.17.1/coreutils/od.c ---- busybox-1.17.1.orig/coreutils/od.c 2010-07-06 04:25:53.000000000 +0200 -+++ busybox-1.17.1/coreutils/od.c 2010-08-15 12:50:31.000000000 +0200 -@@ -13,210 +13,5 @@ +diff -Nur busybox-1.18.1.orig/coreutils/od.c busybox-1.18.1/coreutils/od.c +--- busybox-1.18.1.orig/coreutils/od.c 2010-12-20 01:41:26.000000000 +0100 ++++ busybox-1.18.1/coreutils/od.c 2010-12-25 23:18:48.000000000 +0100 +@@ -13,210 +13,4 @@ #include "libbb.h" -#if ENABLE_DESKTOP - /* This one provides -t (busybox's own build script needs it) */ +-/* This one provides -t (busybox's own build script needs it) */ #include "od_bloaty.c" -#else - @@ -102,7 +102,7 @@ diff -Nur busybox-1.17.1.orig/coreutils/od.c busybox-1.17.1/coreutils/od.c - * the offset is changed as well. This isn't pretty, - * but it's easy. - */ --#define TYPE_OFFSET 7 +-#define TYPE_OFFSET 7 - { - char x_or_d; - if (base == 16) { @@ -122,19 +122,19 @@ diff -Nur busybox-1.17.1.orig/coreutils/od.c busybox-1.17.1/coreutils/od.c -} - -static const char *const add_strings[] = { -- "16/1 \"%3_u \" \"\\n\"", /* a */ -- "8/2 \" %06o \" \"\\n\"", /* B, o */ -- "16/1 \"%03o \" \"\\n\"", /* b */ -- "16/1 \"%3_c \" \"\\n\"", /* c */ -- "8/2 \" %05u \" \"\\n\"", /* d */ -- "4/4 \" %010u \" \"\\n\"", /* D */ -- "2/8 \" %21.14e \" \"\\n\"", /* e (undocumented in od), F */ -- "4/4 \" %14.7e \" \"\\n\"", /* f */ -- "4/4 \" %08x \" \"\\n\"", /* H, X */ -- "8/2 \" %04x \" \"\\n\"", /* h, x */ -- "4/4 \" %11d \" \"\\n\"", /* I, L, l */ -- "8/2 \" %6d \" \"\\n\"", /* i */ -- "4/4 \" %011o \" \"\\n\"", /* O */ +- "16/1 \"%3_u \" \"\\n\"", /* a */ +- "8/2 \" %06o \" \"\\n\"", /* B, o */ +- "16/1 \"%03o \" \"\\n\"", /* b */ +- "16/1 \"%3_c \" \"\\n\"", /* c */ +- "8/2 \" %05u \" \"\\n\"", /* d */ +- "4/4 \" %010u \" \"\\n\"", /* D */ +- "2/8 \" %21.14e \" \"\\n\"", /* e (undocumented in od), F */ +- "4/4 \" %14.7e \" \"\\n\"", /* f */ +- "4/4 \" %08x \" \"\\n\"", /* H, X */ +- "8/2 \" %04x \" \"\\n\"", /* h, x */ +- "4/4 \" %11d \" \"\\n\"", /* I, L, l */ +- "8/2 \" %6d \" \"\\n\"", /* i */ +- "4/4 \" %011o \" \"\\n\"", /* O */ -}; - -static const char od_opts[] ALIGN1 = "aBbcDdeFfHhIiLlOoXxv"; @@ -166,7 +166,7 @@ diff -Nur busybox-1.17.1.orig/coreutils/od.c busybox-1.17.1/coreutils/od.c - bb_dump_add(dumper, "\" \""); - } - bb_dump_add(dumper, add_strings[(int)od_o2si[(p - od_opts)]]); -- } else { /* P, p, s, w, or other unhandled */ +- } else { /* P, p, s, w, or other unhandled */ - bb_show_usage(); - } - } diff --git a/package/busybox/patches/007-endianness-check.patch b/package/busybox/patches/007-endianness-check.patch deleted file mode 100644 index d63f8bc6f..000000000 --- a/package/busybox/patches/007-endianness-check.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- busybox-1.17.2/include/platform.h~ Sat Nov 20 18:16:57 2010 -+++ busybox-1.17.2/include/platform.h Sat Nov 20 18:19:34 2010 -@@ -152,29 +152,40 @@ - - #if defined(__digital__) && defined(__unix__) - # include <sex.h> --# define __BIG_ENDIAN__ (BYTE_ORDER == BIG_ENDIAN) --# define __BYTE_ORDER BYTE_ORDER --#elif defined __FreeBSD__ -+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \ -+ || defined(__APPLE__) -+# include <sys/time.h> - # include <sys/resource.h> /* rlimit */ - # include <machine/endian.h> - # define bswap_64 __bswap64 - # define bswap_32 __bswap32 - # define bswap_16 __bswap16 --# define __BIG_ENDIAN__ (_BYTE_ORDER == _BIG_ENDIAN) --#elif !defined __APPLE__ -+#else - # include <byteswap.h> - # include <endian.h> - #endif - --#if defined(__BIG_ENDIAN__) && __BIG_ENDIAN__ -+#if defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN - # define BB_BIG_ENDIAN 1 - # define BB_LITTLE_ENDIAN 0 --#elif defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN -+#elif defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN -+# define BB_BIG_ENDIAN 0 -+# define BB_LITTLE_ENDIAN 1 -+#elif defined(_BYTE_ORDER) && _BYTE_ORDER == _BIG_ENDIAN - # define BB_BIG_ENDIAN 1 - # define BB_LITTLE_ENDIAN 0 --#elif (defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN) || defined(__386__) -+#elif defined(_BYTE_ORDER) && _BYTE_ORDER == _LITTLE_ENDIAN - # define BB_BIG_ENDIAN 0 - # define BB_LITTLE_ENDIAN 1 -+#elif defined(BYTE_ORDER) && BYTE_ORDER == BIG_ENDIAN -+# define BB_BIG_ENDIAN 1 -+# define BB_LITTLE_ENDIAN 0 -+#elif defined(BYTE_ORDER) && BYTE_ORDER == LITTLE_ENDIAN -+# define BB_BIG_ENDIAN 0 -+# define BB_LITTLE_ENDIAN 1 -+#elif defined(__386__) -+# define BB_BIG_ENDIAN 0 -+# define BB_LITTLE_ENDIAN 1 - #else - # error "Can't determine endianness" - #endif -@@ -230,7 +241,7 @@ typedef uint32_t bb__aliased_uint32_t FI - /* ---- Compiler dependent settings ------------------------- */ - - #if (defined __digital__ && defined __unix__) \ -- || defined __APPLE__ || defined __FreeBSD__ -+ || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) - # undef HAVE_MNTENT_H - # undef HAVE_SYS_STATFS_H - #else ---- busybox-1.17.2/include/libbb.h~ Mon Aug 23 00:46:38 2010 -+++ busybox-1.17.2/include/libbb.h Sat Nov 20 18:21:12 2010 -@@ -70,7 +70,7 @@ - # include <shadow.h> - # endif - #endif --#if defined __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) - # include <netinet/in.h> - # include <arpa/inet.h> - #elif defined __APPLE__ diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index a3af3dd62..1b6d6366c 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -5,20 +5,18 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cfgfs PKG_VERSION:= 1.0.8 -PKG_RELEASE:= 2 +PKG_RELEASE:= 4 PKG_DESCR:= compressed config filesystem PKG_SECTION:= base PKG_URL:= http://openadk.org/ -PKG_TARGET_DEPENDS:= alix wrap foxboard ag241 foxg20 routerboard x86 x86_64 - PKG_CFLINE_CFGFS:= select BUSYBOX_COMM@ PKG_CFLINE_CFGFS+= select BUSYBOX_MD5SUM@ PKG_CFLINE_CFGFS+= select BUSYBOX_XARGS@ PKG_CFLINE_CFGFS+= select BUSYBOX_FEATURE_SORT_BIG@ PKG_CFLINE_CFGFS+= select BUSYBOX_DIFF@ PKG_CFLINE_CFGFS+= depends on !ADK_TARGET_ROOTFS_NFSROOT && !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS -PKG_DFLT_CFGFS:= y +PKG_DFLT_CFGFS:= y if !ADK_TOOLCHAIN_ONLY WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 diff --git a/package/cfgfs/src/fwcf.sh b/package/cfgfs/src/fwcf.sh index 6f99393dd..ddcbfcc50 100644 --- a/package/cfgfs/src/fwcf.sh +++ b/package/cfgfs/src/fwcf.sh @@ -125,7 +125,10 @@ fi # find backend device, first try to find partition with ID 88 rootdisk=$(readlink /dev/root) -part=$(fdisk -l /dev/${rootdisk%1}|awk '$5 == 88 { print $1 }') +# strip partitions (f.e. mmcblk0p2, sda2, ..) +rootdisk=${rootdisk%p*} +rootdisk=${rootdisk%[1-9]} +part=$(fdisk -l /dev/$rootdisk 2>/dev/null|awk '$5 == 88 { print $1 }') if [ -z $part ]; then # otherwise search for MTD device with name cfgfs part=/dev/mtd$(fgrep '"cfgfs"' /proc/mtd 2>/dev/null | sed 's/^mtd\([^:]*\):.*$/\1/')ro diff --git a/package/cpufrequtils/Makefile b/package/cpufrequtils/Makefile index 19ceff96a..3e8af5585 100644 --- a/package/cpufrequtils/Makefile +++ b/package/cpufrequtils/Makefile @@ -12,8 +12,6 @@ PKG_SECTION:= utils PKG_URL:= http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html PKG_SITES:= http://www.kernel.org/pub/linux/utils/kernel/cpufreq/ -PKG_TARGET_DEPENDS:= !ag241 !foxboard !foxg20 - include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,CPUFREQUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/cryptinit/Makefile b/package/cryptinit/Makefile index e3204b615..7a42d671f 100644 --- a/package/cryptinit/Makefile +++ b/package/cryptinit/Makefile @@ -28,12 +28,12 @@ do-build: ${WRKBUILD}/cryptinit.c ( cd ${WRKBUILD}; \ ${TARGET_CC} -static -o cryptinit cryptinit.o \ - ${STAGING_DIR}/usr/lib/libcryptsetup.a \ - -L${STAGING_DIR}/lib -L${STAGING_DIR}/usr/lib \ + ${STAGING_TARGET_DIR}/usr/lib/libcryptsetup.a \ + -L${STAGING_TARGET_DIR}/lib -L${STAGING_TARGET_DIR}/usr/lib \ -ldevmapper -lpthread \ - ${STAGING_DIR}/usr/lib/libgcrypt.a \ - ${STAGING_DIR}/usr/lib/libgpg-error.a \ - -luuid -Wl,--rpath -Wl,${STAGING_DIR}/usr/lib \ + ${STAGING_TARGET_DIR}/usr/lib/libgcrypt.a \ + ${STAGING_TARGET_DIR}/usr/lib/libgpg-error.a \ + -luuid -Wl,--rpath -Wl,${STAGING_TARGET_DIR}/usr/lib \ ); do-install: diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile index 893f431b9..fbccefdfe 100644 --- a/package/cryptsetup/Makefile +++ b/package/cryptsetup/Makefile @@ -16,7 +16,7 @@ PKG_BUILDDEP:= libgcrypt popt e2fsprogs lvm PKG_URL:= http://cryptsetup.googlecode.com/ PKG_SITES:= http://cryptsetup.googlecode.com/files/ -PKG_TARGET_DEPENDS:= !foxboard +PKG_ARCH_DEPENDS:= !cris DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/curl/Makefile b/package/curl/Makefile index 781adb27e..ab6e45416 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -52,7 +52,7 @@ CONFIGURE_ARGS+= --disable-thread \ --disable-telnet \ --disable-verbose \ --with-random="/dev/urandom" \ - --with-ssl="${STAGING_DIR}/usr" \ + --with-ssl="${STAGING_TARGET_DIR}/usr" \ --without-ca-bundle \ --without-gnutls \ --without-libidn diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile index b01fc0618..c67b73579 100644 --- a/package/cxxtools/Makefile +++ b/package/cxxtools/Makefile @@ -20,7 +20,7 @@ $(eval $(call PKG_template,CXXTOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) TCXXFLAGS+= -fno-builtin -nostdinc++ \ - -I${STAGING_DIR}/usr/include/uClibc++ -Wl,-E + -I${STAGING_TARGET_DIR}/usr/include/uClibc++ -Wl,-E TLDFLAGS+= -luClibc++ -liconv -lm -nodefaultlibs -shared else TLDFLAGS+= -liconv -shared @@ -28,7 +28,7 @@ endif TCFLAGS+= -fPIC TCXXFLAGS+= -fPIC -CONFIGURE_ARGS+= --with-libiconv-prefix='${STAGING_DIR}/usr' +CONFIGURE_ARGS+= --with-libiconv-prefix='${STAGING_TARGET_DIR}/usr' post-install: ${INSTALL_DIR} ${IDIR_CXXTOOLS}/usr/lib diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile index b5640cb66..a7ce3a9c8 100644 --- a/package/cyrus-sasl/Makefile +++ b/package/cyrus-sasl/Makefile @@ -47,7 +47,7 @@ CONFIGURE_ARGS+= --disable-sample \ --without-authdaemond \ --without-pwcheck \ --with-ipctype=unix \ - --with-openssl="${STAGING_DIR}/usr" \ + --with-openssl="${STAGING_TARGET_DIR}/usr" \ --without-des \ --without-opie \ --without-ldap \ diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile index 215ff8c08..5cc1d08e5 100644 --- a/package/dansguardian/Makefile +++ b/package/dansguardian/Makefile @@ -21,7 +21,7 @@ $(eval $(call PKG_template,DANSGUARDIAN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE ifeq ($(ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX),y) CONFIGURE_ENV+= CXXFLAGS="-fno-threadsafe-statics -fno-builtin -nostdinc++ \ - -I${STAGING_DIR}/usr/include/uClibc++" \ + -I${STAGING_TARGET_DIR}/usr/include/uClibc++" \ LIBS="-nodefaultlibs -luClibc++ -lgcc -lm" endif diff --git a/package/davfs2/patches/patch-src_cache_c b/package/davfs2/patches/patch-src_cache_c new file mode 100644 index 000000000..dd03ed67c --- /dev/null +++ b/package/davfs2/patches/patch-src_cache_c @@ -0,0 +1,10 @@ +--- davfs2-1.4.6.orig/src/cache.c 2009-11-15 11:15:17.000000000 +0100 ++++ davfs2-1.4.6/src/cache.c 2010-12-27 22:02:47.000000000 +0100 +@@ -55,7 +55,6 @@ + #ifdef HAVE_SYS_TYPES_H + #include <sys/types.h> + #endif +-#include <sys/xattr.h> + + #include <ne_alloc.h> + #include <ne_string.h> diff --git a/package/davfs2/patches/patch-src_dav_fuse_c b/package/davfs2/patches/patch-src_dav_fuse_c new file mode 100644 index 000000000..fca0e83f2 --- /dev/null +++ b/package/davfs2/patches/patch-src_dav_fuse_c @@ -0,0 +1,10 @@ +--- davfs2-1.4.6.orig/src/dav_fuse.c 2010-02-16 20:29:49.000000000 +0100 ++++ davfs2-1.4.6/src/dav_fuse.c 2010-12-27 22:02:24.000000000 +0100 +@@ -33,6 +33,7 @@ + #ifdef HAVE_STDINT_H + #include <stdint.h> + #endif ++#include <stdlib.h> + #include <string.h> + #ifdef HAVE_SYSLOG_H + #include <syslog.h> diff --git a/package/dbus/Makefile b/package/dbus/Makefile index 931ac4373..2a400abad 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -34,9 +34,9 @@ CONFIGURE_ARGS+= --disable-tests \ CONFIGURE_ENV+= ac_cv_have_abstract_sockets=no pre-install: - ${INSTALL_DIR} $(STAGING_DIR)/usr/include/dbus-1.0/dbus + ${INSTALL_DIR} $(STAGING_TARGET_DIR)/usr/include/dbus-1.0/dbus $(CP) $(WRKBUILD)/dbus/dbus-arch-deps.h \ - $(STAGING_DIR)/usr/include/dbus-1.0/dbus/ + $(STAGING_TARGET_DIR)/usr/include/dbus-1.0/dbus/ post-install: ${INSTALL_DIR} ${IDIR_DBUS}/etc ${IDIR_DBUS}/usr/lib \ diff --git a/package/dillo/Makefile b/package/dillo/Makefile index 5c2134dd2..142bbb1b8 100644 --- a/package/dillo/Makefile +++ b/package/dillo/Makefile @@ -16,7 +16,7 @@ PKG_URL:= http://www.dillo.org/ PKG_SITES:= http://www.dillo.org/download/ PKG_HOST_DEPENDS:= !cygwin -PKG_TARGET_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el +PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/dsniff/Makefile b/package/dsniff/Makefile index b943675e7..0039601c3 100644 --- a/package/dsniff/Makefile +++ b/package/dsniff/Makefile @@ -22,11 +22,11 @@ $(eval $(call PKG_template,DSNIFF,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PK CONFIGURE_ARGS+= --without-db \ --without-x \ - --with-gdbm="${STAGING_DIR}/usr" \ - --with-libnids="${STAGING_DIR}/usr" \ - --with-libpcap="${STAGING_DIR}/usr" \ - --with-libnet="${STAGING_DIR}/usr" \ - --with-openssl="${STAGING_DIR}/usr" + --with-gdbm="${STAGING_TARGET_DIR}/usr" \ + --with-libnids="${STAGING_TARGET_DIR}/usr" \ + --with-libpcap="${STAGING_TARGET_DIR}/usr" \ + --with-libnet="${STAGING_TARGET_DIR}/usr" \ + --with-openssl="${STAGING_TARGET_DIR}/usr" FAKE_FLAGS+= install_prefix="${WRKINST}" post-install: diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 471f0fa04..783a197cf 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= e2fsprogs -PKG_VERSION:= 1.41.12 +PKG_VERSION:= 1.41.14 PKG_RELEASE:= 1 -PKG_MD5SUM:= 1b24a21fc0c2381ef420961cbfec733f +PKG_MD5SUM:= 05f70470aea2ef7efbb0845b2b116720 PKG_DESCR:= Ext2/3/4 filesystem utilities PKG_SECTION:= fs PKG_DEPENDS:= libcom-err libuuid libblkid libpthread @@ -66,9 +66,9 @@ post-install: ${CP} ${WRKINST}/usr/lib/libuuid.so* \ ${IDIR_LIBUUID}/usr/lib/ # install some headers/apps explicitely - ${INSTALL_DIR} ${STAGING_DIR}/usr/include/uuid + ${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/include/uuid ${CP} ${WRKBUILD}/lib/uuid/uuid.h \ - ${STAGING_DIR}/usr/include/uuid - ${CP} ${WRKINST}/usr/bin/compile_et ${STAGING_TOOLS}/bin + ${STAGING_TARGET_DIR}/usr/include/uuid + ${CP} ${WRKINST}/usr/bin/compile_et ${STAGING_HOST_DIR}/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/e2fsprogs/patches/patch-debugfs_dump_c b/package/e2fsprogs/patches/patch-debugfs_dump_c new file mode 100644 index 000000000..ad28d3c02 --- /dev/null +++ b/package/e2fsprogs/patches/patch-debugfs_dump_c @@ -0,0 +1,30 @@ +--- e2fsprogs-1.41.14.orig/debugfs/dump.c 2009-08-13 03:39:57.000000000 +0200 ++++ e2fsprogs-1.41.14/debugfs/dump.c 2010-12-25 22:30:02.000000000 +0100 +@@ -19,7 +19,6 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> +-#include <utime.h> + #ifdef HAVE_GETOPT_H + #include <getopt.h> + #else +@@ -67,7 +66,6 @@ static mode_t mode_xlate(__u16 lmode) + static void fix_perms(const char *cmd, const struct ext2_inode *inode, + int fd, const char *name) + { +- struct utimbuf ut; + int i; + + if (fd != -1) +@@ -90,11 +88,6 @@ static void fix_perms(const char *cmd, c + + if (fd != -1) + close(fd); +- +- ut.actime = inode->i_atime; +- ut.modtime = inode->i_mtime; +- if (utime(name, &ut) == -1) +- com_err(cmd, errno, "while setting times of %s", name); + } + + static void dump_file(const char *cmdname, ext2_ino_t ino, int fd, diff --git a/package/e2fsprogs/patches/patch-debugfs_dump_c.orig b/package/e2fsprogs/patches/patch-debugfs_dump_c.orig new file mode 100644 index 000000000..7e9b233fa --- /dev/null +++ b/package/e2fsprogs/patches/patch-debugfs_dump_c.orig @@ -0,0 +1,10 @@ +--- e2fsprogs-1.41.14.orig/debugfs/dump.c 2009-08-13 03:39:57.000000000 +0200 ++++ e2fsprogs-1.41.14/debugfs/dump.c 2010-12-25 22:27:59.000000000 +0100 +@@ -19,7 +19,6 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> +-#include <utime.h> + #ifdef HAVE_GETOPT_H + #include <getopt.h> + #else diff --git a/package/e2fsprogs/patches/patch-debugfs_logdump_c b/package/e2fsprogs/patches/patch-debugfs_logdump_c new file mode 100644 index 000000000..07155d7b6 --- /dev/null +++ b/package/e2fsprogs/patches/patch-debugfs_logdump_c @@ -0,0 +1,10 @@ +--- e2fsprogs-1.41.14.orig/debugfs/logdump.c 2010-12-22 16:49:20.000000000 +0100 ++++ e2fsprogs-1.41.14/debugfs/logdump.c 2010-12-25 22:31:30.000000000 +0100 +@@ -21,7 +21,6 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> +-#include <utime.h> + #ifdef HAVE_GETOPT_H + #include <getopt.h> + #else diff --git a/package/e2fsprogs/patches/patch-debugfs_set_fields_c b/package/e2fsprogs/patches/patch-debugfs_set_fields_c new file mode 100644 index 000000000..985eff51e --- /dev/null +++ b/package/e2fsprogs/patches/patch-debugfs_set_fields_c @@ -0,0 +1,10 @@ +--- e2fsprogs-1.41.14.orig/debugfs/set_fields.c 2010-12-22 16:49:20.000000000 +0100 ++++ e2fsprogs-1.41.14/debugfs/set_fields.c 2010-12-25 22:25:52.000000000 +0100 +@@ -33,7 +33,6 @@ + #include <strings.h> + #endif + #include <fcntl.h> +-#include <utime.h> + + #include "debugfs.h" + #include "uuid/uuid.h" diff --git a/package/e2fsprogs/patches/patch-e2fsprogs_spec b/package/e2fsprogs/patches/patch-e2fsprogs_spec new file mode 100644 index 000000000..ad10f98dc --- /dev/null +++ b/package/e2fsprogs/patches/patch-e2fsprogs_spec @@ -0,0 +1,11 @@ +--- e2fsprogs-1.41.14.orig/e2fsprogs.spec 2010-12-13 14:57:34.000000000 +0100 ++++ e2fsprogs-1.41.14/e2fsprogs.spec 2010-12-25 22:24:46.000000000 +0100 +@@ -5,7 +5,7 @@ + + Summary: Utilities for managing ext2/ext3/ext4 filesystems + Name: e2fsprogs +-Version: 1.41.13 ++Version: 1.41.14 + Release: 0 + License: GPLv2 + Group: System Environment/Base diff --git a/package/e2fsprogs/patches/patch-misc_e2initrd_helper_c b/package/e2fsprogs/patches/patch-misc_e2initrd_helper_c new file mode 100644 index 000000000..152e4e0a2 --- /dev/null +++ b/package/e2fsprogs/patches/patch-misc_e2initrd_helper_c @@ -0,0 +1,10 @@ +--- e2fsprogs-1.41.14.orig/misc/e2initrd_helper.c 2009-08-13 03:39:57.000000000 +0200 ++++ e2fsprogs-1.41.14/misc/e2initrd_helper.c 2010-12-25 22:33:06.000000000 +0100 +@@ -23,7 +23,6 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> +-#include <utime.h> + #ifdef HAVE_GETOPT_H + #include <getopt.h> + #else diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 3caca19d4..27e271f44 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -57,19 +57,18 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} test -z $(ADK_RUNTIME_TIMEZONE) || \ $(CP) /usr/share/zoneinfo/$(ADK_RUNTIME_TIMEZONE) \ $(IDIR_EGLIBC)/etc/localtime - $(CP) $(STAGING_DIR)/lib/ld* $(IDIR_EGLIBC)/lib/ - $(CP) $(STAGING_DIR)/lib/libgcc_s.so* $(IDIR_EGLIBC)/lib/ + $(CP) $(STAGING_TARGET_DIR)/lib/ld* $(IDIR_EGLIBC)/lib/ -for file in libc libcrypt libdl libm libnsl libresolv librt libutil libnss_compat libnss_dns libnss_files; do \ - $(CP) $(STAGING_DIR)/lib/$$file.so* $(IDIR_EGLIBC)/lib/; \ - $(CP) $(STAGING_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_EGLIBC)/lib/; \ + $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_EGLIBC)/lib/; \ + $(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_EGLIBC)/lib/; \ done eglibc-dev-install: ${INSTALL_DIR} $(IDIR_EGLIBC_DEV)/lib $(IDIR_EGLIBC_DEV)/usr/lib # install linker script -cp ./files/libc.so.$(ARCH) $(IDIR_EGLIBC_DEV)/usr/lib/libc.so - ${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_EGLIBC_DEV}/usr/lib - ${CP} ${STAGING_DIR}/usr/lib/libc_nonshared.a ${IDIR_EGLIBC_DEV}/usr/lib + ${CP} ${STAGING_TARGET_DIR}/usr/lib/crt* ${IDIR_EGLIBC_DEV}/usr/lib + ${CP} ${STAGING_TARGET_DIR}/usr/lib/libc_nonshared.a ${IDIR_EGLIBC_DEV}/usr/lib cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libm.so.6 libm.so cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libutil.so.1 libutil.so cd $(IDIR_EGLIBC_DEV)/lib && ln -sf librt.so.1 librt.so diff --git a/package/elinks/Makefile b/package/elinks/Makefile index f7aef75a7..ec7180d93 100644 --- a/package/elinks/Makefile +++ b/package/elinks/Makefile @@ -29,7 +29,7 @@ CONFIGURE_ENV+= $(shell echo ac_cv_file_./features.conf | tr [:blank:]-/. _)=ye CONFIGURE_ENV+= $(shell echo ac_cv_file_${WRKBUILD}/features.conf | tr [:blank:]-/. _)=yes CONFIGURE_ARGS+= --enable-small \ --enable-256-colors \ - --with-openssl='${STAGING_DIR}/usr' \ + --with-openssl='${STAGING_TARGET_DIR}/usr' \ --disable-backtrace \ --disable-data \ --disable-formhist \ diff --git a/package/evilwm/Makefile b/package/evilwm/Makefile index 5e7b2ce62..e8ff76d50 100644 --- a/package/evilwm/Makefile +++ b/package/evilwm/Makefile @@ -20,7 +20,7 @@ $(eval $(call PKG_template,EVILWM,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PK CONFIG_STYLE:= manual -MAKE_FLAGS+= XROOT="$(STAGING_DIR)/usr" +MAKE_FLAGS+= XROOT="$(STAGING_TARGET_DIR)/usr" post-install: $(INSTALL_DIR) $(IDIR_EVILWM)/usr/bin diff --git a/package/fetchmail/Makefile b/package/fetchmail/Makefile index 8dd02942e..2734f6d31 100644 --- a/package/fetchmail/Makefile +++ b/package/fetchmail/Makefile @@ -26,7 +26,7 @@ $(eval $(call PKG_template,FETCHMAIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},$ CONFIGURE_ARGS+= --without-hesiod ifeq (${ADK_PACKAGE_FETCHMAIL_SSL},y) -CONFIGURE_ARGS+= --with-ssl='${STAGING_DIR}/usr' +CONFIGURE_ARGS+= --with-ssl='${STAGING_TARGET_DIR}/usr' else CONFIGURE_ARGS+= --without-ssl endif diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index 69538bc8e..bfcb74413 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -31,27 +31,20 @@ SUB_INSTALLS-y:= SUB_INSTALLS-m:= SUB_INSTALLS-${ADK_PACKAGE_FFPLAY}+= ffplay-install -ifeq ($(ADK_TARGET),alix) -CONFIGURE_CPU_OPTS:= --disable-ssse3 \ - --disable-sse \ - --enable-amd3dnow \ - --enable-amd3dnowext \ - --enable-mmx \ - --enable-mmx2 -else ifeq ($(ADK_HARDWARE_IBM_X40),y) -CONFIGURE_CPU_OPTS:= --disable-ssse3 \ - --enable-sse \ - --disable-amd3dnow \ - --disable-amd3dnowext \ - --enable-mmx \ - --enable-mmx2 +ifeq ($(ADK_TARGET_CPU_WITH_MMX),y) +CONFIGURE_CPU_OPTS:= --enable-mmx else -CONFIGURE_CPU_OPTS:= --disable-ssse3 \ - --disable-sse \ - --disable-amd3dnow \ - --disable-amd3dnowext \ - --disable-mmx \ - --disable-mmx2 +CONFIGURE_CPU_OPTS:= --disable-mmx +endif +ifeq ($(ADK_TARGET_CPU_WITH_MMXEXT),y) +CONFIGURE_CPU_OPTS:= --enable-mmx2 +else +CONFIGURE_CPU_OPTS:= --disable-mmx2 +endif +ifeq ($(ADK_TARGET_CPU_WITH_SSE),y) +CONFIGURE_CPU_OPTS:= --enable-sse +else +CONFIGURE_CPU_OPTS:= --disable-sse endif # gcc 4.5 produces internal compiler error with -Os @@ -63,7 +56,7 @@ CONFIGURE_ARGS:= --prefix=/usr \ --target-os=linux \ --arch=${CPU_ARCH} \ --enable-cross-compile \ - --sysroot=${STAGING_DIR} \ + --sysroot=${STAGING_TARGET_DIR} \ --source-path=${WRKSRC} \ --cross-prefix=${TARGET_CROSS} \ --cc=$(TARGET_CC) \ diff --git a/package/firefox/Makefile b/package/firefox/Makefile index b5a195c6f..0e1c6fe9f 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -17,7 +17,7 @@ PKG_BUILDDEP+= nspr nss jpeg libXt fontconfig sqlite PKG_URL:= http://www.mozilla.org/ PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/ -PKG_TARGET_DEPENDS:= alix x86 x86_64 mips mipsel mips64 mips64el +PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el PKG_HOST_DEPENDS:= !netbsd !freebsd !openbsd !cygwin DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2 @@ -38,8 +38,9 @@ endif CONFIGURE_ENV+= CROSS_COMPILE=1 HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}" \ HOST_CXX="${HOSTCXX}" HOST_CXXFLAGS="${HOSTCXXFLAGS}" \ HOST_LIBIDL_CONFIG="${HOST_LIBIDL_CONFIG}" \ + PKG_HOSTLIB_DIR="${PKG_HOSTLIB_DIR}" \ HOST_RANLIB="ranlib" HOST_AR="ar" \ - CPPFLAGS="-I${STAGING_DIR}/usr/include/freetype2" \ + CPPFLAGS="-I${STAGING_TARGET_DIR}/usr/include/freetype2" \ ac_cv_sqlite_secure_delete=yes \ ac_cv_thread_keyword=no \ ac_cv_sizeof_int_p=4 @@ -51,8 +52,8 @@ CONFIGURE_ARGS+= --enable-application=browser \ --with-system-nss \ --with-system-nspr \ --enable-system-sqlite \ - --with-libIDL-prefix=${STAGING_DIR}/usr \ - --with-glib-prefix=${STAGING_DIR}/usr \ + --with-libIDL-prefix=${STAGING_TARGET_DIR}/usr \ + --with-glib-prefix=${STAGING_TARGET_DIR}/usr \ --enable-libxul \ --disable-tests \ --disable-libconic \ diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure index a5f6df0b9..4a3499a7b 100644 --- a/package/firefox/patches/patch-configure +++ b/package/firefox/patches/patch-configure @@ -1,5 +1,5 @@ ---- mozilla-1.9.2.orig/configure 2010-10-27 05:09:28.000000000 +0200 -+++ mozilla-1.9.2/configure 2010-12-12 12:03:54.000000000 +0100 +--- mozilla-1.9.2.orig/configure 2010-12-03 16:57:11.000000000 +0100 ++++ mozilla-1.9.2/configure 2010-12-29 21:52:34.000000000 +0100 @@ -3970,7 +3970,7 @@ else echo "$ac_t""yes" 1>&6 fi @@ -26,3 +26,27 @@ else cat > conftest.$ac_ext <<EOF +@@ -21460,18 +21459,11 @@ fi + fi + fi + +-if test -n "$CROSS_COMPILE"; then +- if test -z "$HOST_LIBIDL_CONFIG"; then +- HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG" +- fi +- if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no"; then +- HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags` +- HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs` +- else +- HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS" +- HOST_LIBIDL_LIBS="$LIBIDL_LIBS" +- fi +-fi ++HOST_LIBIDL_CFLAGS=`env PKG_CONFIG_LIBDIR=${PKG_HOSTLIB_DIR} ${HOST_LIBIDL_CONFIG} --cflags` ++HOST_LIBIDL_LIBS=`env PKG_CONFIG_LIBDIR=${PKG_HOSTLIB_DIR} ${HOST_LIBIDL_CONFIG} --libs` ++ ++echo "host libidl cflags: ${HOST_LIBIDL_CFLAGS}" ++echo "host libidl libs: ${HOST_LIBIDL_LIBS}" + + if test -z "$SKIP_PATH_CHECKS"; then + if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then diff --git a/package/fltk/Makefile b/package/fltk/Makefile index af77c13ed..fc2e54ad5 100644 --- a/package/fltk/Makefile +++ b/package/fltk/Makefile @@ -14,7 +14,7 @@ PKG_URL:= http://www.fltk.org/ PKG_SITES:= http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/ PKG_SUBPKGS:= LIBFLTK -PKG_TARGET_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el +PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.x-r7513.tar.bz2 WRKDIST= ${WRKDIR}/${PKG_NAME}-2.0.x-r7513 diff --git a/package/font-misc-misc/Makefile b/package/font-misc-misc/Makefile index 4e1015900..7ea679abb 100644 --- a/package/font-misc-misc/Makefile +++ b/package/font-misc-misc/Makefile @@ -19,7 +19,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,FONT_MISC_MISC,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ENV+= MAPFILES_PATH=${STAGING_DIR}/usr/share/fonts/X11/util +CONFIGURE_ENV+= MAPFILES_PATH=${STAGING_TARGET_DIR}/usr/share/fonts/X11/util post-install: $(INSTALL_DIR) $(IDIR_FONT_MISC_MISC)/usr/share/fonts/X11/misc diff --git a/package/font-util/Makefile b/package/font-util/Makefile index efc6bd188..e71db6670 100644 --- a/package/font-util/Makefile +++ b/package/font-util/Makefile @@ -22,9 +22,9 @@ $(eval $(call PKG_template,FONT_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},$ # calling pkg-config (which we don't provide) in order to # automatically find the mappings. fonts-hack: - ${INSTALL_DIR} ${STAGING_DIR}/usr/share/fonts/X11/util + ${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/share/fonts/X11/util ${CP} ${WRKINST}/usr/share/fonts/X11/util/* \ - ${STAGING_DIR}/usr/share/fonts/X11/util + ${STAGING_TARGET_DIR}/usr/share/fonts/X11/util post-install: fonts-hack ${INSTALL_DIR} ${IDIR_FONT_UTIL}/usr/share/fonts/X11/util diff --git a/package/fprobe/Makefile b/package/fprobe/Makefile index 67353121a..269a6e63e 100644 --- a/package/fprobe/Makefile +++ b/package/fprobe/Makefile @@ -20,8 +20,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,FPROBE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ARGS+= --with-piddir=/var \ - --with-pcap=${STAGING_DIR}/usr/include \ - --with-libpcap=${STAGING_DIR}/usr/lib \ + --with-pcap=${STAGING_TARGET_DIR}/usr/include \ + --with-libpcap=${STAGING_TARGET_DIR}/usr/lib \ --with-membulk=index8 \ --with-hash=xor8 \ diff --git a/package/freeglut/Makefile b/package/freeglut/Makefile index 1c9c5b336..fe9b03d0a 100644 --- a/package/freeglut/Makefile +++ b/package/freeglut/Makefile @@ -14,7 +14,7 @@ PKG_URL:= http://freeglut.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=freeglut/} PKG_HOST_DEPENDS:= !cygwin !darwin -PKG_TARGET_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el +PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el include $(TOPDIR)/mk/package.mk diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile index ce0317caa..1ffe0f8b7 100644 --- a/package/freeradius-server/Makefile +++ b/package/freeradius-server/Makefile @@ -49,24 +49,24 @@ PKG_CONFIGURE_OPTS:= ifneq (${ADK_PACKAGE_FREERADIUS_MOD_LDAP},) PKG_CONFIGURE_LIBS+= -lcrypto -lssl -PKG_CONFIGURE_OPTS+= --with-rlm_ldap-include-dir="${STAGING_DIR}/usr/include" \ - --with-rlm_ldap-lib-dir="${STAGING_DIR}/usr/lib" +PKG_CONFIGURE_OPTS+= --with-rlm_ldap-include-dir="${STAGING_TARGET_DIR}/usr/include" \ + --with-rlm_ldap-lib-dir="${STAGING_TARGET_DIR}/usr/lib" else PKG_CONFIGURE_OPTS+= --without-rlm_ldap endif ifneq (${ADK_PACKAGE_FREERADIUS_MOD_SQL_MYSQL},) PKG_CONFIGURE_LIBS+= -lz -PKG_CONFIGURE_OPTS+= --with-mysql-include-dir="${STAGING_DIR}/usr/include" \ - --with-mysql-lib-dir="${STAGING_DIR}/usr/lib/mysql" \ +PKG_CONFIGURE_OPTS+= --with-mysql-include-dir="${STAGING_TARGET_DIR}/usr/include" \ + --with-mysql-lib-dir="${STAGING_TARGET_DIR}/usr/lib/mysql" \ --without-threads \ --with-rlm_sql else PKG_CONFIGURE_OPTS+= --without-rlm_sql_mysql endif ifneq (${ADK_PACKAGE_FREERADIUS_MOD_SQL_PGSQL},) -PKG_CONFIGURE_OPTS+= --with-rlm_sql_postgresql-include-dir="${STAGING_DIR}/usr/include" \ - --with-rlm_sql_postgresql-lib-dir="${STAGING_DIR}/usr/lib" \ +PKG_CONFIGURE_OPTS+= --with-rlm_sql_postgresql-include-dir="${STAGING_TARGET_DIR}/usr/include" \ + --with-rlm_sql_postgresql-lib-dir="${STAGING_TARGET_DIR}/usr/lib" \ --with-rlm_sql else PKG_CONFIGURE_OPTS+= --without-rlm_sql_postgresql @@ -121,8 +121,8 @@ $(eval $(call PKG_mod_template,FREERADIUS_MOD_SQL_MYSQL,rlm_sql_mysql,)) $(eval $(call PKG_mod_template,FREERADIUS_MOD_SQL_PGSQL,rlm_sql_postgresql,)) CONFIGURE_ARGS+= ${PKG_CONFIGURE_OPTS} \ - --with-openssl-includes=${STAGING_DIR}/usr/include \ - --with-openssl-libraries=${STAGING_DIR}/usr/lib \ + --with-openssl-includes=${STAGING_TARGET_DIR}/usr/include \ + --with-openssl-libraries=${STAGING_TARGET_DIR}/usr/lib \ --with-system-libltld \ --enable-strict-dependencies \ --with-raddbdir=/etc/freeradius \ diff --git a/package/gatling/Makefile b/package/gatling/Makefile index 850ef17be..034f86f7c 100644 --- a/package/gatling/Makefile +++ b/package/gatling/Makefile @@ -25,7 +25,7 @@ INSTALL_STYLE:= manual MAKE_FILE:= GNUmakefile ALL_TARGET:= gatling -TCPPFLAGS+= -I${STAGING_DIR}/usr/include/owfat +TCPPFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/owfat XAKE_FLAGS+= CC='${TARGET_CC}' \ CFLAGS='${TCPPFLAGS} ${TCFLAGS}' \ ZLIB=0 DIET= prefix='${WRKINST}/usr' diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 466cfad60..1f2ce8f99 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -10,8 +10,6 @@ PKG_OPTS:= noremove PKG_DEPENDS:= libmpc libgmp mpfr PKG_BUILDDEP:= libmpc gmp mpfr -PKG_TARGET_DEPENDS:= !ag241 - WRKBUILD= ${WRKDIR}/${PKG_NAME}-obj include ${TOPDIR}/mk/package.mk diff --git a/package/gdb/Makefile b/package/gdb/Makefile index 7c1261135..5d3d60806 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -10,7 +10,7 @@ PKG_DEPENDS:= libthread-db libncurses libiconv libexpat PKG_BUILDDEP:= ncurses readline libiconv expat PKG_NOPARALLEL:= 1 -PKG_TARGET_DEPENDS:= !foxboard !ag241 +PKG_ARCH_DEPENDS:= !cris include ${TOPDIR}/mk/package.mk diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile index 56ead34a6..e57cc44f2 100644 --- a/package/gdbserver/Makefile +++ b/package/gdbserver/Makefile @@ -9,7 +9,7 @@ PKG_SECTION:= debug PKG_DEPENDS:= libthread-db PKG_SUBPKGS:= GDBSERVER -PKG_TARGET_DEPENDS:= !foxboard +PKG_ARCH_DEPENDS:= !cris WRKSRC= ${WRKDIST}/gdb/gdbserver diff --git a/package/gdk-pixbuf/Makefile b/package/gdk-pixbuf/Makefile new file mode 100644 index 000000000..2ca5ff920 --- /dev/null +++ b/package/gdk-pixbuf/Makefile @@ -0,0 +1,27 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= gdk-pixbuf +PKG_VERSION:= 2.23.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= a7d6c5f2fe2d481149ed3ba807b5c043 +PKG_DESCR:= GDK pixbuf library +PKG_SECTION:= libs +PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.23/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,GDK_PIXBUF,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_ENV+= gio_can_sniff=no + +post-install: + $(INSTALL_DIR) $(IDIR_GDK_PIXBUF)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/ + $(CP) $(WRKINST)/usr/lib/libgdk_pixbuf*so* \ + $(IDIR_GDK_PIXBUF)/usr/lib + $(CP) $(WRKINST)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*.so \ + $(IDIR_GDK_PIXBUF)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/ + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/gettext/Makefile b/package/gettext/Makefile index a0b0a7b65..76e73fed0 100644 --- a/package/gettext/Makefile +++ b/package/gettext/Makefile @@ -31,7 +31,7 @@ CONFIGURE_ARGS+= --disable-java \ --disable-libasprintf \ --enable-threads=posix \ --disable-openmp \ - --with-libiconv-prefix='${STAGING_DIR}/usr' \ + --with-libiconv-prefix='${STAGING_TARGET_DIR}/usr' \ --with-included-gettext \ --without-emacs CONFIGURE_ENV+= nls_cv_use_gnu_gettext=yes \ @@ -42,6 +42,6 @@ post-install: ${INSTALL_DIR} ${IDIR_GETTEXT}/usr/lib ${IDIR_GETTEXT}/usr/bin ${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_GETTEXT}/usr/lib $(INSTALL_BIN) $(WRKINST)/usr/bin/gettext \ - $(IDIR_GETTEXT)/usr/bin + $(IDIR_GETTEXT)/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/git/Makefile b/package/git/Makefile index b3aa2fdbe..2f706f3e3 100644 --- a/package/git/Makefile +++ b/package/git/Makefile @@ -19,7 +19,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,GIT,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) MAKE_ENV+= NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 NO_PYTHON=1 \ - CURLDIR=${STAGING_DIR} EXPATDIR=${STAGING_DIR} + CURLDIR=${STAGING_TARGET_DIR} EXPATDIR=${STAGING_TARGET_DIR} XAKE_FLAGS+= uname_S=Linux uname_O=GNU/Linux CONFIGURE_ENV+= ac_cv_c_c99_format=yes \ ac_cv_fread_reads_directories=no \ diff --git a/package/glib/Makefile b/package/glib/Makefile index 9abe5a292..c8ae30715 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -4,15 +4,15 @@ include ${TOPDIR}/rules.mk PKG_NAME:= glib -PKG_VERSION:= 2.22.3 +PKG_VERSION:= 2.27.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= e699a93d62c01e0ee07caef3e11eddd8 +PKG_MD5SUM:= ad9c80adb624a1ffe3d9753bab8a578a PKG_DESCR:= low-level core library that forms the basis of GTK+ PKG_SECTION:= libs PKG_DEPENDS:= gettext libiconv libpthread PKG_BUILDDEP:= gettext libiconv PKG_URL:= http://www.gtk.org/ -PKG_SITES:= ftp://ftp.gtk.org/pub/glib/2.22/ +PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/glib/2.27/ ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly diff --git a/package/glib/patches/patch-gio_Makefile_in b/package/glib/patches/patch-gio_Makefile_in deleted file mode 100644 index 5eaa2eef1..000000000 --- a/package/glib/patches/patch-gio_Makefile_in +++ /dev/null @@ -1,20 +0,0 @@ ---- glib-2.22.2.orig/gio/Makefile.in 2009-10-07 15:56:29.000000000 +0200 -+++ glib-2.22.2/gio/Makefile.in 2009-10-11 11:04:35.126154998 +0200 -@@ -242,7 +242,7 @@ ETAGS = etags - CTAGS = ctags - am__tty_colors = \ - red=; grn=; lgn=; blu=; std= --DIST_SUBDIRS = libasyncns xdgmime inotify fen win32 . fam tests -+DIST_SUBDIRS = libasyncns xdgmime inotify fen win32 . fam - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - am__relativize = \ - dir0=`pwd`; \ -@@ -489,7 +489,7 @@ EXTRA_DIST = gio-marshal.list gio.symbol - TEST_PROGS = - NULL = - SUBDIRS = $(am__append_1) $(am__append_2) $(am__append_6) \ -- $(am__append_9) . $(am__append_12) tests -+ $(am__append_9) . $(am__append_12) - @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@noinst_DATA = gio-2.0.lib - @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir) - @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib diff --git a/package/glibc/Makefile b/package/glibc/Makefile index e995cb957..8b4584373 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -30,19 +30,18 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} test -z $(ADK_RUNTIME_TIMEZONE) || \ $(CP) /usr/share/zoneinfo/$(ADK_RUNTIME_TIMEZONE) \ $(IDIR_GLIBC)/etc/localtime - $(CP) $(STAGING_DIR)/lib/libgcc_s.so* $(IDIR_GLIBC)/lib/ - $(CP) $(STAGING_DIR)/lib/ld*.so* $(IDIR_GLIBC)/lib/ + $(CP) $(STAGING_TARGET_DIR)/lib/ld*.so* $(IDIR_GLIBC)/lib/ -for file in libc libcrypt libdl libm libresolv librt libutil libnss_compat libnss_dns libnss_files; do \ - $(CP) $(STAGING_DIR)/lib/$$file.so* $(IDIR_GLIBC)/lib/; \ - $(CP) $(STAGING_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/lib/; \ + $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_GLIBC)/lib/; \ + $(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/lib/; \ done glibc-dev-install: ${INSTALL_DIR} $(IDIR_GLIBC_DEV)/lib $(IDIR_GLIBC_DEV)/usr/lib # install linker script -cp ./files/libc.so.$(ARCH) $(IDIR_GLIBC_DEV)/usr/lib/libc.so - ${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_GLIBC_DEV}/usr/lib - ${CP} ${STAGING_DIR}/usr/lib/libc_nonshared.a ${IDIR_GLIBC_DEV}/usr/lib + ${CP} ${STAGING_TARGET_DIR}/usr/lib/crt* ${IDIR_GLIBC_DEV}/usr/lib + ${CP} ${STAGING_TARGET_DIR}/usr/lib/libc_nonshared.a ${IDIR_GLIBC_DEV}/usr/lib -for file in libc libcrypt libdl libm libresolv librt libutil; do \ cd $(IDIR_GLIBC_DEV)/lib/; ln -sf $$file-$(PKG_VERSION).so $$file.so; \ done @@ -62,7 +61,7 @@ glibc-dev-install: touch $(IDIR_GLIBC_DEV)/usr/include/gnu/stubs.h touch $(IDIR_GLIBC_DEV)/usr/include/bits/stdio_lim.h # WORKAROUND: bits/syscall.h is only installed via install-others target - $(CP) $(STAGING_DIR)/usr/include/bits/syscall.h \ + $(CP) $(STAGING_TARGET_DIR)/usr/include/bits/syscall.h \ $(IDIR_GLIBC_DEV)/usr/include/bits @find $(IDIR_GLIBC_DEV) -name .install -exec rm {} \; diff --git a/package/gmediaserver/Makefile b/package/gmediaserver/Makefile index 568bc424c..5fee99c45 100644 --- a/package/gmediaserver/Makefile +++ b/package/gmediaserver/Makefile @@ -20,8 +20,8 @@ $(eval $(call PKG_template,GMEDIASERVER,gmediaserver,${PKG_VERSION}-${PKG_RELEAS CONFIGURE_ENV+= LIBS=" -lixml -lthreadutil -lupnp -lz" \ am_cv_func_iconv=no -CONFIGURE_ARGS+= --with-id3lib="${STAGING_DIR}/usr" \ - --with-libupnp="${STAGING_DIR}/usr" +CONFIGURE_ARGS+= --with-id3lib="${STAGING_TARGET_DIR}/usr" \ + --with-libupnp="${STAGING_TARGET_DIR}/usr" ifeq ($(ADK_TARGET_LIB_UCLIBCXX),y) CONFIGURE_ENV+= LIBS=" -lixml -lthreadutil -lupnp -luClibc++ -lz" diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile index c6967f497..7a289205e 100644 --- a/package/gnutls/Makefile +++ b/package/gnutls/Makefile @@ -32,7 +32,7 @@ $(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${ CONFIGURE_ARGS+= --without-libopencdk-prefix \ --disable-camellia \ - --with-libgcrypt-prefix=${STAGING_DIR}/usr \ + --with-libgcrypt-prefix=${STAGING_TARGET_DIR}/usr \ --without-libz-prefix post-install: diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile index 275613e3d..83fac860b 100644 --- a/package/gpsd/Makefile +++ b/package/gpsd/Makefile @@ -33,7 +33,7 @@ TCFLAGS+= -fPIC ifeq ($(ADK_COMPILE_GPSD_WITH_UCLIBCXX),y) TCXXFLAGS+= -fno-builtin -fno-rtti -nostdinc++ \ - -I${STAGING_DIR}/usr/include/uClibc++ + -I${STAGING_TARGET_DIR}/usr/include/uClibc++ TLDFLAGS+= -luClibc++ -lc -lm -pthread -nodefaultlibs else TLDFLAGS+= -shared -pthread diff --git a/package/grub-bin/Makefile b/package/grub-bin/Makefile index 51f61c226..9f2c54702 100644 --- a/package/grub-bin/Makefile +++ b/package/grub-bin/Makefile @@ -14,10 +14,11 @@ PKG_SECTION:= base PKG_SITES:= http://openadk.org/distfiles/ PKG_URL:= http://www.gnu.org/software/grub -PKG_TARGET_DEPENDS:= x86 x86_64 +PKG_ARCH_DEPENDS:= x86 x86_64 + PKG_CFLINE_GRUB_BIN:= select BUSYBOX_FEATURE_STAT_FORMAT@ PKG_CFLINE_GRUB_BIN+= depends on !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS -PKG_DFLT_GRUB_BIN:= y +PKG_DFLT_GRUB_BIN:= y if !ADK_TOOLCHAIN_ONLY include ${TOPDIR}/mk/package.mk diff --git a/package/grub/Makefile b/package/grub/Makefile index 404332590..38c3c326e 100644 --- a/package/grub/Makefile +++ b/package/grub/Makefile @@ -13,7 +13,7 @@ PKG_URL:= http://www.gnu.org/software/grub PKG_SITES:= ftp://alpha.gnu.org/gnu/grub/ PKG_HOST_DEPENDS:= linux -PKG_TARGET_DEPENDS:= x86 x86_64 +PKG_ARCH_DEPENDS:= x86 x86_64 include $(TOPDIR)/mk/package.mk diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile index a9aa56c20..41972cbbc 100644 --- a/package/gtk+/Makefile +++ b/package/gtk+/Makefile @@ -4,15 +4,16 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gtk+ -PKG_VERSION:= 2.18.6 +PKG_VERSION:= 2.22.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= f98617af9f6be3065f64248f78dae2b7 +PKG_MD5SUM:= dd1830395a6b9265a1e1989af7a3c5bf PKG_DESCR:= GTK+ library PKG_SECTION:= libs PKG_DEPENDS:= glib PKG_BUILDDEP:= cairo atk pango libXext renderproto libXrender +PKG_BUILDDEP+= gdk-pixbuf libXcomposite PKG_URL:= http://www.gtk.org/ -PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/gtk+/2.18/ +PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/gtk+/2.22/ PKG_SUBPKGS:= LIBGTK @@ -26,8 +27,6 @@ $(eval $(call PKG_template,LIBGTK,libgtk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP CONFIGURE_ENV+= gio_can_sniff=no \ ac_cv_path_GTK_UPDATE_ICON_CACHE="" -CONFIGURE_ARGS+= --without-libtiff \ - --without-libjpeg post-install: ${INSTALL_DIR} ${IDIR_LIBGTK}/usr/lib diff --git a/package/gtk+/patches/patch-Makefile_in b/package/gtk+/patches/patch-Makefile_in deleted file mode 100644 index 02ebabfca..000000000 --- a/package/gtk+/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk+-2.18.3.orig/Makefile.in 2009-10-17 03:53:04.000000000 +0200 -+++ gtk+-2.18.3/Makefile.in 2009-12-04 22:04:14.000000000 +0100 -@@ -464,7 +464,7 @@ XVFB_START = \ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules contrib - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros - - # require automake 1.4 diff --git a/package/gtk+/patches/patch-gtk_gtktypefuncs_c b/package/gtk+/patches/patch-gtk_gtktypefuncs_c deleted file mode 100644 index a5ed911a2..000000000 --- a/package/gtk+/patches/patch-gtk_gtktypefuncs_c +++ /dev/null @@ -1,70 +0,0 @@ ---- gtk+-2.18.3.orig/gtk/gtktypefuncs.c 2009-10-17 03:58:56.000000000 +0200 -+++ gtk+-2.18.3/gtk/gtktypefuncs.c 2009-12-04 21:57:40.000000000 +0100 -@@ -53,8 +53,8 @@ - *tp++ = gdk_pixbuf_simple_anim_get_type(); - *tp++ = gdk_pixbuf_simple_anim_iter_get_type(); - *tp++ = gdk_pixmap_get_type(); --*tp++ = gdk_property_state_get_type(); - *tp++ = gdk_prop_mode_get_type(); -+*tp++ = gdk_property_state_get_type(); - *tp++ = gdk_rectangle_get_type(); - *tp++ = gdk_rgb_dither_get_type(); - *tp++ = gdk_screen_get_type(); -@@ -191,14 +191,14 @@ - *tp++ = gtk_icon_view_drop_position_get_type(); - *tp++ = gtk_icon_view_get_type(); - *tp++ = gtk_identifier_get_type(); --*tp++ = gtk_image_get_type(); --*tp++ = gtk_image_menu_item_get_type(); --*tp++ = gtk_image_type_get_type(); - *tp++ = gtk_im_context_get_type(); - *tp++ = gtk_im_context_simple_get_type(); - *tp++ = gtk_im_multicontext_get_type(); - *tp++ = gtk_im_preedit_style_get_type(); - *tp++ = gtk_im_status_style_get_type(); -+*tp++ = gtk_image_get_type(); -+*tp++ = gtk_image_menu_item_get_type(); -+*tp++ = gtk_image_type_get_type(); - *tp++ = gtk_info_bar_get_type(); - *tp++ = gtk_input_dialog_get_type(); - *tp++ = gtk_invisible_get_type(); -@@ -283,10 +283,10 @@ - *tp++ = gtk_ruler_get_type(); - *tp++ = gtk_scale_button_get_type(); - *tp++ = gtk_scale_get_type(); --*tp++ = gtk_scrollbar_get_type(); --*tp++ = gtk_scrolled_window_get_type(); - *tp++ = gtk_scroll_step_get_type(); - *tp++ = gtk_scroll_type_get_type(); -+*tp++ = gtk_scrollbar_get_type(); -+*tp++ = gtk_scrolled_window_get_type(); - *tp++ = gtk_selection_data_get_type(); - *tp++ = gtk_selection_mode_get_type(); - *tp++ = gtk_sensitivity_type_get_type(); -@@ -305,8 +305,8 @@ - *tp++ = gtk_spin_button_update_policy_get_type(); - *tp++ = gtk_spin_type_get_type(); - *tp++ = gtk_state_type_get_type(); --*tp++ = gtk_statusbar_get_type(); - *tp++ = gtk_status_icon_get_type(); -+*tp++ = gtk_statusbar_get_type(); - *tp++ = gtk_style_get_type(); - *tp++ = gtk_submenu_direction_get_type(); - *tp++ = gtk_submenu_placement_get_type(); -@@ -330,13 +330,13 @@ - *tp++ = gtk_toggle_action_get_type(); - *tp++ = gtk_toggle_button_get_type(); - *tp++ = gtk_toggle_tool_button_get_type(); -+*tp++ = gtk_tool_button_get_type(); -+*tp++ = gtk_tool_item_get_type(); -+*tp++ = gtk_tool_shell_get_type(); - *tp++ = gtk_toolbar_child_type_get_type(); - *tp++ = gtk_toolbar_get_type(); - *tp++ = gtk_toolbar_space_style_get_type(); - *tp++ = gtk_toolbar_style_get_type(); --*tp++ = gtk_tool_button_get_type(); --*tp++ = gtk_tool_item_get_type(); --*tp++ = gtk_tool_shell_get_type(); - *tp++ = gtk_tooltip_get_type(); - *tp++ = gtk_tree_drag_dest_get_type(); - *tp++ = gtk_tree_drag_source_get_type(); diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile index dfffe8523..ca7f3e93c 100644 --- a/package/heimdal/Makefile +++ b/package/heimdal/Makefile @@ -56,8 +56,8 @@ endif ifeq ($(ADK_COMPILE_HEIMDAL_WITH_LDAP),y) CONFIGURE_ARGS+= --with-openldap=yes -CONFIGURE_ARGS+= --with-openldap-include=${STAGING_DIR}/usr -CONFIGURE_ARGS+= --with-openldap-lib=${STAGING_DIR}/usr +CONFIGURE_ARGS+= --with-openldap-include=${STAGING_TARGET_DIR}/usr +CONFIGURE_ARGS+= --with-openldap-lib=${STAGING_TARGET_DIR}/usr else CONFIGURE_ARGS+= --without-openldap endif @@ -68,9 +68,9 @@ else CONFIGURE_OPTS+= --disable-pk-init endif -TCFLAGS+= -I${STAGING_DIR}/usr/include/et -pthread +TCFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/et -pthread -CONFIGURE_ARGS+= ${CONFIGURE_OPTS} --with-cross-tools=${STAGING_TOOLS}/bin +CONFIGURE_ARGS+= ${CONFIGURE_OPTS} --with-cross-tools=${STAGING_HOST_DIR}/bin CONFIGURE_ENV+= cross_compiling=yes \ ac_cv_func_getaddrinfo_numserv=yes @@ -80,7 +80,7 @@ endif pre-configure: (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ - ./configure --prefix=$(STAGING_TOOLS) \ + ./configure --prefix=$(STAGING_HOST_DIR) \ --disable-pk-init \ --without-openldap \ --disable-otp \ @@ -92,9 +92,9 @@ pre-configure: ${MAKE} -C ${WRKBUILD}/lib/asn1 asn1_compile$(EXEEXT) ${MAKE} -C ${WRKBUILD}/lib/sl slc$(EXEEXT) ${INSTALL_BIN} ${WRKBUILD}/lib/roken/make-roken$(EXEEXT) \ - ${STAGING_TOOLS}/bin + ${STAGING_HOST_DIR}/bin ${INSTALL_BIN} ${WRKBUILD}/lib/sl/slc$(EXEEXT) \ - ${STAGING_TOOLS}/bin + ${STAGING_HOST_DIR}/bin ${MAKE} -C ${WRKBUILD}/lib/roken install ${MAKE} -C ${WRKBUILD}/lib/asn1 install ${MAKE} -C ${WRKBUILD}/lib/asn1 clean diff --git a/package/icecast/Makefile b/package/icecast/Makefile index 295c45844..f37bc9080 100644 --- a/package/icecast/Makefile +++ b/package/icecast/Makefile @@ -18,15 +18,15 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,ICECAST,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TCPPFLAGS+= -I${STAGING_DIR}/usr/include/libxml2 +TCPPFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/libxml2 CONFIGURE_ARGS+= --disable-yp \ --with-curl="yes" \ - --with-curl-config="${STAGING_DIR}/usr/bin/curl-config" \ - --with-ogg="${STAGING_DIR}/usr" \ - --with-vorbis="${STAGING_DIR}/usr" \ + --with-curl-config="${STAGING_TARGET_DIR}/usr/bin/curl-config" \ + --with-ogg="${STAGING_TARGET_DIR}/usr" \ + --with-vorbis="${STAGING_TARGET_DIR}/usr" \ --with-speex="no" \ --with-theora="no" \ - --with-xslt-config="${STAGING_DIR}/usr/bin/xslt-config" + --with-xslt-config="${STAGING_TARGET_DIR}/usr/bin/xslt-config" post-install: ${INSTALL_DIR} ${IDIR_ICECAST}/etc diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile index a35c76f0e..17c92c1be 100644 --- a/package/id3lib/Makefile +++ b/package/id3lib/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS+= --enable-cxx-warnings=no ifeq ($(ADK_COMPILE_ID3LIB_WITH_UCLIBCXX),y) TCXXFLAGS+= -fno-builtin -fno-rtti -nostdinc++ \ - -I${STAGING_DIR}/usr/include/uClibc++ + -I${STAGING_TARGET_DIR}/usr/include/uClibc++ CONFIGURE_ENV+= LIBS="-nodefaultlibs -luClibc++ -lz -lm -lc" else TLDFLAGS+= -shared diff --git a/package/ipcad/Makefile b/package/ipcad/Makefile index 769b3898b..d658cc4fb 100644 --- a/package/ipcad/Makefile +++ b/package/ipcad/Makefile @@ -20,8 +20,8 @@ $(eval $(call PKG_template,IPCAD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG CONFIGURE_ARGS+= --with-ifst=linux \ --with-psrc=pcap \ - --with-pcap-include="${STAGING_DIR}/usr/include" \ - --with-pcap-libraries="${STAGING_DIR}/usr/lib" + --with-pcap-include="${STAGING_TARGET_DIR}/usr/include" \ + --with-pcap-libraries="${STAGING_TARGET_DIR}/usr/lib" pre-build: touch $(WRKBUILD)/cfglex.c $(WRKBUILD)/cslex.c diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile index d3efd7f5d..5e92467cd 100644 --- a/package/ipsec-tools/Makefile +++ b/package/ipsec-tools/Makefile @@ -26,7 +26,7 @@ $(eval $(call PKG_template,IPSEC_TOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE} CONFIGURE_ARGS+= --with-kernel-headers="${LINUX_DIR}/include" \ --without-readline \ --disable-security-context \ - --with-openssl="${STAGING_DIR}/usr" \ + --with-openssl="${STAGING_TARGET_DIR}/usr" \ --without-libradius \ --without-libpam diff --git a/package/iptraf/Makefile b/package/iptraf/Makefile index 6c3bc7907..98f9e9b5d 100644 --- a/package/iptraf/Makefile +++ b/package/iptraf/Makefile @@ -27,8 +27,8 @@ do-build: ${TARGET_CONFIGURE_OPTS} \ CFLAGS="${TARGET_CFLAGS}" \ DEBUG="" \ - INCLUDEDIR="-I../support -I${STAGING_DIR}/usr/include" \ - LDOPTS="-L${STAGING_DIR}/usr/lib -L${STAGING_DIR}/lib" \ + INCLUDEDIR="-I../support -I${STAGING_TARGET_DIR}/usr/include" \ + LDOPTS="-L${STAGING_TARGET_DIR}/usr/lib -L${STAGING_TARGET_DIR}/lib" \ PLATFORM="-DPLATFORM=\\\"Linux/${ARCH}\\\"" \ TARGET="/usr/bin" \ WORKDIR="/var/lib/iptraf" \ diff --git a/package/iw/Makefile b/package/iw/Makefile index fd552a4ba..6510063a9 100644 --- a/package/iw/Makefile +++ b/package/iw/Makefile @@ -14,7 +14,7 @@ PKG_BUILDDEP:= libnl PKG_URL:= http://wireless.kernel.org/en/users/Documentation/iw PKG_SITES:= http://wireless.kernel.org/download/iw/ -PKG_DFLT_IW:= y if ADK_HARDWARE_IBM_X40 +PKG_DFLT_IW:= y if ADK_TARGET_SYSTEM_IBM_X40 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile index 2d5854425..f00c714cf 100644 --- a/package/jamvm/Makefile +++ b/package/jamvm/Makefile @@ -14,7 +14,7 @@ PKG_BUILDDEP:= libffi zlib PKG_URL:= http://jamvm.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jamvm/} -PKG_TARGET_DEPENDS:= !foxboard +PKG_ARCH_DEPENDS:= !cris include ${TOPDIR}/mk/package.mk diff --git a/package/krb5/Makefile b/package/krb5/Makefile index 1cbaae817..3e49475b6 100644 --- a/package/krb5/Makefile +++ b/package/krb5/Makefile @@ -31,7 +31,7 @@ SUB_INSTALLS-y:= SUB_INSTALLS-m:= SUB_INSTALLS-${ADK_PACKAGE_LIBKRB5}+= libkrb5-install -TCFLAGS+= -I${STAGING_DIR}/usr/include/et +TCFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/et CONFIGURE_ARGS+= --disable-static \ --disable-profiled \ --with-system-ss \ diff --git a/package/libX11/Makefile b/package/libX11/Makefile index 153a08f12..92f1f52aa 100644 --- a/package/libX11/Makefile +++ b/package/libX11/Makefile @@ -30,7 +30,7 @@ SUB_INSTALLS-y:= SUB_INSTALLS-m:= SUB_INSTALLS-${ADK_PACKAGE_LIBX11_DEV}+=libx11-dev-install -XAKE_FLAGS+= HOSTCPPFLAGS=-I${STAGING_DIR}/usr/include/xproto +XAKE_FLAGS+= HOSTCPPFLAGS=-I${STAGING_TARGET_DIR}/usr/include/xproto CONFIGURE_ARGS+= --enable-xlocale \ --disable-specs \ --disable-xf86bigfont \ diff --git a/package/libXcomposite/Makefile b/package/libXcomposite/Makefile new file mode 100644 index 000000000..fc395a708 --- /dev/null +++ b/package/libXcomposite/Makefile @@ -0,0 +1,43 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= libXcomposite +PKG_VERSION:= 0.4.3 +PKG_RELEASE:= 1 +PKG_MD5SUM:= b93dac50c86db6eba3f72e949f5bed2a +PKG_DESCR:= X composite library +PKG_SECTION:= x11/libs +PKG_BUILDDEP:= libX11 compositeproto +PKG_SITES:= ${MASTER_SITE_XORG} + +PKG_SUBPKGS:= LIBXCOMPOSITE LIBXCOMPOSITE_DEV +PKGSD_LIBXCOMPOSITE_DEV:= X11 composite headers +PKGSC_LIBXCOMPOSITE_DEV:= devel + +ifeq ($(ADK_STATIC),y) +PKG_OPTS:= libonly +endif + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBXCOMPOSITE,libxcomposite,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,LIBXCOMPOSITE_DEV,libxcomposite-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXCOMPOSITE_DEV},${PKGSC_LIBXCOMPOSITE_DEV},${PKG_OPTS})) + +SUB_INSTALLS-y:= +SUB_INSTALLS-m:= +SUB_INSTALLS-${ADK_PACKAGE_LIBXCOMPOSITE_DEV}+= libxcomposite-dev-install + +CONFIGURE_ARGS+= --disable-malloc0returnsnull + +post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} + ${INSTALL_DIR} ${IDIR_LIBXCOMPOSITE}/usr/lib + ${CP} ${WRKINST}/usr/lib/libXcomposite.so* ${IDIR_LIBXCOMPOSITE}/usr/lib/ + +libxcomposite-dev-install: + ${INSTALL_DIR} ${IDIR_LIBXCOMPOSITE_DEV}/usr/include/X11/extensions + ${CP} ${WRKINST}/usr/include/X11/extensions/*.h \ + ${IDIR_LIBXCOMPOSITE_DEV}/usr/include/X11/extensions + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libXt/Makefile b/package/libXt/Makefile index e8048e1d6..65335b0b4 100644 --- a/package/libXt/Makefile +++ b/package/libXt/Makefile @@ -16,7 +16,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -XAKE_FLAGS+= HOSTCPPFLAGS=-I${STAGING_DIR}/usr/include/xproto +XAKE_FLAGS+= HOSTCPPFLAGS=-I${STAGING_TARGET_DIR}/usr/include/xproto CONFIGURE_ARGS+= --disable-malloc0returnsnull \ --disable-install-makestrs diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile new file mode 100644 index 000000000..b02464e9a --- /dev/null +++ b/package/libgcc/Makefile @@ -0,0 +1,29 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include ${TOPDIR}/rules.mk +include ${TOPDIR}/toolchain/gcc/Makefile.inc + +PKG_NAME:= libgcc +PKG_DESCR:= GCC library +PKG_SECTION:= libs + +PKG_DFLT_LIBGCC:= y + +NO_DISTFILES:= 1 + +include ${TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,LIBGCC,libgcc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + +do-install: +ifeq ($(ADK_NATIVE),) + ${INSTALL_DIR} ${IDIR_LIBGCC}/lib + ${CP} ${STAGING_TARGET_DIR}/lib/libgcc*.so* ${IDIR_LIBGCC}/lib +endif + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile index f134ceb06..9600093f4 100644 --- a/package/libgcrypt/Makefile +++ b/package/libgcrypt/Makefile @@ -19,7 +19,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBGCRYPT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ARGS+= --disable-asm \ - --with-gpg-error-prefix="${STAGING_DIR}/usr" + --with-gpg-error-prefix="${STAGING_TARGET_DIR}/usr" post-install: ${INSTALL_DIR} ${IDIR_LIBGCRYPT}/usr/lib diff --git a/package/libgd/Makefile b/package/libgd/Makefile index b49270804..1961edf2d 100644 --- a/package/libgd/Makefile +++ b/package/libgd/Makefile @@ -20,11 +20,11 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBGD,libgd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ENV+= LIBPNG12_CONFIG="${STAGING_DIR}/usr/bin/libpng12-config" +CONFIGURE_ENV+= LIBPNG12_CONFIG="${STAGING_TARGET_DIR}/usr/bin/libpng12-config" CONFIGURE_ARGS+= --without-x \ --without-freetype \ - --with-jpeg=${STAGING_DIR}/usr \ - --with-png=${STAGING_DIR}/usr \ + --with-jpeg=${STAGING_TARGET_DIR}/usr \ + --with-png=${STAGING_TARGET_DIR}/usr \ --without-xpm post-install: diff --git a/package/libnet/Makefile b/package/libnet/Makefile index 12a168824..5309c68ec 100644 --- a/package/libnet/Makefile +++ b/package/libnet/Makefile @@ -4,15 +4,15 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libnet -PKG_VERSION:= 1.1.4 +PKG_VERSION:= 1.1.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= c5e06418a89cc4209f677a776a798fd9 +PKG_MD5SUM:= a9bc1d75a610efcfee200d3e28d8eb8f PKG_DESCR:= a low-level packet creation library PKG_SECTION:= libs PKG_DEPENDS:= libpcap PKG_BUILDDEP:= libpcap PKG_URL:= http://sourceforge.net/projects/libnet-dev/ -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libnet-dev/libnet-${PKG_VERSION}/} +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libnet-dev/} include ${TOPDIR}/mk/package.mk @@ -20,14 +20,18 @@ ENDIAN:=lil ifeq (${CPU_ARCH},mips) ENDIAN:=big endif +ifeq (${CPU_ARCH},mips64) +ENDIAN:=big +endif +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_libnet_have_pf_packet=yes \ - ac_cv_libnet_endianess=${ENDIAN} \ - LL_INT_TYPE=linux \ +CONFIGURE_ENV+= ac_cv_libnet_endianess=${ENDIAN} \ ac_cv_lbl_unaligned_fail=no -CONFIGURE_ARGS+= --with-pf_packet=yes +#CONFIGURE_ARGS+= --with-pf_packet=yes post-install: ${INSTALL_DIR} ${IDIR_LIBNET}/usr/lib diff --git a/package/libnet/patches/patch-configure b/package/libnet/patches/patch-configure deleted file mode 100644 index dceedf213..000000000 --- a/package/libnet/patches/patch-configure +++ /dev/null @@ -1,83 +0,0 @@ ---- libnet-1.1.4.orig/configure 2009-06-10 01:13:22.000000000 +0200 -+++ libnet-1.1.4/configure 2009-12-11 11:45:26.000000000 +0100 -@@ -1,4 +1,4 @@ --#! /bin/sh -+# - # Guess values for system-dependent variables and create Makefiles. - # Generated by GNU Autoconf 2.61 for libnet 1.1.4. - # -@@ -19678,57 +19678,6 @@ done - { echo "$as_me:$LINENO: checking machine endianess" >&5 - echo $ECHO_N "checking machine endianess... $ECHO_C" >&6; } - -- cat > conftest.c << EOF --# include <stdio.h> --# include <stdlib.h> -- -- int main() -- { -- union -- { -- short s; -- char c[sizeof(short)]; -- } un; -- -- un.s = 0x0102; -- if (sizeof (short) == 2) -- { -- if (un.c [0] == 1 && un.c [1] == 2) -- { -- printf("B\n"); -- } -- else -- { -- if (un.c [0] == 2 && un.c [1] == 1) -- { -- printf("L\n"); -- } -- } -- } -- else -- { -- printf("?\n"); -- } -- return (EXIT_SUCCESS); -- } --EOF -- ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS > /dev/null 2>&1 -- # Oopz 4.3 BSD doesn't have this. Sorry. -- if test ! -x conftest ; then -- ac_cv_libnet_endianess=unknown -- else -- ./conftest > conftest.out -- result=`cat conftest.out` -- if test $result = "B"; then -- ac_cv_libnet_endianess=big -- elif test $result = "L"; then -- ac_cv_libnet_endianess=lil -- else -- ac_cv_libnet_endianess=unknown -- fi -- fi -- rm -f conftest* core core.conftest -- - { echo "$as_me:$LINENO: result: $ac_cv_libnet_endianess" >&5 - echo "${ECHO_T}$ac_cv_libnet_endianess" >&6; } - -@@ -19836,7 +19785,15 @@ _ACEOF - { echo "$as_me:$LINENO: checking link-layer packet interface type" >&5 - echo $ECHO_N "checking link-layer packet interface type... $ECHO_C" >&6; } - --if test -r /dev/bpf0 ; then -+if test -n "$LL_INT_TYPE"; then -+ case $LIBOBJS in -+ "libnet_link_$LL_INT_TYPE.$ac_objext" | \ -+ *" libnet_link_$LL_INT_TYPE.$ac_objext" | \ -+ "libnet_link_$LL_INT_TYPE.$ac_objext "* | \ -+ *" libnet_link_$LL_INT_TYPE.$ac_objext "* ) ;; -+ *) LIBOBJS="$LIBOBJS libnet_link_$LL_INT_TYPE.$ac_objext" ;; -+esac -+elif test -r /dev/bpf0 ; then - case " $LIBOBJS " in - *" libnet_link_bpf.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS libnet_link_bpf.$ac_objext" diff --git a/package/libnids/Makefile b/package/libnids/Makefile index 123314e44..671aa5f57 100644 --- a/package/libnids/Makefile +++ b/package/libnids/Makefile @@ -18,7 +18,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBNIDS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ARGS+= --with-libpcap=${STAGING_DIR}/usr +CONFIGURE_ARGS+= --with-libpcap=${STAGING_TARGET_DIR}/usr XAKE_FLAGS+= install_prefix="${WRKINST}" post-install: diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index caacf0e8c..ebc7701ce 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --disable-yydebug \ --with-pcap=linux TCFLAGS+= ${TCPPFLAGS} INSTALL_TARGET= install install-shared -MAKE_FLAGS+= STAGING_DIR=$(STAGING_DIR) +MAKE_FLAGS+= STAGING_TARGET_DIR=$(STAGING_TARGET_DIR) ifneq (${ADK_PACKAGE_LIBPCAP_WITH_IPV6},) CONFIGURE_ARGS+= --enable-ipv6 diff --git a/package/libpcap/patches/patch-Makefile_in b/package/libpcap/patches/patch-Makefile_in index deb816cd6..d967498c3 100644 --- a/package/libpcap/patches/patch-Makefile_in +++ b/package/libpcap/patches/patch-Makefile_in @@ -6,8 +6,8 @@ @rm -f $@ $@.tmp - sed -e 's|@includedir[@]|$(includedir)|g' \ - -e 's|@libdir[@]|$(libdir)|g' \ -+ sed -e 's|@includedir[@]|$(STAGING_DIR)$(includedir)|g' \ -+ -e 's|@libdir[@]|$(STAGING_DIR)$(libdir)|g' \ ++ sed -e 's|@includedir[@]|$(STAGING_TARGET_DIR)$(includedir)|g' \ ++ -e 's|@libdir[@]|$(STAGING_TARGET_DIR)$(libdir)|g' \ -e 's|@LIBS[@]|$(LIBS)|g' \ -e 's|@V_RPATH_OPT[@]|$(V_RPATH_OPT)|g' \ $(srcdir)/pcap-config.in >$@.tmp diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile index c2f3f7a3c..feda89f6a 100644 --- a/package/libpthread/Makefile +++ b/package/libpthread/Makefile @@ -34,7 +34,7 @@ INSTALL_STYLE:= manual do-install: ifeq ($(ADK_NATIVE),) ${INSTALL_DIR} ${IDIR_LIBPTHREAD}/lib - ${CP} ${STAGING_DIR}/lib/libpthread*.so* ${IDIR_LIBPTHREAD}/lib + ${CP} ${STAGING_TARGET_DIR}/lib/libpthread*.so* ${IDIR_LIBPTHREAD}/lib cd $(IDIR_LIBPTHREAD)/lib && ln -sf libpthread.so.0 libpthread.so endif diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile index beaea330e..eb935fbb8 100644 --- a/package/libstdcxx/Makefile +++ b/package/libstdcxx/Makefile @@ -31,7 +31,7 @@ do-install: ifeq ($(ADK_NATIVE),y) $(CP) /usr/lib/libstdc++.so.* ${IDIR_LIBSTDCXX}/lib else - $(CP) ${STAGING_DIR}/lib/libstdc++.so.* ${IDIR_LIBSTDCXX}/lib + $(CP) ${STAGING_TARGET_DIR}/lib/libstdc++.so.* ${IDIR_LIBSTDCXX}/lib endif include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libthread_db/Makefile b/package/libthread_db/Makefile index ff31c858c..aa37c78b1 100644 --- a/package/libthread_db/Makefile +++ b/package/libthread_db/Makefile @@ -29,6 +29,6 @@ INSTALL_STYLE:= manual do-install: ${INSTALL_DIR} ${IDIR_LIBTHREAD_DB}/lib - ${CP} ${STAGING_DIR}/lib/libthread_db*.so* ${IDIR_LIBTHREAD_DB}/lib + ${CP} ${STAGING_TARGET_DIR}/lib/libthread_db*.so* ${IDIR_LIBTHREAD_DB}/lib include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile index dc59d91df..0db8d6993 100644 --- a/package/libvirt/Makefile +++ b/package/libvirt/Makefile @@ -15,7 +15,7 @@ PKG_URL:= http://www.libvirt.org/ PKG_SITES:= ftp://libvirt.org/libvirt/ PKG_HOST_DEPENDS:= !freebsd !netbsd !openbsd -PKG_TARGET_DEPENDS:= x86 x86_64 +PKG_ARCH_DEPENDS:= x86 x86_64 include ${TOPDIR}/mk/package.mk diff --git a/package/libvorbis/Makefile b/package/libvorbis/Makefile index c5ec6bdee..b9ef7eeda 100644 --- a/package/libvorbis/Makefile +++ b/package/libvorbis/Makefile @@ -21,9 +21,9 @@ $(eval $(call PKG_template,LIBVORBIS,libvorbis,${PKG_VERSION}-${PKG_RELEASE},${P $(eval $(call PKG_template,LIBVORBISENC,libvorbisenc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ENV+= LIBS="-lm -logg" -CONFIGURE_ARGS+= --with-ogg="${STAGING_DIR}/usr" \ - --with-ogg-includes="${STAGING_DIR}/usr/include" \ - --with-ogg-libraries="${STAGING_DIR}/usr/lib" +CONFIGURE_ARGS+= --with-ogg="${STAGING_TARGET_DIR}/usr" \ + --with-ogg-includes="${STAGING_TARGET_DIR}/usr/include" \ + --with-ogg-libraries="${STAGING_TARGET_DIR}/usr/lib" post-install: ${INSTALL_DIR} ${IDIR_LIBVORBIS}/usr/lib diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile index 9f3b1faef..8000a5d5a 100644 --- a/package/libxslt/Makefile +++ b/package/libxslt/Makefile @@ -18,9 +18,9 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBXSLT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ARGS+= --with-libxml-prefix="${STAGING_DIR}/usr" \ - --with-libxml-include-prefix="${STAGING_DIR}/usr/include/libxml2" \ - --with-libxml-libs-prefix="${STAGING_DIR}/usr/lib" \ +CONFIGURE_ARGS+= --with-libxml-prefix="${STAGING_TARGET_DIR}/usr" \ + --with-libxml-include-prefix="${STAGING_TARGET_DIR}/usr/include/libxml2" \ + --with-libxml-libs-prefix="${STAGING_TARGET_DIR}/usr/lib" \ --without-python \ --without-crypto \ --without-debug \ diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile index 780b9b5b5..69bbdab24 100644 --- a/package/lighttpd/Makefile +++ b/package/lighttpd/Makefile @@ -68,7 +68,7 @@ $(eval $(call PKG_mod_template,LIGHTTPD_MOD_STATUS,status)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_USERTRACK,usertrack)) $(eval $(call PKG_mod_template,LIGHTTPD_MOD_WEBDAV,webdav)) -TCPPFLAGS+= -I$(STAGING_DIR)/usr/include/libxml2 +TCPPFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/libxml2 CONFIGURE_ENV+= PCRE_LIB="-lpcre" CONFIGURE_ARGS+= \ --libdir=/usr/lib/lighttpd \ @@ -84,7 +84,7 @@ CONFIGURE_ARGS+= \ --with-pcre \ --without-valgrind \ --with-webdav-props \ - --with-openssl='${STAGING_DIR}/usr' + --with-openssl='${STAGING_TARGET_DIR}/usr' post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} install -m0755 -d $(IDIR_LIGHTTPD)/etc diff --git a/package/lvm/Makefile b/package/lvm/Makefile index 81124486c..b45a262e1 100644 --- a/package/lvm/Makefile +++ b/package/lvm/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= lvm -PKG_VERSION:= 2.02.76 +PKG_VERSION:= 2.02.79 PKG_RELEASE:= 1 -PKG_MD5SUM:= 1a43a943c218cb00ce1a6ce39889a6ae +PKG_MD5SUM:= e6929251a90b0b626c024942a242f337 PKG_DESCR:= logical volume management PKG_SECTION:= fs PKG_DEPENDS:= libdevmapper libncurses diff --git a/package/lvm/patches/patch-libdm_Makefile_in b/package/lvm/patches/patch-libdm_Makefile_in index 9a999133b..49f49a17a 100644 --- a/package/lvm/patches/patch-libdm_Makefile_in +++ b/package/lvm/patches/patch-libdm_Makefile_in @@ -1,5 +1,5 @@ ---- LVM2.2.02.72.orig/libdm/Makefile.in Fri Jun 25 20:17:39 2010 -+++ LVM2.2.02.72/libdm/Makefile.in Fri Jul 30 10:34:15 2010 +--- LVM2.2.02.79.orig/libdm/Makefile.in 2010-08-03 15:00:46.000000000 +0200 ++++ LVM2.2.02.79/libdm/Makefile.in 2010-12-26 22:15:11.000000000 +0100 @@ -34,10 +34,7 @@ SOURCES =\ INCLUDES = -I$(srcdir)/$(interface) -I$(srcdir) @@ -11,19 +11,18 @@ LIB_SHARED = $(interface)/libdevmapper.$(LIB_SUFFIX) LIB_VERSION = $(LIB_VERSION_DM) TARGETS += libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION) -@@ -65,11 +62,8 @@ libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX). +@@ -65,10 +62,7 @@ libdevmapper.$(LIB_SUFFIX) libdevmapper. install_pkgconfig INSTALL_TYPE = install_dynamic -+INSTALL_TYPE += install_static - +- -ifeq ("@STATIC_LINK@", "yes") - INSTALL_TYPE += install_static -endif -- ++INSTALL_TYPE += install_static + ifeq ("@PKGCONFIG@", "yes") INSTALL_TYPE += install_pkgconfig - endif @@ -79,7 +73,8 @@ install: $(INSTALL_TYPE) install_include install_device-mapper: install @@ -34,7 +33,7 @@ install_dynamic: install_@interface@ -@@ -88,10 +83,12 @@ install_static: install_@interface@_static +@@ -88,10 +83,12 @@ install_static: install_@interface@_stat install_ioctl: install_lib_shared install_pkgconfig: libdevmapper.pc @@ -48,4 +47,4 @@ + $(INSTALL_DATA) $< $(usrlibdir)/$(<F) CLEAN_TARGETS += ioctl/libdevmapper.a - DISTCLEAN_TARGETS += libdevmapper.pc + DISTCLEAN_TARGETS += libdevmapper.pc .exported_symbols_generated diff --git a/package/lvm/patches/patch-make_tmpl_in b/package/lvm/patches/patch-make_tmpl_in index 7ffbb36b5..43bd07008 100644 --- a/package/lvm/patches/patch-make_tmpl_in +++ b/package/lvm/patches/patch-make_tmpl_in @@ -1,6 +1,6 @@ ---- LVM2.2.02.72.orig/make.tmpl.in Tue Jul 20 16:38:44 2010 -+++ LVM2.2.02.72/make.tmpl.in Fri Jul 30 10:22:54 2010 -@@ -312,7 +312,8 @@ $(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSION) +--- LVM2.2.02.79.orig/make.tmpl.in 2010-11-05 17:18:38.000000000 +0100 ++++ LVM2.2.02.79/make.tmpl.in 2010-12-26 22:15:11.000000000 +0100 +@@ -322,7 +322,8 @@ $(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSI $(LN_S) -f $(<F) $@ install_lib_shared: $(LIB_SHARED) @@ -10,7 +10,7 @@ $(INSTALL_DIR) $(usrlibdir) $(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F) -@@ -320,11 +321,13 @@ install_lib_shared: $(LIB_SHARED) +@@ -330,11 +331,13 @@ install_lib_shared: $(LIB_SHARED) # and for compatibility links in libdir are created # when the code is fixed links could be removed. install_dm_plugin: $(LIB_SHARED) diff --git a/package/lvm/patches/patch-scripts_Makefile_in b/package/lvm/patches/patch-scripts_Makefile_in index 1886a1930..ae8e644cc 100644 --- a/package/lvm/patches/patch-scripts_Makefile_in +++ b/package/lvm/patches/patch-scripts_Makefile_in @@ -1,6 +1,6 @@ ---- LVM2.2.02.72.orig/scripts/Makefile.in Thu May 20 16:45:17 2010 -+++ LVM2.2.02.72/scripts/Makefile.in Fri Jul 30 09:26:25 2010 -@@ -25,7 +25,8 @@ endif +--- LVM2.2.02.79.orig/scripts/Makefile.in 2010-11-05 17:18:38.000000000 +0100 ++++ LVM2.2.02.79/scripts/Makefile.in 2010-12-26 22:15:11.000000000 +0100 +@@ -30,7 +30,8 @@ endif vpath %.sh $(srcdir) %_install: %.sh @@ -8,5 +8,5 @@ + $(INSTALL_DIR) $(sbindir) + $(INSTALL_PROGRAM) $< $(sbindir)/$(basename $(<F)) - install_lvm2: $(SCRIPTS:.sh=_install) - + %_install: %.ocf + $(INSTALL_DIR) $(ocf_scriptdir) diff --git a/package/lvm/patches/patch-tools_Makefile_in b/package/lvm/patches/patch-tools_Makefile_in index 81b1efc97..c7d18c051 100644 --- a/package/lvm/patches/patch-tools_Makefile_in +++ b/package/lvm/patches/patch-tools_Makefile_in @@ -1,6 +1,6 @@ ---- LVM2.2.02.72.orig/tools/Makefile.in Fri Jun 25 20:23:10 2010 -+++ LVM2.2.02.72/tools/Makefile.in Fri Jul 30 10:13:24 2010 -@@ -157,7 +157,7 @@ liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): liblvm2cmd.$( +--- LVM2.2.02.79.orig/tools/Makefile.in 2010-10-15 11:41:21.000000000 +0200 ++++ LVM2.2.02.79/tools/Makefile.in 2010-12-26 22:15:11.000000000 +0100 +@@ -158,7 +158,7 @@ liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): .commands: $(srcdir)/commands.h $(srcdir)/cmdnames.h Makefile $(CC) -E -P $(srcdir)/cmdnames.h 2> /dev/null | \ @@ -9,7 +9,7 @@ ifneq ("$(CFLOW_CMD)", "") CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES)) -@@ -170,18 +170,22 @@ endif +@@ -171,18 +171,22 @@ endif install_dmsetup_dynamic install_dmsetup_static install_cmdlib_include: $(srcdir)/lvm2cmd.h @@ -36,7 +36,7 @@ @echo Creating symbolic links for individual commands in $(sbindir) @for v in `cat .commands`; do \ echo "$(LN_S) -f lvm $(sbindir)/$$v"; \ -@@ -189,13 +193,16 @@ install_tools_dynamic: lvm .commands +@@ -190,13 +194,16 @@ install_tools_dynamic: lvm .commands done; install_tools_static: lvm.static diff --git a/package/lynx/Makefile b/package/lynx/Makefile index dd67a6dde..b71dcb292 100644 --- a/package/lynx/Makefile +++ b/package/lynx/Makefile @@ -21,7 +21,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LYNX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TCPPFLAGS+= -I${STAGING_DIR}/include/openssl +TCPPFLAGS+= -I${STAGING_TARGET_DIR}/include/openssl TCPPFLAGS+= -DUSE_OPENSSL_INCL -DUSE_X509_SUPPORT TLDFLAGS+= -lz @@ -39,7 +39,7 @@ CONFIGURE_ENV+= ac_cv_path_TELNET=telnet \ ac_cv_path_UUDECODE=uudecode \ ac_cv_path_ZCAT=zcat \ ac_cv_path_ZIP=zip \ - ac_cv_path_NCURSES_CONFIG=${STAGING_DIR}/scripts/ncurses5-config + ac_cv_path_NCURSES_CONFIG=${STAGING_TARGET_DIR}/scripts/ncurses5-config CONFIGURE_ARGS+= \ --disable-warnings \ @@ -59,9 +59,9 @@ CONFIGURE_ARGS+= \ --enable-underlines \ --without-bzlib \ --without-x \ - --with-zlib=${STAGING_DIR}/usr \ - --with-ssl=${STAGING_DIR}/usr \ - --with-curses-dir=${STAGING_DIR}/usr \ + --with-zlib=${STAGING_TARGET_DIR}/usr \ + --with-ssl=${STAGING_TARGET_DIR}/usr \ + --with-curses-dir=${STAGING_TARGET_DIR}/usr \ --disable-full-paths \ --with-cfg-file=/etc/lynx.cfg \ --with-lss-file=/etc/lynx.lss \ diff --git a/package/mgetty/patches/patch-Makefile b/package/mgetty/patches/patch-Makefile index cf2f650bb..3fd5dfb66 100644 --- a/package/mgetty/patches/patch-Makefile +++ b/package/mgetty/patches/patch-Makefile @@ -5,7 +5,7 @@ # if your systems doesn't have one, use the shell script that I provide # in "inst.sh" (taken from X11R5). Needed on IRIX5.2 -INSTALL=install -c -o bin -g bin -+STRIP=$(STAGING_DIR)sstrip ++STRIP= +INSTALL=install -c -o root -g root +#INSTALL=install -c -o bin -g bin #INSTALL=install -c -o root -g wheel # NeXT/BSD diff --git a/package/mini_httpd/Makefile b/package/mini_httpd/Makefile index 9cb08d804..e105b82d7 100644 --- a/package/mini_httpd/Makefile +++ b/package/mini_httpd/Makefile @@ -34,8 +34,8 @@ do-build: ${MAKE} -C ${WRKBUILD} \ CC="${TARGET_CC}" \ SSL_DEFS="-DUSE_SSL -DHAVE_OPENSSL" \ - SSL_INC="-I${STAGING_DIR}/usr/include" \ - SSL_LIBS="-L${STAGING_DIR}/usr/lib -lssl -lcrypto" \ + SSL_INC="-I${STAGING_TARGET_DIR}/usr/include" \ + SSL_LIBS="-L${STAGING_TARGET_DIR}/usr/lib -lssl -lcrypto" \ all do-install: diff --git a/package/miredo/Makefile b/package/miredo/Makefile index a9ced541a..9df35111d 100644 --- a/package/miredo/Makefile +++ b/package/miredo/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= miredo -PKG_VERSION:= 1.1.6 +PKG_VERSION:= 1.2.3 PKG_RELEASE:= 1 -PKG_MD5SUM:= bf49c1ddc068746760787d0cf76e40de +PKG_MD5SUM:= 6ba484ad5e331514a8a3452da2b144e7 PKG_DESCR:= A Teredo client and relay daemon PKG_SECTION:= ipv6 PKG_URL:= http://www.remlab.net/ @@ -23,11 +23,8 @@ $(eval $(call PKG_template,MIREDO_SERVER,miredo-server,${PKG_VERSION}-${PKG_RELE TCFLAGS+= -std=gnu99 CONFIGURE_ENV+= ac_cv_file__proc_self_maps=yes -CONFIGURE_ARGS+= --disable-chroot \ - --without-Judy \ +CONFIGURE_ARGS+= --without-Judy \ --enable-teredo-client \ - --enable-teredo-relay \ - --enable-teredo-server \ --enable-miredo-user=root XAKE_FLAGS+= CXXLINK="\$${LINK}" \ diff --git a/package/miredo/patches/patch-libteredo_stub_c b/package/miredo/patches/patch-libteredo_stub_c new file mode 100644 index 000000000..093eb4e68 --- /dev/null +++ b/package/miredo/patches/patch-libteredo_stub_c @@ -0,0 +1,10 @@ +--- miredo-1.2.3.orig/libteredo/stub.c 2009-07-06 17:56:14.000000000 +0200 ++++ miredo-1.2.3/libteredo/stub.c 2010-12-30 10:50:06.000000000 +0100 +@@ -26,6 +26,7 @@ + # include <config.h> + #endif + ++#include <stddef.h> + #include <stdbool.h> + #include <assert.h> + diff --git a/package/monit/Makefile b/package/monit/Makefile index d1eae035c..d507d1abc 100644 --- a/package/monit/Makefile +++ b/package/monit/Makefile @@ -18,7 +18,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MONIT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ARGS+= --with-ssl --with-ssl-dir="${STAGING_DIR}/usr" +CONFIGURE_ARGS+= --with-ssl --with-ssl-dir="${STAGING_TARGET_DIR}/usr" post-install: ${INSTALL_DIR} ${IDIR_MONIT}/etc diff --git a/package/mpd/Makefile b/package/mpd/Makefile index db11c4b98..522b804b6 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -105,8 +105,8 @@ ifneq (${ADK_PACKAGE_MPD_WITH_TREMOR},) CONFIGURE_ARGS+= \ --disable-vorbis \ --with-tremor \ - --with-tremor-includes=${STAGING_DIR}/usr/include \ - --with-tremor-libraries=${STAGING_DIR}/usr/lib + --with-tremor-includes=${STAGING_TARGET_DIR}/usr/include \ + --with-tremor-libraries=${STAGING_TARGET_DIR}/usr/lib endif ifneq (${ADK_PACKAGE_MPD_WITH_FLAC},) @@ -124,7 +124,7 @@ endif ifneq (${ADK_PACKAGE_MPD_WITH_SHOUT},) CONFIGURE_ARGS+= --enable-shout \ --enable-lame-encoder \ - --with-lame=${STAGING_DIR}/usr \ + --with-lame=${STAGING_TARGET_DIR}/usr \ --enable-vorbis-encoder else CONFIGURE_ARGS+= --disable-shout \ diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index afb2e68d4..6d6438fa9 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -17,7 +17,7 @@ PKG_BUILDDEP+= libX11 libXv libpng libXext PKG_URL:= http://www.mplayerhq.hu/ PKG_SITES:= http://openadk.org/distfiles/ -PKG_TARGET_DEPENDS:= alix x86 x86_64 mips mipsel mips64 mips64el +PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el PKG_FLAVOURS:= WITH_DIRECTFB PKGFD_WITH_DIRECTFB:= enable DirectFB video output support @@ -33,7 +33,6 @@ $(eval $(call PKG_template,MPLAYER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${P #TCFLAGS:=$(subst Os,O2,$(TCFLAGS)) CONFIG_STYLE:= minimal - FAKE_FLAGS+= INSTALLSTRIP='' ifeq (${ADK_LINUX_MIPS64EL},y) @@ -48,33 +47,23 @@ endif # related patch to allow configure to find out the DirectFB # version number. ifeq (${ADK_PACKAGE_MPLAYER_WITH_DIRECTFB},y) -TCFLAGS+= -I${STAGING_DIR}/usr/include/directfb +TCFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/directfb endif -ifeq (${ADK_LINUX_X86_ALIX},y) -CONFIGURE_CPU_OPTS:= --disable-ssse3 \ - --disable-sse2 \ - --disable-sse \ - --enable-mmxext \ - --enable-mmx \ - --enable-3dnowext \ - --enable-3dnow -else ifeq (${ADK_HARDWARE_IBM_X40},y) -CONFIGURE_CPU_OPTS:= --disable-ssse3 \ - --enable-sse2 \ - --enable-sse \ - --enable-mmxext \ - --enable-mmx \ - --disable-3dnowext \ - --disable-3dnow +ifeq (${ADK_TARGET_CPU_WITH_MMX},y) +CONFIGURE_CPU_OPTS:= --enable-mmx +else +CONFIGURE_CPU_OPTS:= --disable-mmx +endif +ifeq (${ADK_TARGET_CPU_WITH_MMXEXT},y) +CONFIGURE_CPU_OPTS:= --enable-mmxext +else +CONFIGURE_CPU_OPTS:= --disable-mmxext +endif +ifeq (${ADK_TARGET_CPU_WITH_SSE},y) +CONFIGURE_CPU_OPTS:= --enable-sse else -CONFIGURE_CPU_OPTS:= --disable-ssse3 \ - --disable-sse2 \ - --disable-sse \ - --disable-mmxext \ - --disable-3dnowext \ - --disable-mmx \ - --disable-3dnow +CONFIGURE_CPU_OPTS:= --disable-sse endif ifeq ($(ADK_DEBUG),y) diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile index 94a9b01ab..745718a2a 100644 --- a/package/mrd6/Makefile +++ b/package/mrd6/Makefile @@ -23,7 +23,7 @@ CONFIG_STYLE:= manual ifeq (${ADK_COMPILE_MRD6_WITH_UCLIBCXX},y) TCXXFLAGS+= -fno-builtin -nostdinc++ -nodefaultlibs \ - -I${STAGING_DIR}/usr/include/uClibc++ + -I${STAGING_TARGET_DIR}/usr/include/uClibc++ TLDFLAGS+= -nodefaultlibs -luClibc++ -shared endif XAKE_FLAGS+= EXTRA_FLAGS="${TCFLAGS}" diff --git a/package/mt-daapd/Makefile b/package/mt-daapd/Makefile index 4d6d3f1b8..5493cb759 100644 --- a/package/mt-daapd/Makefile +++ b/package/mt-daapd/Makefile @@ -22,9 +22,9 @@ $(eval $(call PKG_template,MT_DAAPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes CONFIGURE_ARGS+= --enable-mdns \ --disable-howl \ - --with-id3tag="${STAGING_DIR}/usr" \ - --with-gdbm-includes="${STAGING_DIR}/usr/include" \ - --with-gdbm-libs="${STAGING_DIR}/usr/lib" \ + --with-id3tag="${STAGING_TARGET_DIR}/usr" \ + --with-gdbm-includes="${STAGING_TARGET_DIR}/usr/include" \ + --with-gdbm-libs="${STAGING_TARGET_DIR}/usr/lib" \ --without-static-libs TLDFLAGS+= -pthread diff --git a/package/mtd/Makefile b/package/mtd/Makefile index 3b17ce96b..c2875b1fa 100644 --- a/package/mtd/Makefile +++ b/package/mtd/Makefile @@ -9,8 +9,7 @@ PKG_RELEASE:= 1 PKG_DESCR:= MTD utility PKG_SECTION:= fs -PKG_TARGET_DEPENDS:= ag241 foxboard -PKG_DFLT_MTD:= y +PKG_DFLT_MTD:= y if ADK_TARGET_WITH_MTD NO_DISTFILES:= 1 diff --git a/package/nand/Makefile b/package/nand/Makefile index ec5984f6f..cb62784cc 100644 --- a/package/nand/Makefile +++ b/package/nand/Makefile @@ -9,8 +9,7 @@ PKG_RELEASE:= 3 PKG_DESCR:= NAND utility PKG_SECTION:= fs -PKG_TARGET_DEPENDS:= routerboard -PKG_DFLT_NAND:= y +PKG_DFLT_NAND:= y if ADK_TARGET_WITH_NAND NO_DISTFILES:= 1 diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index f2659bfa7..c1b142dff 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -68,7 +68,7 @@ post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} # this is installed as libncurses - make libcurses a "link" rm -f ${WRKINST}/usr/lib/libcurses.so* echo 'GROUP(-lncurses)' >${WRKINST}/usr/lib/libcurses.so - # libcurses will not show up in the IPKG, only in STAGING_DIR + # libcurses will not show up in the IPKG, only in STAGING_TARGET_DIR ${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo ${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/lib ${CP} ${WRKINST}/usr/lib/lib{form,menu,ncurses,panel}.so* \ diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index ee3997259..fb5a1236d 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -5,16 +5,14 @@ include ${TOPDIR}/rules.mk PKG_NAME:= nfs-utils PKG_VERSION:= 1.2.3 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 1131dc5f27c4f3905a6e7ee0d594fd4d -PKG_DESCR:= Utilities for NFS kernel server implementation +PKG_DESCR:= Utilities for NFS kernel server implementation PKG_SECTION:= net/fs PKG_DEPENDS:= kmod-nfsd portmap PKG_URL:= http://sourceforge.net/projects/nfs PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=nfs/} -PKG_HOST_DEPENDS:= !darwin - PKG_FLAVOURS:= WITH_KERBEROS WITH_TIRPC PKGFD_WITH_KERBEROS:= enable Kerberos support (MIT) PKGFS_WITH_KERBEROS:= libkrb5 libevent libnfsidmap librpcsecgss libcom-err libgssglue @@ -31,7 +29,7 @@ $(eval $(call PKG_template,NFS_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},$ ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y) CONFIGURE_ARGS+= --enable-nfsv4 \ - --with-krb5=${STAGING_DIR}/usr/ \ + --with-krb5=${STAGING_TARGET_DIR}/usr/ \ --enable-gss CONFIGURE_ENV+= LIBS="-lrpcsecgss" else @@ -41,7 +39,7 @@ endif ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_TIRPC),y) CONFIGURE_ARGS+= --enable-tirpc \ - --with-tirpcinclude=${STAGING_DIR}/usr/include/tirpc + --with-tirpcinclude=${STAGING_TARGET_DIR}/usr/include/tirpc else CONFIGURE_ARGS+= --disable-tirpc endif @@ -49,6 +47,7 @@ endif CONFIGURE_ENV+= knfsd_cv_bsd_signals=no \ ac_cv_lib_nsl_gethostbyname=no CONFIGURE_ARGS+= --without-tcp-wrappers \ + --with-rpcgen=internal \ --disable-uuid post-install: diff --git a/package/nfs-utils/patches/patch-support_include_sockaddr_h b/package/nfs-utils/patches/patch-support_include_sockaddr_h new file mode 100644 index 000000000..07d9eda46 --- /dev/null +++ b/package/nfs-utils/patches/patch-support_include_sockaddr_h @@ -0,0 +1,10 @@ +--- nfs-utils-1.2.3.orig/support/include/sockaddr.h 2010-09-28 14:24:16.000000000 +0200 ++++ nfs-utils-1.2.3/support/include/sockaddr.h 2010-12-25 00:47:43.000000000 +0100 +@@ -20,7 +20,6 @@ + #ifndef NFS_UTILS_SOCKADDR_H + #define NFS_UTILS_SOCKADDR_H + +-#include <libio.h> + #include <stdbool.h> + #include <sys/socket.h> + #include <netinet/in.h> diff --git a/package/nfs-utils/patches/patch-tools_Makefile_in b/package/nfs-utils/patches/patch-tools_Makefile_in index 51581c14a..b6a50e54e 100644 --- a/package/nfs-utils/patches/patch-tools_Makefile_in +++ b/package/nfs-utils/patches/patch-tools_Makefile_in @@ -1,5 +1,5 @@ --- nfs-utils-1.2.3.orig/tools/Makefile.in 2010-09-28 14:32:32.000000000 +0200 -+++ nfs-utils-1.2.3/tools/Makefile.in 2010-10-10 13:37:18.000000000 +0200 ++++ nfs-utils-1.2.3/tools/Makefile.in 2010-12-24 15:48:13.000000000 +0100 @@ -77,7 +77,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE distdir ETAGS = etags @@ -14,7 +14,7 @@ top_srcdir = @top_srcdir@ OPTDIRS = $(am__append_1) -SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat $(OPTDIRS) -+SUBDIRS = $(OPTDIRS) ++SUBDIRS = rpcgen MAINTAINERCLEANFILES = Makefile.in all: all-recursive diff --git a/package/nfs-utils/patches/patch-tools_locktest_Makefile_in b/package/nfs-utils/patches/patch-tools_locktest_Makefile_in new file mode 100644 index 000000000..9e8eb3f6d --- /dev/null +++ b/package/nfs-utils/patches/patch-tools_locktest_Makefile_in @@ -0,0 +1,47 @@ +--- nfs-utils-1.2.3.orig/tools/locktest/Makefile.in 2010-09-28 14:32:32.000000000 +0200 ++++ nfs-utils-1.2.3/tools/locktest/Makefile.in 2010-12-24 15:40:35.000000000 +0100 +@@ -67,20 +67,20 @@ am_testlk_OBJECTS = testlk-testlk.$(OBJE + testlk_OBJECTS = $(am_testlk_OBJECTS) + testlk_LDADD = $(LDADD) + testlk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(testlk_CFLAGS) $(CFLAGS) \ +- $(testlk_LDFLAGS) $(LDFLAGS) -o $@ ++ --mode=link $(CCLD) $(testlk_CFLAGS) \ ++ $(testlk_LDFLAGS) -o $@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++ $(CPPFLAGS) $(AM_CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) + CCLD = $(CC) + LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(testlk_SOURCES) + DIST_SOURCES = $(testlk_SOURCES) +@@ -101,15 +101,15 @@ AWK = @AWK@ + CC = $(CC_FOR_BUILD) + CCDEPMODE = @CCDEPMODE@ + CC_FOR_BUILD = @CC_FOR_BUILD@ +-CFLAGS = @CFLAGS@ ++CFLAGS = + CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ + CPP = @CPP@ +-CPPFLAGS = @CPPFLAGS@ ++CPPFLAGS = + CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +-CXXFLAGS = @CXXFLAGS@ ++CXXFLAGS = + CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in index d5fb62c97..8216aa35e 100644 --- a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in +++ b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in @@ -1,5 +1,5 @@ --- nfs-utils-1.2.3.orig/tools/rpcgen/Makefile.in 2010-09-28 14:32:33.000000000 +0200 -+++ nfs-utils-1.2.3/tools/rpcgen/Makefile.in 2010-10-10 13:29:26.000000000 +0200 ++++ nfs-utils-1.2.3/tools/rpcgen/Makefile.in 2010-12-25 00:45:58.000000000 +0100 @@ -72,21 +72,21 @@ am_rpcgen_OBJECTS = rpcgen-rpc_clntout.$ rpcgen_OBJECTS = $(am_rpcgen_OBJECTS) rpcgen_LDADD = $(LDADD) @@ -29,6 +29,15 @@ SOURCES = $(rpcgen_SOURCES) DIST_SOURCES = $(rpcgen_SOURCES) ETAGS = etags +@@ -97,7 +97,7 @@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALLOCA = @ALLOCA@ + AMTAR = @AMTAR@ + AM_CFLAGS = @AM_CFLAGS@ +-AM_CPPFLAGS = @AM_CPPFLAGS@ ++AM_CPPFLAGS = + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ @@ -106,10 +106,10 @@ AWK = @AWK@ CC = $(CC_FOR_BUILD) CCDEPMODE = @CCDEPMODE@ diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_rpc_cout_c b/package/nfs-utils/patches/patch-tools_rpcgen_rpc_cout_c new file mode 100644 index 000000000..a94015405 --- /dev/null +++ b/package/nfs-utils/patches/patch-tools_rpcgen_rpc_cout_c @@ -0,0 +1,10 @@ +--- nfs-utils-1.2.3.orig/tools/rpcgen/rpc_cout.c 2010-09-28 14:24:16.000000000 +0200 ++++ nfs-utils-1.2.3/tools/rpcgen/rpc_cout.c 2010-12-24 15:51:41.000000000 +0100 +@@ -36,7 +36,6 @@ static char sccsid[] = "@(#)rpc_cout.c 1 + #include <stdio.h> + #include <string.h> + #include <stdlib.h> +-#include <malloc.h> + #include <ctype.h> + #include "rpc_parse.h" + #include "rpc_util.h" diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c b/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c index 5bc54e758..078212ba3 100644 --- a/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c +++ b/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c @@ -1,6 +1,32 @@ ---- nfs-utils-1.2.1.orig/tools/rpcgen/rpc_main.c 2009-11-04 12:13:56.000000000 +0100 -+++ nfs-utils-1.2.1/tools/rpcgen/rpc_main.c 2010-01-16 11:22:02.359375000 +0100 -@@ -562,9 +562,6 @@ s_output(int argc, char **argv, char *in +--- nfs-utils-1.2.3.orig/tools/rpcgen/rpc_main.c 2010-09-28 14:24:16.000000000 +0200 ++++ nfs-utils-1.2.3/tools/rpcgen/rpc_main.c 2010-12-24 23:45:11.000000000 +0100 +@@ -155,11 +155,7 @@ int timerflag; /* TRUE if !indefinite & + int newstyle; /* newstyle of passing arguments (by value) */ + int Cflag = 0 ; /* ANSI C syntax */ + static int allfiles; /* generate all files */ +-#ifdef linux + int tirpcflag = 0; /* no tirpc by default */ +-#else +-int tirpcflag = 1; /* generating code for tirpc, by default */ +-#endif + + int + main(int argc, char **argv) +@@ -543,13 +539,8 @@ s_output(int argc, char **argv, char *in + timerflag = 1; + } + +-#ifndef linux +- if( !tirpcflag && inetdflag ) +- f_print(fout, "#include <sys/ttycom.h>/* TIOCNOTTY */\n"); +-#else + if( !tirpcflag ) + f_print(fout, "#include <sys/ioctl.h>/* TIOCNOTTY */\n"); +-#endif + if( Cflag && (inetdflag || pmflag ) ) { + f_print(fout, "#ifdef __cplusplus\n"); + f_print(fout, "#include <sysent.h> /* getdtablesize, open */\n"); +@@ -562,9 +553,6 @@ s_output(int argc, char **argv, char *in f_print(fout, "#include <sys/types.h>\n"); f_print(fout, "#include <memory.h>\n"); diff --git a/package/nmap/Makefile b/package/nmap/Makefile index 35a043604..57f986ea4 100644 --- a/package/nmap/Makefile +++ b/package/nmap/Makefile @@ -24,16 +24,16 @@ $(eval $(call PKG_template,NMAP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_ TCPPFLAGS+= -DNOLUA ifeq ($(ADK_COMPILE_NMAP_WITH_UCLIBCXX),y) CONFIGURE_ENV+= CXXFLAGS="-fno-threadsafe-statics -fno-builtin -fno-rtti -nostdinc++ \ - -I${STAGING_DIR}/usr/include/uClibc++" \ + -I${STAGING_TARGET_DIR}/usr/include/uClibc++" \ LIBS="-nodefaultlibs -luClibc++ -lgcc -lm" endif CONFIGURE_ARGS+= --without-openssl \ --without-zenmap \ --without-ndiff \ --without-liblua \ - --with-libdnet="${STAGING_DIR}/usr" \ - --with-libpcap="${STAGING_DIR}/usr" \ - --with-libpcre="${STAGING_DIR}/usr" + --with-libdnet="${STAGING_TARGET_DIR}/usr" \ + --with-libpcap="${STAGING_TARGET_DIR}/usr" \ + --with-libpcre="${STAGING_TARGET_DIR}/usr" post-install: ${INSTALL_DIR} ${IDIR_NMAP}/usr/share/nmap diff --git a/package/nspr/Makefile b/package/nspr/Makefile index 4d3b1ecbf..2564077c9 100644 --- a/package/nspr/Makefile +++ b/package/nspr/Makefile @@ -12,7 +12,7 @@ PKG_SECTION:= libs PKG_URL:= http://www.mozilla.org/projects/nspr/ PKG_SITES:= ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PKG_VERSION}/src/ -PKG_TARGET_DEPENDS:= !foxboard +PKG_ARCH_DEPENDS:= !cris WRKSRC= ${WRKDIST}/mozilla/nsprpub diff --git a/package/nss/Makefile b/package/nss/Makefile index bf3d64ec6..6c4bf7c00 100644 --- a/package/nss/Makefile +++ b/package/nss/Makefile @@ -15,7 +15,7 @@ PKG_SITES:= ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_1 PKG_NOPARALLEL:= 1 PKG_HOST_DEPENDS:= !cygwin -PKG_TARGET_DEPENDS:= !foxboard +PKG_ARCH_DEPENDS:= !cris WRKSRC= ${WRKDIST}/mozilla/security/nss @@ -31,8 +31,8 @@ XAKE_FLAGS+= USE_64=1 endif MAKE_FLAGS+= NATIVE_CC="${HOSTCC}" NATIVE_FLAGS="${HOSTCFLAGS}" -TCPPFLAGS+= -I${STAGING_DIR}/usr/include/nspr -TCFLAGS+= -I${STAGING_DIR}/usr/include/nspr +TCPPFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/nspr +TCFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/nspr TLDFLAGS+= -ldl XAKE_FLAGS+= SOURCE_MD_DIR=${WRKDIST}/dist DIST=${WRKDIST}/dist @@ -45,8 +45,8 @@ post-install: $(INSTALL_DIR) $(IDIR_NSS)/usr/lib ${INSTALL_DATA} ${WRKDIST}/dist/lib/lib{ssl3,smime3,nss3,nssutil3}.so \ $(IDIR_NSS)/usr/lib - ${INSTALL_DIR} ${STAGING_DIR}/usr/include/nss + ${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/include/nss ${INSTALL_DATA} ${WRKDIST}/mozilla/dist/public/nss/* \ - ${STAGING_DIR}/usr/include/nss + ${STAGING_TARGET_DIR}/usr/include/nss include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/obexftp/Makefile b/package/obexftp/Makefile index acc8b5b38..e39401aaf 100644 --- a/package/obexftp/Makefile +++ b/package/obexftp/Makefile @@ -33,8 +33,8 @@ ifeq ($(ADK_STATIC),y) XAKE_FLAGS+= STATIC_CFLAGS=-all-static endif -CONFIGURE_ENV+= OPENOBEX_CFLAGS="-I${STAGING_DIR}/usr/include" \ - OPENOBEX_LIBS="-L${STAGING_DIR}/usr/lib \ +CONFIGURE_ENV+= OPENOBEX_CFLAGS="-I${STAGING_TARGET_DIR}/usr/include" \ + OPENOBEX_LIBS="-L${STAGING_TARGET_DIR}/usr/lib \ -lopenobex -lbluetooth -liconv" CONFIGURE_ARGS+= --disable-perl \ --disable-ruby \ diff --git a/package/opencdk/Makefile b/package/opencdk/Makefile index 0caddd110..aa3373cc5 100644 --- a/package/opencdk/Makefile +++ b/package/opencdk/Makefile @@ -22,7 +22,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBOPENCDK,libopencdk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ARGS+= --with-libgcrypt-prefix='${STAGING_DIR}/usr' +CONFIGURE_ARGS+= --with-libgcrypt-prefix='${STAGING_TARGET_DIR}/usr' post-install: ${INSTALL_DIR} ${IDIR_LIBOPENCDK}/usr/lib diff --git a/package/opensc/Makefile b/package/opensc/Makefile index 24d89aa2a..60717c763 100644 --- a/package/opensc/Makefile +++ b/package/opensc/Makefile @@ -36,6 +36,9 @@ SUB_INSTALLS-y:= SUB_INSTALLS-m:= SUB_INSTALLS-${ADK_PACKAGE_LIBOPENSC_DEV}+= libopensc-dev-install +post-extract: + cd ${WRKBUILD} && autoreconf -vif + post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} ${INSTALL_DIR} ${IDIR_OPENSC}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/opensc-explorer \ diff --git a/package/opensips/Makefile b/package/opensips/Makefile index e83add75f..2d479ab70 100644 --- a/package/opensips/Makefile +++ b/package/opensips/Makefile @@ -107,8 +107,8 @@ do-build: OS="linux" \ ARCH="$(ARCH)" \ CFLAGS="$(TARGET_CFLAGS) -fPIC" \ - LOCALBASE="$(STAGING_DIR)/usr" \ - SYSBASE="$(STAGING_DIR)/usr" \ + LOCALBASE="$(STAGING_TARGET_DIR)/usr" \ + SYSBASE="$(STAGING_TARGET_DIR)/usr" \ all modules do-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} diff --git a/package/openssh/Makefile b/package/openssh/Makefile index ac1204efc..10b4523bc 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -39,10 +39,10 @@ $(eval $(call PKG_template,OPENSSH_SFTP_CLIENT,openssh-sftp-client,${PKG_VERSION $(eval $(call PKG_template,OPENSSH_SFTP_SERVER,openssh-sftp-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_OPENSSH_SFTP_SERVER},${PKG_SECTION})) ifeq ($(ADK_PACKAGE_OPENSSH_WITH_KRB5),y) -CONFIGURE_ARGS+= --with-kerberos5="${STAGING_DIR}/usr" +CONFIGURE_ARGS+= --with-kerberos5="${STAGING_TARGET_DIR}/usr" endif ifeq ($(ADK_PACKAGE_OPENSSH_WITH_HEIMDAL),y) -CONFIGURE_ARGS+= --with-kerberos5="${STAGING_DIR}/usr" +CONFIGURE_ARGS+= --with-kerberos5="${STAGING_TARGET_DIR}/usr" endif CONFIGURE_ENV+= LD='${TARGET_CC}' \ @@ -62,7 +62,7 @@ CONFIGURE_ARGS+= --disable-strip \ --sysconfdir=/etc/ssh \ --with-privsep-user=sshd \ --with-privsep-path=/var/run/sshd \ - --with-ssl-dir="${STAGING_DIR}/usr" + --with-ssl-dir="${STAGING_TARGET_DIR}/usr" post-install: ${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/etc/ssh diff --git a/package/openssl-pkcs11/Makefile b/package/openssl-pkcs11/Makefile index 06199ed39..a019fc844 100644 --- a/package/openssl-pkcs11/Makefile +++ b/package/openssl-pkcs11/Makefile @@ -21,7 +21,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,OPENSSL_PKCS11,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ENV+= cross_compiling=yes -CONFIGURE_ARGS+= --with-openssl="${STAGING_DIR}/usr" +CONFIGURE_ARGS+= --with-openssl="${STAGING_TARGET_DIR}/usr" post-install: ${INSTALL_DIR} ${IDIR_OPENSSL_PKCS11}/usr/lib/engines diff --git a/package/openssl/Makefile b/package/openssl/Makefile index fcae8c659..f0fdc50fb 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openssl -PKG_VERSION:= 1.0.0a +PKG_VERSION:= 1.0.0c PKG_RELEASE:= 1 -PKG_MD5SUM:= e3873edfffc783624cfbdb65e2249cbd +PKG_MD5SUM:= ff8fb85610aef328315a9decbb2712e4 PKG_DESCR:= OpenSSL (Secure Socket Layer) libraries PKG_SECTION:= libs PKG_DEPENDS:= zlib @@ -55,8 +55,9 @@ do-configure: ./Configure linux-embedded \ --prefix=/usr \ --openssldir=/etc/ssl \ - -I$(STAGING_DIR)/usr/include \ - -L$(STAGING_DIR)/usr/lib -ldl \ + -I$(STAGING_TARGET_DIR)/usr/include \ + -L$(STAGING_TARGET_DIR)/usr/lib -ldl \ + -DHAVE_CRYPTODEV \ -DOPENSSL_SMALL_FOOTPRINT \ $(OPENSSL_OPTIONS) \ ); diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile index 956f3a1a3..aaa6a3c1c 100644 --- a/package/oprofile/Makefile +++ b/package/oprofile/Makefile @@ -14,7 +14,8 @@ PKG_BUILDDEP:= popt binutils PKG_URL:= http://oprofile.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=oprofile/} -PKG_TARGET_DEPENDS:= !foxboard +PKG_ARCH_DEPENDS:= !cris + PKG_CFLINE_OPROFILE:= select BUSYBOX_EXPR include $(TOPDIR)/mk/package.mk diff --git a/package/osiris/Makefile b/package/osiris/Makefile index b07c1bbd8..01049acf5 100644 --- a/package/osiris/Makefile +++ b/package/osiris/Makefile @@ -18,7 +18,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,OSIRISD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ENV+= ac_cv_openssldir="${STAGING_DIR}/usr" \ +CONFIGURE_ENV+= ac_cv_openssldir="${STAGING_TARGET_DIR}/usr" \ ac_cv_have_accrights_in_msghdr=no \ ac_cv_have_control_in_msghdr=yes CONFIGURE_ARGS+= --with-osiris-user=root \ diff --git a/package/owfs/Makefile b/package/owfs/Makefile index b260dcb24..24d359479 100644 --- a/package/owfs/Makefile +++ b/package/owfs/Makefile @@ -29,8 +29,8 @@ CONFIGURE_ARGS+= --enable-owfs \ --disable-owtcl \ --disable-owperl \ --disable-owphp \ - --with-fuseinclude=${STAGING_DIR}/usr/include \ - --with-fuselib=${STAGING_DIR}/usr/lib + --with-fuseinclude=${STAGING_TARGET_DIR}/usr/include \ + --with-fuselib=${STAGING_TARGET_DIR}/usr/lib post-install: ${INSTALL_DIR} ${IDIR_OWFS}/usr/{bin,lib} diff --git a/package/parted/Makefile b/package/parted/Makefile index cd8f73bd3..d7847947c 100644 --- a/package/parted/Makefile +++ b/package/parted/Makefile @@ -4,13 +4,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:= parted -PKG_VERSION:= 1.9.0 +PKG_VERSION:= 2.3 PKG_RELEASE:= 1 -PKG_MD5SUM:= 055305bc7bcf472ce38f9abf69a9d94d -PKG_DESCR:= GNU parted +PKG_MD5SUM:= 30ceb6df7e8681891e865e2fe5a7903d +PKG_DESCR:= partition table editor PKG_SECTION:= fs -PKG_DEPENDS:= libuuid libreadline libdevmapper libpthread -PKG_BUILDDEP:= e2fsprogs lvm readline +PKG_DEPENDS:= libuuid libreadline libpthread +PKG_BUILDDEP:= e2fsprogs readline PKG_URL:= http://www.gnu.org/software/parted/index.shtml PKG_SITES:= ${MASTER_SITE_GNU:=parted/} @@ -18,6 +18,9 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,PARTED,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +CONFIGURE_ARGS+= --disable-device-mapper \ + --enable-Werror=no + post-install: ${INSTALL_DIR} $(IDIR_PARTED)/usr/sbin $(IDIR_PARTED)/usr/lib ${CP} $(WRKINST)/usr/lib/libparted*so* $(IDIR_PARTED)/usr/lib diff --git a/package/php/Makefile b/package/php/Makefile index da9ff221d..2cfb67674 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= php -PKG_VERSION:= 5.3.3 +PKG_VERSION:= 5.3.4 PKG_RELEASE:= 1 -PKG_MD5SUM:= 5adf1a537895c2ec933fddd48e78d8a2 +PKG_MD5SUM:= b69b36132899c5ca3bf155efa0218676 PKG_DESCR:= PHP language interpreter PKG_SECTION:= lang PKG_DEPENDS:= libopenssl zlib @@ -65,9 +65,9 @@ PKG_CONFIGURE_OPTS:= \ --disable-mbstring \ --disable-mbregex \ --disable-phar \ - --with-openssl=shared,"$(STAGING_DIR)/usr" \ + --with-openssl=shared,"$(STAGING_TARGET_DIR)/usr" \ --with-kerberos=no \ - --with-openssl-dir="$(STAGING_DIR)/usr" \ + --with-openssl-dir="$(STAGING_TARGET_DIR)/usr" \ --enable-session=shared \ --disable-simplexml \ --disable-soap \ @@ -77,8 +77,8 @@ PKG_CONFIGURE_OPTS:= \ --disable-filter \ --disable-xmlreader \ --disable-xmlwriter \ - --with-zlib="$(STAGING_DIR)/usr" \ - --with-zlib-dir="$(STAGING_DIR)/usr" \ + --with-zlib="$(STAGING_TARGET_DIR)/usr" \ + --with-zlib-dir="$(STAGING_TARGET_DIR)/usr" \ --enable-cli \ --enable-cgi \ --enable-fastcgi \ @@ -86,15 +86,15 @@ PKG_CONFIGURE_OPTS:= \ --enable-discard-path \ ifneq ($(ADK_PACKAGE_PHP_MOD_CURL),) -PKG_CONFIGURE_OPTS+= --with-curl=shared,"$(STAGING_DIR)/usr" +PKG_CONFIGURE_OPTS+= --with-curl=shared,"$(STAGING_TARGET_DIR)/usr" else PKG_CONFIGURE_OPTS+= --without-curl endif ifneq ($(ADK_PACKAGE_PHP_MOD_GD),) -PKG_CONFIGURE_OPTS+= --with-gd=shared,"$(STAGING_DIR)/usr" \ +PKG_CONFIGURE_OPTS+= --with-gd=shared,"$(STAGING_TARGET_DIR)/usr" \ --without-freetype-dir \ - --with-jpeg-dir="$(STAGING_DIR)/usr" \ - --with-png-dir="$(STAGING_DIR)/usr" \ + --with-jpeg-dir="$(STAGING_TARGET_DIR)/usr" \ + --with-png-dir="$(STAGING_TARGET_DIR)/usr" \ --without-xpm-dir \ --without-ttf \ --without-t1lib \ @@ -104,41 +104,41 @@ else PKG_CONFIGURE_OPTS+= --without-gd endif ifneq ($(ADK_PACKAGE_PHP_MOD_GMP),) -PKG_CONFIGURE_OPTS+= --with-gmp=shared,"$(STAGING_DIR)/usr" +PKG_CONFIGURE_OPTS+= --with-gmp=shared,"$(STAGING_TARGET_DIR)/usr" else PKG_CONFIGURE_OPTS+= --without-gmp endif ifneq ($(ADK_PACKAGE_PHP_MOD_LDAP),) -PKG_CONFIGURE_OPTS+= --with-ldap=shared,"$(STAGING_DIR)/usr" \ - --with-ldap-sasl="$(STAGING_DIR)/usr" +PKG_CONFIGURE_OPTS+= --with-ldap=shared,"$(STAGING_TARGET_DIR)/usr" \ + --with-ldap-sasl="$(STAGING_TARGET_DIR)/usr" else PKG_CONFIGURE_OPTS+= --without-ldap endif ifneq ($(ADK_PACKAGE_PHP_MOD_MYSQL),) -PKG_CONFIGURE_OPTS+= --with-mysql=shared,"$(STAGING_DIR)/usr" +PKG_CONFIGURE_OPTS+= --with-mysql=shared,"$(STAGING_TARGET_DIR)/usr" else PKG_CONFIGURE_OPTS+= --without-mysql endif ifneq ($(ADK_PACKAGE_PHP_MOD_PCRE),) -PKG_CONFIGURE_OPTS+= --with-pcre-dir=shared,"$(STAGING_DIR)/usr" +PKG_CONFIGURE_OPTS+= --with-pcre-dir=shared,"$(STAGING_TARGET_DIR)/usr" else PKG_CONFIGURE_OPTS+= --without-pcre-dir endif ifneq ($(ADK_PACKAGE_PHP_MOD_PGSQL),) -PKG_CONFIGURE_OPTS+= --with-pgsql=shared,"$(STAGING_DIR)/usr" +PKG_CONFIGURE_OPTS+= --with-pgsql=shared,"$(STAGING_TARGET_DIR)/usr" else PKG_CONFIGURE_OPTS+= --without-pgsql endif ifneq ($(ADK_PACKAGE_PHP_MOD_SQLITE),) PKG_CONFIGURE_OPTS+= --without-sqlite -PKG_CONFIGURE_OPTS+= --with-pdo-sqlite=shared,"$(STAGING_DIR)/usr" +PKG_CONFIGURE_OPTS+= --with-pdo-sqlite=shared,"$(STAGING_TARGET_DIR)/usr" PKG_CONFIGURE_OPTS+= --enable-pdo=shared else PKG_CONFIGURE_OPTS+= --without-sqlite endif ifneq ($(ADK_PACKAGE_PHP_MOD_XML),) -PKG_CONFIGURE_OPTS+= --enable-xml=shared,"$(STAGING_DIR)/usr" \ - --with-libexpat-dir="$(STAGING_DIR)/usr" +PKG_CONFIGURE_OPTS+= --enable-xml=shared,"$(STAGING_TARGET_DIR)/usr" \ + --with-libexpat-dir="$(STAGING_TARGET_DIR)/usr" else PKG_CONFIGURE_OPTS+= --disable-xml endif @@ -172,7 +172,7 @@ $(eval $(call PKG_mod_template,PHP_MOD_XML,xml)) INSTALL_STYLE:= manual -TLDFLAGS+= -L$(STAGING_DIR)/usr/lib/mysql +TLDFLAGS+= -L$(STAGING_TARGET_DIR)/usr/lib/mysql CONFIGURE_ENV+= LIBS="-ldl" CONFIGURE_ARGS+= $(PKG_CONFIGURE_OPTS) diff --git a/package/php/patches/patch-ext_standard_php_crypt_r_c b/package/php/patches/patch-ext_standard_php_crypt_r_c new file mode 100644 index 000000000..1c47df417 --- /dev/null +++ b/package/php/patches/patch-ext_standard_php_crypt_r_c @@ -0,0 +1,11 @@ +--- php-5.3.4.orig/ext/standard/php_crypt_r.c 2010-06-17 12:22:03.000000000 +0200 ++++ php-5.3.4/ext/standard/php_crypt_r.c 2010-12-30 12:53:12.000000000 +0100 +@@ -94,7 +94,7 @@ void _crypt_extended_init_r(void) + if (!initialized) { + #ifdef PHP_WIN32 + InterlockedIncrement(&initialized); +-#elif (defined(__GNUC__) && (__GNUC__ >= 4 && __GNUC_MINOR >= 2)) ++#elif (defined(__GNUC__) && (__GNUC__ >= 4 && __GNUC_MINOR >= 2)) || defined(__UCLIBC__) + __sync_fetch_and_add(&initialized, 1); + #elif defined(HAVE_ATOMIC_H) /* Solaris 10 defines atomic API within */ + membar_producer(); diff --git a/package/pmacct/Makefile b/package/pmacct/Makefile index 3e4460c87..1b2221709 100644 --- a/package/pmacct/Makefile +++ b/package/pmacct/Makefile @@ -23,8 +23,8 @@ $(eval $(call PKG_template,PMACCTD,pmacctd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D $(eval $(call PKG_template,SFACCTD,sfacctd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,PMACCT_CLIENT,pmacct-client,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ARGS+= --with-pcap-includes="$(STAGING_DIR)/usr/include" \ - --with-pcap-libs="$(STAGING_DIR)/usr/lib" +CONFIGURE_ARGS+= --with-pcap-includes="$(STAGING_TARGET_DIR)/usr/include" \ + --with-pcap-libs="$(STAGING_TARGET_DIR)/usr/lib" post-install: ${INSTALL_DIR} $(IDIR_SFACCTD)/usr/sbin diff --git a/package/portmap/Makefile b/package/portmap/Makefile index e885b20a0..67eb793aa 100644 --- a/package/portmap/Makefile +++ b/package/portmap/Makefile @@ -23,7 +23,7 @@ CONFIG_STYLE:= manual INSTALL_STYLE:= manual ifneq ($(strip ${ADK_PACKAGE_PORTMAP_LIBWRAP}),) -MAKE_FLAGS+= WRAP_LIB='-L${STAGING_DIR}/usr/lib -lwrap' +MAKE_FLAGS+= WRAP_LIB='-L${STAGING_TARGET_DIR}/usr/lib -lwrap' else MAKE_FLAGS+= NO_TCP_WRAPPER=1 endif diff --git a/package/postgresql/Makefile b/package/postgresql/Makefile index 23a27490f..f467cbaf0 100644 --- a/package/postgresql/Makefile +++ b/package/postgresql/Makefile @@ -30,7 +30,7 @@ PKG_CONFIGURE_ARGS:= --disable-integer-datetimes \ --without-readline \ --without-bonjour \ --without-tcl \ - --with-system-tzdata=${STAGING_DIR} \ + --with-system-tzdata=${STAGING_TARGET_DIR} \ --with-zlib="yes" CONFIGURE_ARGS+= ${PKG_CONFIGURE_ARGS} diff --git a/package/ppp/Makefile b/package/ppp/Makefile index 5ce611b16..591f3ca2a 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -33,7 +33,7 @@ $(eval $(call PKG_template,PPP_MOD_PPPUMTS,ppp-mod-pppumts,${PKG_VERSION}-${PKG_ CONFIGURE_ENV+= UNAME_S="Linux" XAKE_FLAGS+= CC="${TARGET_CC}" \ COPTS="${TCFLAGS}" \ - STAGING_DIR=${STAGING_DIR} \ + STAGING_TARGET_DIR=${STAGING_TARGET_DIR} \ DESTDIR="${WRKINST}/usr" \ TARGET_AR='${TARGET_CROSS}ar' diff --git a/package/pyrex/Makefile b/package/pyrex/Makefile index 06f1f1787..84ba155ee 100644 --- a/package/pyrex/Makefile +++ b/package/pyrex/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)/mk/python.mk do-build: cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py build - cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py install --prefix="$(STAGING_TOOLS)" + cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py install --prefix="$(STAGING_HOST_DIR)" cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py install --prefix="$(WRKINST)/usr" do-install: diff --git a/package/python/Makefile b/package/python/Makefile index a18e80880..0e81cd10b 100644 --- a/package/python/Makefile +++ b/package/python/Makefile @@ -33,12 +33,12 @@ post-extract: (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ OPT="$(HOSTCFLAGS)" \ ./configure --without-cxx-main --without-threads \ - --prefix=$(STAGING_TOOLS) \ + --prefix=$(STAGING_HOST_DIR) \ ); $(MAKE) -C ${WRKBUILD} python Parser/pgen $(MAKE) -C ${WRKBUILD} install - ${CP} ${WRKBUILD}/Parser/pgen ${STAGING_TOOLS}/bin/pgen - ${CP} ${WRKBUILD}/python ${STAGING_TOOLS}/bin/hostpython + ${CP} ${WRKBUILD}/Parser/pgen ${STAGING_HOST_DIR}/bin/pgen + ${CP} ${WRKBUILD}/python ${STAGING_HOST_DIR}/bin/hostpython ${CP} ${WRKBUILD}/Parser/pgen ${WRKBUILD}/Parser/hostpgen ${CP} ${WRKBUILD}/python ${WRKBUILD}/hostpython $(MAKE) -C ${WRKBUILD} distclean diff --git a/package/python2/Makefile b/package/python2/Makefile index 9785db316..ac40ca66f 100644 --- a/package/python2/Makefile +++ b/package/python2/Makefile @@ -39,12 +39,12 @@ post-extract: (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ OPT="$(HOSTCFLAGS)" \ ./configure --without-cxx-main --without-threads \ - --prefix=$(STAGING_TOOLS) \ + --prefix=$(STAGING_HOST_DIR) \ ); $(MAKE) -C ${WRKBUILD} python Parser/pgen $(MAKE) -C ${WRKBUILD} install - ${CP} ${WRKBUILD}/Parser/pgen ${STAGING_TOOLS}/bin/pgen - ${CP} ${WRKBUILD}/python ${STAGING_TOOLS}/bin/hostpython + ${CP} ${WRKBUILD}/Parser/pgen ${STAGING_HOST_DIR}/bin/pgen + ${CP} ${WRKBUILD}/python ${STAGING_HOST_DIR}/bin/hostpython ${CP} ${WRKBUILD}/Parser/pgen ${WRKBUILD}/Parser/hostpgen ${CP} ${WRKBUILD}/python ${WRKBUILD}/hostpython $(MAKE) -C ${WRKBUILD} clean diff --git a/package/python2/patches/patch-Makefile_pre_in b/package/python2/patches/patch-Makefile_pre_in index 4cbd61e8c..5fec2d1a1 100644 --- a/package/python2/patches/patch-Makefile_pre_in +++ b/package/python2/patches/patch-Makefile_pre_in @@ -1,7 +1,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in --- Python-2.7.1.orig/Makefile.pre.in 2010-10-14 13:37:30.000000000 +0200 -+++ Python-2.7.1/Makefile.pre.in 2010-12-14 16:02:44.000000000 +0100 -@@ -179,6 +179,7 @@ ++++ Python-2.7.1/Makefile.pre.in 2010-12-27 21:06:29.000000000 +0100 +@@ -179,6 +179,7 @@ UNICODE_OBJS= @UNICODE_OBJS@ PYTHON= python$(EXE) BUILDPYTHON= python$(BUILDEXE) @@ -9,7 +9,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in # The task to run while instrument when building the profile-opt target PROFILE_TASK= $(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck -@@ -211,6 +212,7 @@ +@@ -211,6 +212,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@ ########################################################################## # Parser PGEN= Parser/pgen$(EXE) @@ -17,7 +17,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in POBJS= \ Parser/acceler.o \ -@@ -380,7 +382,7 @@ +@@ -380,7 +382,7 @@ build_all_generate_profile: $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-generate" LIBS="$(LIBS) -lgcov" run_profile_task: @@ -26,7 +26,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in build_all_use_profile: $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-use" -@@ -398,14 +400,14 @@ +@@ -398,14 +400,14 @@ $(BUILDPYTHON): Modules/python.o $(LIBRA $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) platform: $(BUILDPYTHON) @@ -44,7 +44,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in esac # Build static library -@@ -538,7 +540,7 @@ +@@ -538,7 +540,7 @@ Modules/python.o: $(srcdir)/Modules/pyth $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) -@$(INSTALL) -d Include @@ -53,7 +53,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in $(PGEN): $(PGENOBJS) $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) -@@ -702,7 +704,7 @@ +@@ -702,7 +704,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/pytho TESTOPTS= -l $(EXTRATESTOPTS) TESTPROG= $(srcdir)/Lib/test/regrtest.py @@ -62,7 +62,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in test: all platform -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f -$(TESTPYTHON) $(TESTPROG) $(TESTOPTS) -@@ -725,7 +727,7 @@ +@@ -725,7 +727,7 @@ testuniversal: all platform -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f -$(TESTPYTHON) $(TESTPROG) -uall $(TESTOPTS) $(TESTPYTHON) $(TESTPROG) -uall $(TESTOPTS) @@ -71,7 +71,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in # Like testall, but with a single pass only -@@ -920,26 +922,26 @@ +@@ -920,26 +922,26 @@ libinstall: build_all $(srcdir)/Lib/$(PL done; \ done $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt @@ -105,7 +105,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in # Create the PLATDIR source directory, if one wasn't distributed.. $(srcdir)/Lib/$(PLATDIR): -@@ -1044,7 +1046,8 @@ +@@ -1044,7 +1046,8 @@ libainstall: all python-config # Install the dynamically loadable modules # This goes into $(exec_prefix) sharedinstall: sharedmods @@ -115,7 +115,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in --prefix=$(prefix) \ --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ -@@ -1082,7 +1085,7 @@ +@@ -1082,7 +1085,7 @@ frameworkinstallstructure: $(LDLIBRARY) fi; \ done $(LN) -fsn include/python$(VERSION) $(DESTDIR)$(prefix)/Headers @@ -124,7 +124,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in $(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK) $(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers -@@ -1117,7 +1120,7 @@ +@@ -1117,7 +1120,7 @@ frameworkinstallextras: # This installs a few of the useful scripts in Tools/scripts scriptsinstall: SRCDIR=$(srcdir) $(RUNSHARED) \ @@ -133,7 +133,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in --prefix=$(prefix) \ --install-scripts=$(BINDIR) \ --root=/$(DESTDIR) -@@ -1139,7 +1142,7 @@ +@@ -1139,7 +1142,7 @@ config.status: $(srcdir)/configure # Run reindent on the library reindent: @@ -142,7 +142,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in # Rerun configure with the same options as it was run last time, # provided the config.status script exists -@@ -1242,7 +1245,7 @@ +@@ -1242,7 +1245,7 @@ funny: # Perform some verification checks on any modified files. patchcheck: diff --git a/package/python2/patches/patch-Misc_python_pc b/package/python2/patches/patch-Misc_python_pc new file mode 100644 index 000000000..174230d83 --- /dev/null +++ b/package/python2/patches/patch-Misc_python_pc @@ -0,0 +1,11 @@ +--- Python-2.7.1.orig/Misc/python.pc 2010-12-27 21:24:34.000000000 +0100 ++++ Python-2.7.1/Misc/python.pc 2010-12-27 21:07:05.000000000 +0100 +@@ -7,7 +7,7 @@ Name: Python + Description: Python library + Requires: + Version: 2.7 +-Libs.private: -ldl -framework CoreFoundation ++Libs.private: -lpthread -ldl -lpthread + Libs: -L${libdir} -lpython2.7 + Cflags: -I${includedir}/python2.7 + diff --git a/package/python2/patches/patch-Modules_Setup_config b/package/python2/patches/patch-Modules_Setup_config new file mode 100644 index 000000000..c0d4e9fb8 --- /dev/null +++ b/package/python2/patches/patch-Modules_Setup_config @@ -0,0 +1,11 @@ +--- Python-2.7.1.orig/Modules/Setup.config 2010-12-27 21:24:34.000000000 +0100 ++++ Python-2.7.1/Modules/Setup.config 2010-12-27 21:07:05.000000000 +0100 +@@ -4,7 +4,7 @@ + # based on configure-time options. + + # Threading +-#thread threadmodule.c ++thread threadmodule.c + + # The signal module + signal signalmodule.c diff --git a/package/python2/patches/patch-Modules_config_c b/package/python2/patches/patch-Modules_config_c new file mode 100644 index 000000000..1ceca607f --- /dev/null +++ b/package/python2/patches/patch-Modules_config_c @@ -0,0 +1,18 @@ +--- Python-2.7.1.orig/Modules/config.c 2010-12-27 21:24:35.000000000 +0100 ++++ Python-2.7.1/Modules/config.c 2010-12-27 21:07:05.000000000 +0100 +@@ -23,6 +23,7 @@ extern "C" { + #endif + + ++extern void initthread(void); + extern void initsignal(void); + extern void initposix(void); + extern void initerrno(void); +@@ -44,6 +45,7 @@ extern void _PyWarnings_Init(void); + + struct _inittab _PyImport_Inittab[] = { + ++ {"thread", initthread}, + {"signal", initsignal}, + {"posix", initposix}, + {"errno", initerrno}, diff --git a/package/python2/patches/patch-Modules_posixmodule_c b/package/python2/patches/patch-Modules_posixmodule_c new file mode 100644 index 000000000..c14f7e5cb --- /dev/null +++ b/package/python2/patches/patch-Modules_posixmodule_c @@ -0,0 +1,16 @@ +--- Python-2.7.1.orig/Modules/posixmodule.c 2010-11-26 18:35:50.000000000 +0100 ++++ Python-2.7.1/Modules/posixmodule.c 2010-12-27 21:23:45.000000000 +0100 +@@ -3775,13 +3775,6 @@ posix_openpty(PyObject *self, PyObject * + slave_fd = open(slave_name, O_RDWR | O_NOCTTY); /* open slave */ + if (slave_fd < 0) + return posix_error(); +-#if !defined(__CYGWIN__) && !defined(HAVE_DEV_PTC) +- ioctl(slave_fd, I_PUSH, "ptem"); /* push ptem */ +- ioctl(slave_fd, I_PUSH, "ldterm"); /* push ldterm */ +-#ifndef __hpux +- ioctl(slave_fd, I_PUSH, "ttcompat"); /* push ttcompat */ +-#endif /* __hpux */ +-#endif /* HAVE_CYGWIN */ + #endif /* HAVE_OPENPTY */ + + return Py_BuildValue("(ii)", master_fd, slave_fd); diff --git a/package/python2/patches/patch-pyconfig_h b/package/python2/patches/patch-pyconfig_h new file mode 100644 index 000000000..52e21767c --- /dev/null +++ b/package/python2/patches/patch-pyconfig_h @@ -0,0 +1,521 @@ +--- Python-2.7.1.orig/pyconfig.h 2010-12-27 21:24:34.000000000 +0100 ++++ Python-2.7.1/pyconfig.h 2010-12-27 21:07:05.000000000 +0100 +@@ -32,10 +32,10 @@ + + /* Define if C doubles are 64-bit IEEE 754 binary format, stored with the + least significant byte first */ +-#define DOUBLE_IS_LITTLE_ENDIAN_IEEE754 1 ++/* #undef DOUBLE_IS_LITTLE_ENDIAN_IEEE754 */ + + /* Define if --enable-ipv6 is specified */ +-#define ENABLE_IPV6 1 ++/* #undef ENABLE_IPV6 */ + + /* Define if flock needs to be linked with bsd library. */ + /* #undef FLOCK_NEEDS_LIBBSD */ +@@ -63,7 +63,7 @@ + #define HAVE_ASINH 1 + + /* Define to 1 if you have the <asm/types.h> header file. */ +-/* #undef HAVE_ASM_TYPES_H */ ++#define HAVE_ASM_TYPES_H 1 + + /* Define to 1 if you have the `atanh' function. */ + #define HAVE_ATANH 1 +@@ -75,7 +75,7 @@ + /* #undef HAVE_BIND_TEXTDOMAIN_CODESET */ + + /* Define to 1 if you have the <bluetooth/bluetooth.h> header file. */ +-/* #undef HAVE_BLUETOOTH_BLUETOOTH_H */ ++#define HAVE_BLUETOOTH_BLUETOOTH_H 1 + + /* Define to 1 if you have the <bluetooth.h> header file. */ + /* #undef HAVE_BLUETOOTH_H */ +@@ -126,7 +126,7 @@ + #define HAVE_CTERMID 1 + + /* Define if you have the 'ctermid_r' function. */ +-#define HAVE_CTERMID_R 1 ++/* #undef HAVE_CTERMID_R */ + + /* Define to 1 if you have the <curses.h> header file. */ + #define HAVE_CURSES_H 1 +@@ -185,7 +185,7 @@ + #define HAVE_DYNAMIC_LOADING 1 + + /* Define if you have the 'epoll' functions. */ +-/* #undef HAVE_EPOLL */ ++#define HAVE_EPOLL 1 + + /* Define to 1 if you have the `erf' function. */ + #define HAVE_ERF 1 +@@ -215,10 +215,10 @@ + #define HAVE_FCNTL_H 1 + + /* Define if you have the 'fdatasync' function. */ +-/* #undef HAVE_FDATASYNC */ ++#define HAVE_FDATASYNC 1 + + /* Define to 1 if you have the `finite' function. */ +-#define HAVE_FINITE 1 ++/* #undef HAVE_FINITE */ + + /* Define to 1 if you have the `flock' function. */ + #define HAVE_FLOCK 1 +@@ -227,7 +227,7 @@ + #define HAVE_FORK 1 + + /* Define to 1 if you have the `forkpty' function. */ +-#define HAVE_FORKPTY 1 ++/* #undef HAVE_FORKPTY */ + + /* Define to 1 if you have the `fpathconf' function. */ + #define HAVE_FPATHCONF 1 +@@ -267,7 +267,7 @@ + #define HAVE_GCC_ASM_FOR_X87 1 + + /* Define if you have the getaddrinfo function. */ +-#define HAVE_GETADDRINFO 1 ++/* #undef HAVE_GETADDRINFO */ + + /* Define to 1 if you have the `getcwd' function. */ + #define HAVE_GETCWD 1 +@@ -279,10 +279,10 @@ + #define HAVE_GETGROUPS 1 + + /* Define to 1 if you have the `gethostbyname' function. */ +-#define HAVE_GETHOSTBYNAME 1 ++/* #undef HAVE_GETHOSTBYNAME */ + + /* Define this if you have some version of gethostbyname_r() */ +-/* #undef HAVE_GETHOSTBYNAME_R */ ++#define HAVE_GETHOSTBYNAME_R 1 + + /* Define this if you have the 3-arg version of gethostbyname_r(). */ + /* #undef HAVE_GETHOSTBYNAME_R_3_ARG */ +@@ -291,13 +291,13 @@ + /* #undef HAVE_GETHOSTBYNAME_R_5_ARG */ + + /* Define this if you have the 6-arg version of gethostbyname_r(). */ +-/* #undef HAVE_GETHOSTBYNAME_R_6_ARG */ ++#define HAVE_GETHOSTBYNAME_R_6_ARG 1 + + /* Define to 1 if you have the `getitimer' function. */ + #define HAVE_GETITIMER 1 + + /* Define to 1 if you have the `getloadavg' function. */ +-#define HAVE_GETLOADAVG 1 ++/* #undef HAVE_GETLOADAVG */ + + /* Define to 1 if you have the `getlogin' function. */ + #define HAVE_GETLOGIN 1 +@@ -327,25 +327,25 @@ + #define HAVE_GETPWENT 1 + + /* Define to 1 if you have the `getresgid' function. */ +-/* #undef HAVE_GETRESGID */ ++#define HAVE_GETRESGID 1 + + /* Define to 1 if you have the `getresuid' function. */ +-/* #undef HAVE_GETRESUID */ ++#define HAVE_GETRESUID 1 + + /* Define to 1 if you have the `getsid' function. */ + #define HAVE_GETSID 1 + + /* Define to 1 if you have the `getspent' function. */ +-/* #undef HAVE_GETSPENT */ ++#define HAVE_GETSPENT 1 + + /* Define to 1 if you have the `getspnam' function. */ +-/* #undef HAVE_GETSPNAM */ ++#define HAVE_GETSPNAM 1 + + /* Define to 1 if you have the `gettimeofday' function. */ + #define HAVE_GETTIMEOFDAY 1 + + /* Define to 1 if you have the `getwd' function. */ +-#define HAVE_GETWD 1 ++/* #undef HAVE_GETWD */ + + /* Define to 1 if you have the <grp.h> header file. */ + #define HAVE_GRP_H 1 +@@ -381,7 +381,7 @@ + #define HAVE_KILLPG 1 + + /* Define if you have the 'kqueue' functions. */ +-#define HAVE_KQUEUE 1 ++/* #undef HAVE_KQUEUE */ + + /* Define to 1 if you have the <langinfo.h> header file. */ + #define HAVE_LANGINFO_H 1 +@@ -390,13 +390,13 @@ + and long long is available and at least as big as an off_t. You may need to + add some flags for configuration and compilation to enable this mode. (For + Solaris and Linux, the necessary defines are already defined.) */ +-/* #undef HAVE_LARGEFILE_SUPPORT */ ++#define HAVE_LARGEFILE_SUPPORT 1 + + /* Define to 1 if you have the `lchflags' function. */ + /* #undef HAVE_LCHFLAGS */ + + /* Define to 1 if you have the `lchmod' function. */ +-#define HAVE_LCHMOD 1 ++/* #undef HAVE_LCHMOD */ + + /* Define to 1 if you have the `lchown' function. */ + #define HAVE_LCHOWN 1 +@@ -414,7 +414,7 @@ + /* #undef HAVE_LIBIEEE */ + + /* Define to 1 if you have the <libintl.h> header file. */ +-/* #undef HAVE_LIBINTL_H */ ++#define HAVE_LIBINTL_H 1 + + /* Define if you have the readline library (-lreadline). */ + #define HAVE_LIBREADLINE 1 +@@ -429,10 +429,10 @@ + #define HAVE_LINK 1 + + /* Define to 1 if you have the <linux/netlink.h> header file. */ +-/* #undef HAVE_LINUX_NETLINK_H */ ++#define HAVE_LINUX_NETLINK_H 1 + + /* Define to 1 if you have the <linux/tipc.h> header file. */ +-/* #undef HAVE_LINUX_TIPC_H */ ++#define HAVE_LINUX_TIPC_H 1 + + /* Define to 1 if you have the `log1p' function. */ + #define HAVE_LOG1P 1 +@@ -465,7 +465,7 @@ + #define HAVE_MKTIME 1 + + /* Define to 1 if you have the `mremap' function. */ +-/* #undef HAVE_MREMAP */ ++#define HAVE_MREMAP 1 + + /* Define to 1 if you have the <ncurses.h> header file. */ + #define HAVE_NCURSES_H 1 +@@ -474,16 +474,16 @@ + /* #undef HAVE_NDIR_H */ + + /* Define to 1 if you have the <netpacket/packet.h> header file. */ +-/* #undef HAVE_NETPACKET_PACKET_H */ ++#define HAVE_NETPACKET_PACKET_H 1 + + /* Define to 1 if you have the `nice' function. */ + #define HAVE_NICE 1 + + /* Define to 1 if you have the `openpty' function. */ +-#define HAVE_OPENPTY 1 ++/* #undef HAVE_OPENPTY */ + + /* Define if compiling using MacOS X 10.5 SDK or later. */ +-#define HAVE_OSX105_SDK 1 ++/* #undef HAVE_OSX105_SDK */ + + /* Define to 1 if you have the `pathconf' function. */ + #define HAVE_PATHCONF 1 +@@ -519,10 +519,10 @@ + /* #undef HAVE_PTHREAD_INIT */ + + /* Define to 1 if you have the `pthread_sigmask' function. */ +-/* #undef HAVE_PTHREAD_SIGMASK */ ++#define HAVE_PTHREAD_SIGMASK 1 + + /* Define to 1 if you have the <pty.h> header file. */ +-/* #undef HAVE_PTY_H */ ++#define HAVE_PTY_H 1 + + /* Define to 1 if you have the `putenv' function. */ + #define HAVE_PUTENV 1 +@@ -537,7 +537,7 @@ + #define HAVE_RL_CALLBACK 1 + + /* Define if you can turn off readline's signal handling. */ +-/* #undef HAVE_RL_CATCH_SIGNAL */ ++#define HAVE_RL_CATCH_SIGNAL 1 + + /* Define if you have readline 2.2 */ + #define HAVE_RL_COMPLETION_APPEND_CHARACTER 1 +@@ -549,7 +549,7 @@ + #define HAVE_RL_COMPLETION_MATCHES 1 + + /* Define if you have rl_completion_suppress_append */ +-/* #undef HAVE_RL_COMPLETION_SUPPRESS_APPEND */ ++#define HAVE_RL_COMPLETION_SUPPRESS_APPEND 1 + + /* Define if you have readline 4.0 */ + #define HAVE_RL_PRE_INPUT_HOOK 1 +@@ -567,7 +567,7 @@ + #define HAVE_SEM_OPEN 1 + + /* Define to 1 if you have the `sem_timedwait' function. */ +-/* #undef HAVE_SEM_TIMEDWAIT */ ++#define HAVE_SEM_TIMEDWAIT 1 + + /* Define to 1 if you have the `sem_unlink' function. */ + #define HAVE_SEM_UNLINK 1 +@@ -600,10 +600,10 @@ + #define HAVE_SETREGID 1 + + /* Define to 1 if you have the `setresgid' function. */ +-/* #undef HAVE_SETRESGID */ ++#define HAVE_SETRESGID 1 + + /* Define to 1 if you have the `setresuid' function. */ +-/* #undef HAVE_SETRESUID */ ++#define HAVE_SETRESUID 1 + + /* Define to 1 if you have the `setreuid' function. */ + #define HAVE_SETREUID 1 +@@ -618,7 +618,7 @@ + #define HAVE_SETVBUF 1 + + /* Define to 1 if you have the <shadow.h> header file. */ +-/* #undef HAVE_SHADOW_H */ ++#define HAVE_SHADOW_H 1 + + /* Define to 1 if you have the `sigaction' function. */ + #define HAVE_SIGACTION 1 +@@ -630,13 +630,13 @@ + #define HAVE_SIGNAL_H 1 + + /* Define to 1 if you have the `sigrelse' function. */ +-#define HAVE_SIGRELSE 1 ++/* #undef HAVE_SIGRELSE */ + + /* Define to 1 if you have the `snprintf' function. */ + #define HAVE_SNPRINTF 1 + + /* Define if sockaddr has sa_len member */ +-#define HAVE_SOCKADDR_SA_LEN 1 ++/* #undef HAVE_SOCKADDR_SA_LEN */ + + /* struct sockaddr_storage (sys/socket.h) */ + #define HAVE_SOCKADDR_STORAGE 1 +@@ -645,7 +645,7 @@ + #define HAVE_SOCKETPAIR 1 + + /* Define to 1 if you have the <spawn.h> header file. */ +-#define HAVE_SPAWN_H 1 ++/* #undef HAVE_SPAWN_H */ + + /* Define if your compiler provides ssize_t */ + #define HAVE_SSIZE_T 1 +@@ -654,10 +654,10 @@ + #define HAVE_STATVFS 1 + + /* Define if you have struct stat.st_mtim.tv_nsec */ +-/* #undef HAVE_STAT_TV_NSEC */ ++#define HAVE_STAT_TV_NSEC 1 + + /* Define if you have struct stat.st_mtimensec */ +-#define HAVE_STAT_TV_NSEC2 1 ++/* #undef HAVE_STAT_TV_NSEC2 */ + + /* Define if your compiler supports variable length function prototypes (e.g. + void fprintf(FILE *, char *, ...);) *and* <stdarg.h> */ +@@ -694,10 +694,10 @@ + #define HAVE_STRUCT_STAT_ST_BLOCKS 1 + + /* Define to 1 if `st_flags' is a member of `struct stat'. */ +-#define HAVE_STRUCT_STAT_ST_FLAGS 1 ++/* #undef HAVE_STRUCT_STAT_ST_FLAGS */ + + /* Define to 1 if `st_gen' is a member of `struct stat'. */ +-#define HAVE_STRUCT_STAT_ST_GEN 1 ++/* #undef HAVE_STRUCT_STAT_ST_GEN */ + + /* Define to 1 if `st_rdev' is a member of `struct stat'. */ + #define HAVE_STRUCT_STAT_ST_RDEV 1 +@@ -729,10 +729,10 @@ + /* #undef HAVE_SYS_DIR_H */ + + /* Define to 1 if you have the <sys/epoll.h> header file. */ +-/* #undef HAVE_SYS_EPOLL_H */ ++#define HAVE_SYS_EPOLL_H 1 + + /* Define to 1 if you have the <sys/event.h> header file. */ +-#define HAVE_SYS_EVENT_H 1 ++/* #undef HAVE_SYS_EVENT_H */ + + /* Define to 1 if you have the <sys/file.h> header file. */ + #define HAVE_SYS_FILE_H 1 +@@ -741,7 +741,7 @@ + /* #undef HAVE_SYS_LOADAVG_H */ + + /* Define to 1 if you have the <sys/lock.h> header file. */ +-#define HAVE_SYS_LOCK_H 1 ++/* #undef HAVE_SYS_LOCK_H */ + + /* Define to 1 if you have the <sys/mkdev.h> header file. */ + /* #undef HAVE_SYS_MKDEV_H */ +@@ -829,7 +829,7 @@ + #define HAVE_TMPNAM 1 + + /* Define to 1 if you have the `tmpnam_r' function. */ +-/* #undef HAVE_TMPNAM_R */ ++#define HAVE_TMPNAM_R 1 + + /* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use + `HAVE_STRUCT_TM_TM_ZONE' instead. */ +@@ -863,7 +863,7 @@ + /* #undef HAVE_USABLE_WCHAR_T */ + + /* Define to 1 if you have the <util.h> header file. */ +-#define HAVE_UTIL_H 1 ++/* #undef HAVE_UTIL_H */ + + /* Define to 1 if you have the `utimes' function. */ + #define HAVE_UTIMES 1 +@@ -888,7 +888,7 @@ + + /* Define if tzset() actually switches the local timezone in a meaningful way. + */ +-#define HAVE_WORKING_TZSET 1 ++/* #undef HAVE_WORKING_TZSET */ + + /* Define if the zlib library has inflateCopy */ + #define HAVE_ZLIB_COPY 1 +@@ -953,7 +953,7 @@ + /* #undef Py_DEBUG */ + + /* Defined if Python is built as a shared library. */ +-/* #undef Py_ENABLE_SHARED */ ++#define Py_ENABLE_SHARED 1 + + /* Define as the size of the unicode type. */ + #define Py_UNICODE_SIZE 2 +@@ -980,16 +980,16 @@ + #define SIZEOF_FLOAT 4 + + /* The size of `fpos_t', as computed by sizeof. */ +-#define SIZEOF_FPOS_T 8 ++#define SIZEOF_FPOS_T 20 + + /* The size of `int', as computed by sizeof. */ + #define SIZEOF_INT 4 + + /* The size of `long', as computed by sizeof. */ +-#define SIZEOF_LONG 8 ++#define SIZEOF_LONG 4 + + /* The size of `long double', as computed by sizeof. */ +-#define SIZEOF_LONG_DOUBLE 16 ++#define SIZEOF_LONG_DOUBLE 12 + + /* The size of `long long', as computed by sizeof. */ + #define SIZEOF_LONG_LONG 8 +@@ -1001,22 +1001,22 @@ + #define SIZEOF_PID_T 4 + + /* The size of `pthread_t', as computed by sizeof. */ +-#define SIZEOF_PTHREAD_T 8 ++#define SIZEOF_PTHREAD_T 4 + + /* The size of `short', as computed by sizeof. */ + #define SIZEOF_SHORT 2 + + /* The size of `size_t', as computed by sizeof. */ +-#define SIZEOF_SIZE_T 8 ++#define SIZEOF_SIZE_T 4 + + /* The size of `time_t', as computed by sizeof. */ +-#define SIZEOF_TIME_T 8 ++#define SIZEOF_TIME_T 4 + + /* The size of `uintptr_t', as computed by sizeof. */ +-#define SIZEOF_UINTPTR_T 8 ++#define SIZEOF_UINTPTR_T 4 + + /* The size of `void *', as computed by sizeof. */ +-#define SIZEOF_VOID_P 8 ++#define SIZEOF_VOID_P 4 + + /* The size of `wchar_t', as computed by sizeof. */ + #define SIZEOF_WCHAR_T 4 +@@ -1032,7 +1032,7 @@ + #define SYS_SELECT_WITH_SYS_TIME 1 + + /* Define if tanh(-0.) is -0., or if platform doesn't have signed zeros */ +-#define TANH_PRESERVES_ZERO_SIGN 1 ++/* #undef TANH_PRESERVES_ZERO_SIGN */ + + /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ + #define TIME_WITH_SYS_TIME 1 +@@ -1063,10 +1063,10 @@ + + + /* Define if you want to use MacPython modules on MacOSX in unix-Python. */ +-#define USE_TOOLBOX_OBJECT_GLUE 1 ++/* #undef USE_TOOLBOX_OBJECT_GLUE */ + + /* Define if a va_list is an array of some kind */ +-#define VA_LIST_IS_ARRAY 1 ++/* #undef VA_LIST_IS_ARRAY */ + + /* Define if you want SIGFPE handled (see Include/pyfpe.h). */ + /* #undef WANT_SIGFPE_HANDLER */ +@@ -1076,7 +1076,7 @@ + /* #undef WANT_WCTYPE_FUNCTIONS */ + + /* Define if WINDOW in curses.h offers a field _flags. */ +-/* #undef WINDOW_HAS_FLAGS */ ++#define WINDOW_HAS_FLAGS 1 + + /* Define if you want documentation strings in extension modules */ + #define WITH_DOC_STRINGS 1 +@@ -1084,10 +1084,10 @@ + /* Define if you want to use the new-style (Openstep, Rhapsody, MacOS) dynamic + linker (dyld) instead of the old-style (NextStep) dynamic linker (rld). + Dyld is necessary to support frameworks. */ +-#define WITH_DYLD 1 ++/* #undef WITH_DYLD */ + + /* Define to 1 if libintl is needed for locale functions. */ +-/* #undef WITH_LIBINTL */ ++#define WITH_LIBINTL 1 + + /* Define if you want to produce an OpenStep/Rhapsody framework (shared + library plus accessory files). */ +@@ -1097,7 +1097,7 @@ + #define WITH_PYMALLOC 1 + + /* Define if you want to compile in rudimentary thread support */ +-/* #undef WITH_THREAD */ ++#define WITH_THREAD 1 + + /* Define to profile with the Pentium timestamp counter */ + /* #undef WITH_TSC */ +@@ -1152,7 +1152,7 @@ + /* #undef _POSIX_1_SOURCE */ + + /* Define to activate features from IEEE Stds 1003.1-2001 */ +-/* #undef _POSIX_C_SOURCE */ ++#define _POSIX_C_SOURCE 200112L + + /* Define to 1 if you need to in order for `stat' and other things to work. */ + /* #undef _POSIX_SOURCE */ +@@ -1161,7 +1161,7 @@ + /* #undef _POSIX_THREADS */ + + /* Define to force use of thread-safe errno, h_errno, and other functions */ +-/* #undef _REENTRANT */ ++#define _REENTRANT 1 + + /* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>, + <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the +@@ -1174,10 +1174,10 @@ + /* #undef _UINT64_T */ + + /* Define to the level of X/Open that your system supports */ +-/* #undef _XOPEN_SOURCE */ ++#define _XOPEN_SOURCE 600 + + /* Define to activate Unix95-and-earlier features */ +-/* #undef _XOPEN_SOURCE_EXTENDED */ ++#define _XOPEN_SOURCE_EXTENDED 1 + + /* Define on FreeBSD to activate all library features */ + #define __BSD_VISIBLE 1 diff --git a/package/python2/patches/patch-setup_py b/package/python2/patches/patch-setup_py index 9b86cf560..a92a85b37 100644 --- a/package/python2/patches/patch-setup_py +++ b/package/python2/patches/patch-setup_py @@ -1,7 +1,7 @@ diff -Nur Python-2.7.orig/setup.py Python-2.7/setup.py ---- Python-2.7.orig/setup.py 2010-06-27 14:36:16.000000000 +0200 -+++ Python-2.7/setup.py 2010-12-11 02:28:23.000000000 +0100 -@@ -21,7 +21,7 @@ +--- Python-2.7.1.orig/setup.py 2010-10-31 17:40:21.000000000 +0100 ++++ Python-2.7.1/setup.py 2010-12-27 21:06:29.000000000 +0100 +@@ -21,7 +21,7 @@ from distutils.spawn import find_executa COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount') # This global variable is used to hold the list of modules to be disabled. @@ -10,7 +10,7 @@ diff -Nur Python-2.7.orig/setup.py Python-2.7/setup.py def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -307,48 +307,14 @@ +@@ -307,48 +307,14 @@ class PyBuildExt(build_ext): ext_filename = os.path.join( self.build_lib, self.get_ext_filename(self.get_ext_fullname(ext.name))) @@ -62,7 +62,7 @@ diff -Nur Python-2.7.orig/setup.py Python-2.7/setup.py # Add paths specified in the environment variables LDFLAGS and # CPPFLAGS for header and library files. -@@ -398,11 +364,8 @@ +@@ -403,11 +369,8 @@ class PyBuildExt(build_ext): # lib_dirs and inc_dirs are used to search for files; # if a file is found in one of those directories, it can # be assumed that no additional -I,-L directives are needed. diff --git a/package/rarpd/Makefile b/package/rarpd/Makefile index 831bb5173..8769658db 100644 --- a/package/rarpd/Makefile +++ b/package/rarpd/Makefile @@ -17,8 +17,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,RARPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ARGS+= --with-libnet="${STAGING_DIR}/usr" \ - --with-pcap="${STAGING_DIR}/usr" +CONFIGURE_ARGS+= --with-libnet="${STAGING_TARGET_DIR}/usr" \ + --with-pcap="${STAGING_TARGET_DIR}/usr" TCFLAGS+= -DNEW_LIBNET_INTERFACE post-install: diff --git a/package/rpcbind/Makefile b/package/rpcbind/Makefile index 535c1b6c1..cd03c4209 100644 --- a/package/rpcbind/Makefile +++ b/package/rpcbind/Makefile @@ -20,7 +20,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,RPCBIND,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TCFLAGS+= -I${STAGING_DIR}/usr/include/tirpc +TCFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/tirpc CONFIGURE_ARGS+= --disable-libwrap post-install: diff --git a/package/rpm/Makefile b/package/rpm/Makefile index e784dc33b..5c23deb71 100644 --- a/package/rpm/Makefile +++ b/package/rpm/Makefile @@ -13,7 +13,7 @@ PKG_URL:= http://www.rpm.org/ PKG_SITES:= http://rpm5.org/files/rpm/rpm-5.3/ PKG_HOST_DEPENDS:= !cygwin !darwin -PKG_TARGET_DEPENDS:= !foxboard +PKG_ARCH_DEPENDS:= !cris include $(TOPDIR)/mk/package.mk diff --git a/package/rrdtool/Makefile b/package/rrdtool/Makefile index e3549d5e0..bf3ed8c39 100644 --- a/package/rrdtool/Makefile +++ b/package/rrdtool/Makefile @@ -33,7 +33,7 @@ CONFIGURE_ARGS+= --enable-rrdcgi \ --disable-python \ --without-x \ --with-rrd-default-font=/usr/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf -TCPPFLAGS+= -I${STAGING_DIR}/usr/include/freetype2 +TCPPFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/freetype2 post-install: ${INSTALL_DIR} ${IDIR_RRDTOOL}/usr/bin diff --git a/package/rrs/Makefile b/package/rrs/Makefile index 2b2dca293..652cb7993 100644 --- a/package/rrs/Makefile +++ b/package/rrs/Makefile @@ -28,8 +28,8 @@ INSTALL_STYLE:= manual do-build: ${MAKE} -C ${WRKBUILD} \ CC="${TARGET_CC}" \ - CFLAGS="${TARGET_CFLAGS} -I${STAGING_DIR}/usr/include ${PKG_FLAGS}" \ - LDFLAGS="-L${STAGING_DIR}/usr/lib -L${STAGING_DIR}/lib ${PKG_LDFLAGS} -lutil -lssl -lcrypto -lz -lstdc++" \ + CFLAGS="${TARGET_CFLAGS} -I${STAGING_TARGET_DIR}/usr/include ${PKG_FLAGS}" \ + LDFLAGS="-L${STAGING_TARGET_DIR}/usr/lib -L${STAGING_TARGET_DIR}/lib ${PKG_LDFLAGS} -lutil -lssl -lcrypto -lz -lstdc++" \ generic do-install: diff --git a/package/ruby/Makefile b/package/ruby/Makefile index 25fe3d7db..8f225a847 100644 --- a/package/ruby/Makefile +++ b/package/ruby/Makefile @@ -34,7 +34,7 @@ pre-configure: cp ${WRKBUILD}/ext/Setup ${WRKBUILD}/ext/Setup.orig echo "option nodynamic" >> ${WRKBUILD}/ext/Setup (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ - ./configure --prefix=$(STAGING_TOOLS) --disable-install-doc \ + ./configure --prefix=$(STAGING_HOST_DIR) --disable-install-doc \ ); $(MAKE) -C ${WRKBUILD} main cp ${WRKBUILD}/ruby ${WRKBUILD}/hostruby diff --git a/package/sangam-atm/Makefile b/package/sangam-atm/Makefile index 207ef5299..ef1c080a5 100644 --- a/package/sangam-atm/Makefile +++ b/package/sangam-atm/Makefile @@ -12,8 +12,6 @@ PKG_SECTION:= kernel PKG_DEPENDS:= kmod-fw-loader kmod-atm PKG_SITES:= http://openadk.org/distfiles/ -PKG_TARGET_DEPENDS:= ag241 - include ${TOPDIR}/mk/package.mk include ${TOPDIR}/mk/kernel-vars.mk diff --git a/package/scanlogd/Makefile b/package/scanlogd/Makefile index 4ae1dcadf..bc2d80e68 100644 --- a/package/scanlogd/Makefile +++ b/package/scanlogd/Makefile @@ -24,9 +24,9 @@ INSTALL_STYLE:= manual MAKE_FLAGS+= CC="${TARGET_CC}" LD="${TARGET_CC}" \ CFLAGS="-c ${TARGET_CFLAGS}" \ LDFLAGS= \ - PCAP_H="-I${STAGING_DIR}/usr/include" \ - NIDS_H="-I${STAGING_DIR}/usr/include" \ - NIDS_L="-L${STAGING_DIR}/usr/lib -lnids -lnet -lpcap" + PCAP_H="-I${STAGING_TARGET_DIR}/usr/include" \ + NIDS_H="-I${STAGING_TARGET_DIR}/usr/include" \ + NIDS_L="-L${STAGING_TARGET_DIR}/usr/lib -lnids -lnet -lpcap" ALL_TARGET:= libnids do-configure: diff --git a/package/snort/Makefile b/package/snort/Makefile index e14ce7d7a..6321ac2f5 100644 --- a/package/snort/Makefile +++ b/package/snort/Makefile @@ -20,12 +20,12 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,SNORT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ARGS+= --disable-flexresp \ - --with-libnet-includes="${STAGING_DIR}/usr/include" \ - --with-libnet-libraries="${STAGING_DIR}/usr/lib" \ - --with-libpcap-includes="${STAGING_DIR}/usr/include" \ - --with-libpcap-libraries="${STAGING_DIR}/usr/lib" \ - --with-libpcre-includes="${STAGING_DIR}/usr/include" \ - --with-libpcre-libraries="${STAGING_DIR}/usr/lib" \ + --with-libnet-includes="${STAGING_TARGET_DIR}/usr/include" \ + --with-libnet-libraries="${STAGING_TARGET_DIR}/usr/lib" \ + --with-libpcap-includes="${STAGING_TARGET_DIR}/usr/include" \ + --with-libpcap-libraries="${STAGING_TARGET_DIR}/usr/lib" \ + --with-libpcre-includes="${STAGING_TARGET_DIR}/usr/include" \ + --with-libpcre-libraries="${STAGING_TARGET_DIR}/usr/lib" \ --without-mysql \ --without-postgresql \ --disable-inline diff --git a/package/sqlite/Makefile b/package/sqlite/Makefile index 66a9135f2..4f3db591e 100644 --- a/package/sqlite/Makefile +++ b/package/sqlite/Makefile @@ -24,8 +24,8 @@ CONFIGURE_ENV+= config_BUILD_CC="${HOSTCC}" \ config_BUILD_CFLAGS="${HOSTCFLAGS}" \ config_TARGET_CC="${TARGET_CC}" \ config_TARGET_CFLAGS="${TARGET_CFLAGS}" \ - config_TARGET_READLINE_INC="-I${STAGING_DIR}/usr/include" \ - config_TARGET_READLINE_LIBS="-L${STAGING_DIR}/usr/lib -lreadline -lncurses" + config_TARGET_READLINE_INC="-I${STAGING_TARGET_DIR}/usr/include" \ + config_TARGET_READLINE_LIBS="-L${STAGING_TARGET_DIR}/usr/lib -lreadline -lncurses" MAKE_FLAGS+= LIBPTHREAD=-lm TCFLAGS+= -DSQLITE_SECURE_DELETE=1 CONFIGURE_ARGS+= --disable-tcl \ diff --git a/package/squid/Makefile b/package/squid/Makefile index 134ed4ea8..ccf7473cd 100644 --- a/package/squid/Makefile +++ b/package/squid/Makefile @@ -125,7 +125,7 @@ CONFIGURE_ARGS+= --datadir=/usr/share/squid \ --disable-wccp \ --disable-wccpv2 \ --enable-useragent-log \ - --with-openssl=${STAGING_DIR}/usr \ + --with-openssl=${STAGING_TARGET_DIR}/usr \ --enable-negotiate-auth-helpers=no \ --enable-auth="${AUTH_MODULES}" \ --enable-basic-auth-helpers="${BASIC_AUTH_HELPERS}" \ diff --git a/package/ssltunnel/Makefile b/package/ssltunnel/Makefile index be5ab32f6..83b8b2cd6 100644 --- a/package/ssltunnel/Makefile +++ b/package/ssltunnel/Makefile @@ -18,7 +18,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,SSLTUNNEL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ENV+= BUILD_CC="${TARGET_CC}" -XAKE_FLAGS+= CCOPT="${TARGET_CFLAGS}" INCLS="-I. -I${STAGING_DIR}/usr/include" +XAKE_FLAGS+= CCOPT="${TARGET_CFLAGS}" INCLS="-I. -I${STAGING_TARGET_DIR}/usr/include" post-install: ${INSTALL_DIR} ${IDIR_SSLTUNNEL}/usr/bin diff --git a/package/strace/Makefile b/package/strace/Makefile index 92addc429..8a0bfb694 100644 --- a/package/strace/Makefile +++ b/package/strace/Makefile @@ -11,8 +11,6 @@ PKG_DESCR:= System call trace program PKG_SECTION:= debug PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=strace/} -PKG_TARGET_DEPENDS:= !foxboard - DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk diff --git a/package/strace/patches/patch-Makefile_in b/package/strace/patches/patch-Makefile_in new file mode 100644 index 000000000..c93da1102 --- /dev/null +++ b/package/strace/patches/patch-Makefile_in @@ -0,0 +1,10 @@ +--- strace-4.5.20.orig/Makefile.in 2010-04-14 21:41:05.000000000 +0200 ++++ strace-4.5.20/Makefile.in 2010-12-28 22:43:17.000000000 +0100 +@@ -242,6 +242,7 @@ EXTRA_DIST = $(man_MANS) errnoent.sh sig + linux/ioctlent.h linux/errnoent.h linux/signalent.h \ + linux/syscall.h linux/dummy.h \ + linux/i386/syscallent.h \ ++ linux/cris/syscallent.h \ + linux/alpha/errnoent.h linux/alpha/ioctlent.h \ + linux/alpha/signalent.h linux/alpha/syscallent.h \ + linux/arm/syscallent.h linux/arm/syscallent1.h \ diff --git a/package/strace/src/linux/crisv10/syscallent.h b/package/strace/src/linux/crisv10/syscallent.h new file mode 100644 index 000000000..d8dd9f7ab --- /dev/null +++ b/package/strace/src/linux/crisv10/syscallent.h @@ -0,0 +1 @@ +#include "i386/syscallent.h" diff --git a/package/strongswan/Makefile b/package/strongswan/Makefile index fc9444cfe..6f7f117fe 100644 --- a/package/strongswan/Makefile +++ b/package/strongswan/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= strongswan -PKG_VERSION:= 4.4.1 +PKG_VERSION:= 4.5.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= 8a86019326ad8d9d703f55c8cd4625e1 +PKG_MD5SUM:= 92b6419edb09935860b56fe0455ec037 PKG_DESCR:= IPsec software PKG_SECTION:= net/security PKG_DEPENDS:= ip libpthread kmod-net-key kmod-xfrm-user @@ -55,6 +55,7 @@ endif CONFIGURE_ARGS+= --disable-tools \ --disable-fips-prf \ + --with-group=wheel \ --enable-kernel-pfkey post-install: diff --git a/package/strongswan/patches/autotool.patch b/package/strongswan/patches/autotool.patch deleted file mode 100644 index 584a77f68..000000000 --- a/package/strongswan/patches/autotool.patch +++ /dev/null @@ -1,13925 +0,0 @@ -diff -Nur strongswan-4.4.1.orig/configure strongswan-4.4.1/configure ---- strongswan-4.4.1.orig/configure 2010-07-29 20:11:18.000000000 +0200 -+++ strongswan-4.4.1/configure 2010-07-31 21:12:35.784499923 +0200 -@@ -171,7 +171,15 @@ - as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO - eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && - test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 --test \$(( 1 + 1 )) = 2 || exit 1" -+test \$(( 1 + 1 )) = 2 || exit 1 -+ -+ test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( -+ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO -+ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO -+ PATH=/empty FPATH=/empty; export PATH FPATH -+ test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ -+ || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1" - if (eval "$as_required") 2>/dev/null; then : - as_have_required=yes - else -@@ -525,155 +533,8 @@ - # Sed expression to map a string onto a valid variable name. - as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - -- -- --# Check that we are running under the correct shell. - SHELL=${CONFIG_SHELL-/bin/sh} - --case X$lt_ECHO in --X*--fallback-echo) -- # Remove one level of quotation (which was required for Make). -- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` -- ;; --esac -- --ECHO=${lt_ECHO-echo} --if test "X$1" = X--no-reexec; then -- # Discard the --no-reexec flag, and continue. -- shift --elif test "X$1" = X--fallback-echo; then -- # Avoid inline document here, it may be left over -- : --elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then -- # Yippee, $ECHO works! -- : --else -- # Restart under the correct shell. -- exec $SHELL "$0" --no-reexec ${1+"$@"} --fi -- --if test "X$1" = X--fallback-echo; then -- # used as fallback echo -- shift -- cat <<_LT_EOF --$* --_LT_EOF -- exit 0 --fi -- --# The HP-UX ksh and POSIX shell print the target directory to stdout --# if CDPATH is set. --(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -- --if test -z "$lt_ECHO"; then -- if test "X${echo_test_string+set}" != Xset; then -- # find a string as large as possible, as long as the shell can cope with it -- for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do -- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... -- if { echo_test_string=`eval $cmd`; } 2>/dev/null && -- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null -- then -- break -- fi -- done -- fi -- -- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && -- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- : -- else -- # The Solaris, AIX, and Digital Unix default echo programs unquote -- # backslashes. This makes it impossible to quote backslashes using -- # echo "$something" | sed 's/\\/\\\\/g' -- # -- # So, first we look for a working echo in the user's PATH. -- -- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -- for dir in $PATH /usr/ucb; do -- IFS="$lt_save_ifs" -- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && -- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- ECHO="$dir/echo" -- break -- fi -- done -- IFS="$lt_save_ifs" -- -- if test "X$ECHO" = Xecho; then -- # We didn't find a better echo, so look for alternatives. -- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && -- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- # This shell has a builtin print -r that does the trick. -- ECHO='print -r' -- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && -- test "X$CONFIG_SHELL" != X/bin/ksh; then -- # If we have ksh, try running configure again with it. -- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -- export ORIGINAL_CONFIG_SHELL -- CONFIG_SHELL=/bin/ksh -- export CONFIG_SHELL -- exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} -- else -- # Try using printf. -- ECHO='printf %s\n' -- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && -- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- # Cool, printf works -- : -- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && -- test "X$echo_testing_string" = 'X\t' && -- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL -- export CONFIG_SHELL -- SHELL="$CONFIG_SHELL" -- export SHELL -- ECHO="$CONFIG_SHELL $0 --fallback-echo" -- elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && -- test "X$echo_testing_string" = 'X\t' && -- echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- ECHO="$CONFIG_SHELL $0 --fallback-echo" -- else -- # maybe with a smaller string... -- prev=: -- -- for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do -- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null -- then -- break -- fi -- prev="$cmd" -- done -- -- if test "$prev" != 'sed 50q "$0"'; then -- echo_test_string=`eval $prev` -- export echo_test_string -- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} -- else -- # Oops. We lost completely, so just stick with echo. -- ECHO=echo -- fi -- fi -- fi -- fi -- fi --fi -- --# Copy echo and quote the copy suitably for passing to libtool from --# the Makefile, instead of quoting the original, which is used later. --lt_ECHO=$ECHO --if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then -- lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" --fi -- -- -- - - test -n "$DJDIR" || exec 7<&0 </dev/null - exec 6>&1 -@@ -959,9 +820,10 @@ - LIPO - NMEDIT - DSYMUTIL --lt_ECHO -+MANIFEST_TOOL - RANLIB - AR -+DLLTOOL - OBJDUMP - LN_S - NM -@@ -6969,8 +6831,8 @@ - - - --macro_version='2.2.6b' --macro_revision='1.3017' -+macro_version='2.2.11a' -+macro_revision='1.3216' - - - -@@ -6986,6 +6848,75 @@ - - ltmain="$ac_aux_dir/ltmain.sh" - -+# Backslashify metacharacters that are still active within -+# double-quoted strings. -+sed_quote_subst='s/\(["`$\\]\)/\\\1/g' -+ -+# Same as above, but do not quote variable references. -+double_quote_subst='s/\(["`\\]\)/\\\1/g' -+ -+# Sed substitution to delay expansion of an escaped shell variable in a -+# double_quote_subst'ed string. -+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -+ -+# Sed substitution to delay expansion of an escaped single quote. -+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' -+ -+# Sed substitution to avoid accidental globbing in evaled expressions -+no_glob_subst='s/\*/\\\*/g' -+ -+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 -+$as_echo_n "checking how to print strings... " >&6; } -+# Test print first, because it will be a builtin if present. -+if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then -+ ECHO='print -r --' -+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -+ ECHO='printf %s\n' -+else -+ # Use this function as a fallback that always works. -+ func_fallback_echo () -+ { -+ eval 'cat <<_LTECHO_EOF -+$1 -+_LTECHO_EOF' -+ } -+ ECHO='func_fallback_echo' -+fi -+ -+# func_echo_all arg... -+# Invoke $ECHO with all args, space-separated. -+func_echo_all () -+{ -+ $ECHO "" -+} -+ -+case "$ECHO" in -+ printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 -+$as_echo "printf" >&6; } ;; -+ print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 -+$as_echo "print -r" >&6; } ;; -+ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 -+$as_echo "cat" >&6; } ;; -+esac -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 - $as_echo_n "checking for a sed that does not truncate output... " >&6; } - if test "${ac_cv_path_SED+set}" = set; then : -@@ -7321,8 +7252,11 @@ - NM="$lt_cv_path_NM" - else - # Didn't find any BSD compatible name lister, look for dumpbin. -- if test -n "$ac_tool_prefix"; then -- for ac_prog in "dumpbin -symbols" "link -dump -symbols" -+ if test -n "$DUMPBIN"; then : -+ # Let the user override the test. -+ else -+ if test -n "$ac_tool_prefix"; then -+ for ac_prog in dumpbin "link -dump" - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -@@ -7366,7 +7300,7 @@ - fi - if test -z "$DUMPBIN"; then - ac_ct_DUMPBIN=$DUMPBIN -- for ac_prog in "dumpbin -symbols" "link -dump -symbols" -+ for ac_prog in dumpbin "link -dump" - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 -@@ -7421,6 +7355,15 @@ - fi - fi - -+ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in -+ *COFF*) -+ DUMPBIN="$DUMPBIN -symbols" -+ ;; -+ *) -+ DUMPBIN=: -+ ;; -+ esac -+ fi - - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" -@@ -7440,13 +7383,13 @@ - else - lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext -- (eval echo "\"\$as_me:7443: $ac_compile\"" >&5) -+ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&5 -- (eval echo "\"\$as_me:7446: $NM \\\"conftest.$ac_objext\\\"\"" >&5) -+ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&5 -- (eval echo "\"\$as_me:7449: output\"" >&5) -+ (eval echo "\"\$as_me:$LINENO: output\"" >&5) - cat conftest.out >&5 - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" -@@ -7503,6 +7446,11 @@ - lt_cv_sys_max_cmd_len=8192; - ;; - -+ mint*) -+ # On MiNT this can take a long time and run out of memory. -+ lt_cv_sys_max_cmd_len=8192; -+ ;; -+ - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. -@@ -7567,8 +7515,8 @@ - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. -- while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ -- = "XX$teststring$teststring"; } >/dev/null 2>&1 && -+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ -+ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` -@@ -7610,8 +7558,8 @@ - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -7839,16 +7787,18 @@ - # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump', - # unless we find 'file', for example because we are cross-compiling. -- if ( file / ) >/dev/null 2>&1; then -+ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. -+ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; - --cegcc) -+cegcc*) - # use the weaker test based on 'objdump'. See mingw*. - lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' -@@ -7878,6 +7828,10 @@ - lt_cv_deplibs_check_method=pass_all - ;; - -+haiku*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ - hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in -@@ -7886,11 +7840,11 @@ - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) -- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' -+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) -- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' -+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac -@@ -7916,7 +7870,7 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --netbsd* | netbsdelf*-gnu) -+netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - else -@@ -7993,6 +7947,21 @@ - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 - $as_echo "$lt_cv_deplibs_check_method" >&6; } -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -8008,6 +7977,157 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_DLLTOOL+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -+$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -+if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+ -+ -+ -+ -+ -+ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. - set dummy ${ac_tool_prefix}ar; ac_word=$2 -@@ -8328,6 +8448,18 @@ - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" - fi - -+case $host_os in -+ darwin*) -+ lock_old_archive_extraction=yes ;; -+ *) -+ lock_old_archive_extraction=no ;; -+esac -+ -+ -+ -+ -+ -+ - - - -@@ -8435,8 +8567,8 @@ - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -8497,8 +8629,8 @@ - test $ac_status = 0; }; then - # Now try to grab the symbols. - nlist=conftest.nm -- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 -- (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 -+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 -+ (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s "$nlist"; then -@@ -8599,6 +8731,18 @@ - $as_echo "ok" >&6; } - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ -+ -+ -+ -+ -+ - - - -@@ -8651,7 +8795,7 @@ - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 8654 "configure"' > conftest.$ac_ext -+ echo '#line '$LINENO' "configure"' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -8813,6 +8957,123 @@ - - need_locks="$enable_libtool_lock" - -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -+set dummy ${ac_tool_prefix}mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$MANIFEST_TOOL"; then -+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -+if test -n "$MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -+$as_echo "$MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then -+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL -+ # Extract the first word of "mt", so it can be a program name with args. -+set dummy mt; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_MANIFEST_TOOL"; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -+if test -n "$ac_ct_MANIFEST_TOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_MANIFEST_TOOL" = x; then -+ MANIFEST_TOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL -+ fi -+else -+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -+fi -+ -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -+if test "${lt_cv_path_mainfest_tool+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&5 -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -+$as_echo "$lt_cv_path_mainfest_tool" >&6; } -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+ -+ -+ -+ -+ - - case $host_os in - rhapsody* | darwin*) -@@ -9363,6 +9624,38 @@ - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 - $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 -+$as_echo_n "checking for -force_load linker flag... " >&6; } -+if test "${lt_cv_ld_force_load+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ld_force_load=no -+ cat > conftest.c << _LT_EOF -+int forced_loaded() { return 2;} -+_LT_EOF -+ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 -+ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 -+ echo "$AR cru libconftest.a conftest.o" >&5 -+ $AR cru libconftest.a conftest.o 2>&5 -+ echo "$RANLIB libconftest.a" >&5 -+ $RANLIB libconftest.a 2>&5 -+ cat > conftest.c << _LT_EOF -+int main() { return 0;} -+_LT_EOF -+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 -+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err -+ _lt_result=$? -+ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then -+ lt_cv_ld_force_load=yes -+ else -+ cat conftest.err >&5 -+ fi -+ rm -f conftest.err libconftest.a conftest conftest.c -+ rm -rf conftest.dSYM -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 -+$as_echo "$lt_cv_ld_force_load" >&6; } - case $host_os in - rhapsody* | darwin1.[012]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -@@ -9390,7 +9683,7 @@ - else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi -- if test "$DSYMUTIL" != ":"; then -+ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= -@@ -9413,6 +9706,8 @@ - - - -+ -+ - # Set options - - -@@ -9565,6 +9860,7 @@ - - - -+ - test -z "$LN_S" && LN_S="ln -s" - - -@@ -9614,19 +9910,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- - case $host_os in - aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some -@@ -9639,23 +9922,6 @@ - ;; - esac - --# Sed substitution that helps us do robust quoting. It backslashifies --# metacharacters that are still active within double-quoted strings. --sed_quote_subst='s/\(["`$\\]\)/\\\1/g' -- --# Same as above, but do not quote variable references. --double_quote_subst='s/\(["`\\]\)/\\\1/g' -- --# Sed substitution to delay expansion of an escaped shell variable in a --# double_quote_subst'ed string. --delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -- --# Sed substitution to delay expansion of an escaped single quote. --delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' -- --# Sed substitution to avoid accidental globbing in evaled expressions --no_glob_subst='s/\*/\\\*/g' -- - # Global variables: - ofile=libtool - can_build_shared=yes -@@ -9684,7 +9950,7 @@ - *) break;; - esac - done --cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` - - - # Only perform the check for file, if the check method requires it -@@ -9893,7 +10159,12 @@ - lt_prog_compiler_no_builtin_flag= - - if test "$GCC" = yes; then -- lt_prog_compiler_no_builtin_flag=' -fno-builtin' -+ case $cc_basename in -+ nvcc*) -+ lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; -+ *) -+ lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; -+ esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 - $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -@@ -9913,15 +10184,15 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9916: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:9920: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_rtti_exceptions=yes -@@ -9950,8 +10221,6 @@ - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -9999,6 +10268,12 @@ - lt_prog_compiler_pic='-fno-common' - ;; - -+ haiku*) -+ # PIC is the default for Haiku. -+ # The "-static" flag exists, but is broken. -+ lt_prog_compiler_static= -+ ;; -+ - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag -@@ -10041,6 +10316,13 @@ - lt_prog_compiler_pic='-fPIC' - ;; - esac -+ -+ case $cc_basename in -+ nvcc*) # Cuda Compiler Driver 2.2 -+ lt_prog_compiler_wl='-Xlinker ' -+ lt_prog_compiler_pic='-Xcompiler -fPIC' -+ ;; -+ esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in -@@ -10103,7 +10385,7 @@ - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; -- pgcc* | pgf77* | pgf90* | pgf95*) -+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl='-Wl,' -@@ -10115,25 +10397,25 @@ - # All Alpha code is PIC. - lt_prog_compiler_static='-non_shared' - ;; -- xl*) -- # IBM XL C 8.0/Fortran 10.1 on PPC -+ xl* | bgxl* | bgf* | mpixl*) -+ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-qpic' - lt_prog_compiler_static='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in -- *Sun\ C*) -- # Sun C 5.9 -+ *Sun\ F* | *Sun*Fortran*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' -- lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_wl='' - ;; -- *Sun\ F*) -- # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ *Sun\ C*) -+ # Sun C 5.9 - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' -- lt_prog_compiler_wl='' -+ lt_prog_compiler_wl='-Wl,' - ;; - esac - ;; -@@ -10165,7 +10447,7 @@ - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; -@@ -10222,13 +10504,17 @@ - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -- -- -- -- - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+if test "${lt_cv_prog_compiler_pic+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -+$as_echo "$lt_cv_prog_compiler_pic" >&6; } -+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - - # - # Check to make sure the PIC flag actually works. -@@ -10252,15 +10538,15 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:10255: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:10259: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works=yes -@@ -10289,6 +10575,11 @@ - - - -+ -+ -+ -+ -+ - # - # Check to make sure the static flag actually works. - # -@@ -10308,7 +10599,7 @@ - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 -- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works=yes -@@ -10357,16 +10648,16 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:10360: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:10364: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings -- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o=yes -@@ -10412,16 +10703,16 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:10415: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:10419: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings -- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o=yes -@@ -10531,13 +10822,36 @@ - openbsd*) - with_gnu_ld=no - ;; -- linux* | k*bsd*-gnu) -- link_all_deplibs=no -- ;; - esac - - ld_shlibs=yes -+ -+ # On some targets, GNU ld is compatible enough with the native linker -+ # that we're better off using the native interface for both. -+ lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then -+ case $host_os in -+ aix*) -+ # The AIX port of GNU ld has always aspired to compatibility -+ # with the native linker. However, as the warning in the GNU ld -+ # block says, versions before 2.19.5* couldn't really create working -+ # shared libraries, regardless of the interface used. -+ case `$LD -v 2>&1` in -+ *\ \(GNU\ Binutils\)\ 2.19.5*) ;; -+ *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; -+ *\ \(GNU\ Binutils\)\ [3-9]*) ;; -+ *) -+ lt_use_gnu_ld_interface=yes -+ ;; -+ esac -+ ;; -+ *) -+ lt_use_gnu_ld_interface=yes -+ ;; -+ esac -+ fi -+ -+ if test "$lt_use_gnu_ld_interface" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - -@@ -10571,11 +10885,12 @@ - ld_shlibs=no - cat <<_LT_EOF 1>&2 - --*** Warning: the GNU linker, at least up to release 2.9.1, is reported -+*** Warning: the GNU linker, at least up to release 2.19, is reported - *** to be unable to reliably create shared libraries on AIX. - *** Therefore, libtool is disabling shared libraries support. If you --*** really care for shared libraries, you may want to modify your PATH --*** so that a non-GNU linker is found, and then restart. -+*** really care for shared libraries, you may want to install binutils -+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. -+*** You will then need to restart the configuration process. - - _LT_EOF - fi -@@ -10611,10 +10926,12 @@ - # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' -+ export_dynamic_flag_spec='${wl}--export-all-symbols' - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' -+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -10632,6 +10949,11 @@ - fi - ;; - -+ haiku*) -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ link_all_deplibs=yes -+ ;; -+ - interix[3-9]*) - hardcode_direct=no - hardcode_shlibpath_var=no -@@ -10661,11 +10983,12 @@ - tmp_sharedflag='-shared' - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler -- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; -- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ pgf77* | pgf90* | pgf95* | pgfortran*) -+ # Portland Group f77 and f90 compilers -+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; -@@ -10676,13 +10999,17 @@ - lf95*) # Lahey Fortran 8.1 - whole_archive_flag_spec= - tmp_sharedflag='--shared' ;; -- xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) -+ xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) - tmp_sharedflag='-qmkshrobj' - tmp_addflag= ;; -+ nvcc*) # Cuda Compiler Driver 2.2 -+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' -+ compiler_needs_object=yes -+ ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 -- whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - compiler_needs_object=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 -@@ -10698,17 +11025,17 @@ - fi - - case $cc_basename in -- xlf*) -+ xlf* | bgf* | bgxlf* | mpixlf*) - # IBM XL Fortran 10.1 on PPC cannot create shared libs itself - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -10717,7 +11044,7 @@ - fi - ;; - -- netbsd* | netbsdelf*-gnu) -+ netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -10829,8 +11156,10 @@ - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ # Also, AIX nm treats weak defined symbols like other global -+ # defined symbols, whereas GNU nm marks them as "W". - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then -- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi -@@ -10892,7 +11221,6 @@ - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi -- link_all_deplibs=no - else - # not using gcc - if test "$host_cpu" = ia64; then -@@ -10949,7 +11277,7 @@ - if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' -@@ -10993,8 +11321,13 @@ - # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' -- # Exported symbols can be pulled into shared objects from archives -- whole_archive_flag_spec='$convenience' -+ if test "$with_gnu_ld" = yes; then -+ # We only use this code for GNU lds that support --whole-archive. -+ whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -+ else -+ # Exported symbols can be pulled into shared objects from archives -+ whole_archive_flag_spec='$convenience' -+ fi - archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -@@ -11026,20 +11359,60 @@ - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- old_archive_from_new_cmds='true' -- # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ file_list_spec='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs @$output_objdir/$soname.exp -Wl,-DLL~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true' -+ enable_shared_with_static_runtimes=yes -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ old_postinstall_cmds='chmod 644 $oldlib' -+ postlink_cmds='lt_outputfile="@OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) lt_outputfile="$lt_outputfile.exe" ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_outputfile.manifest" -outputresource:"$lt_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ old_archive_from_new_cmds='true' -+ # FIXME: Should let the user specify the lib program. -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ fix_srcfile_path='`cygpath -w "$srcfile"`' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -11049,7 +11422,11 @@ - hardcode_direct=no - hardcode_automatic=yes - hardcode_shlibpath_var=unsupported -- whole_archive_flag_spec='' -+ if test "$lt_cv_ld_force_load" = "yes"; then -+ whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' -+ else -+ whole_archive_flag_spec='' -+ fi - link_all_deplibs=yes - allow_undefined_flag="$_lt_dar_allow_undefined" - case $cc_basename in -@@ -11057,7 +11434,7 @@ - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; then -- output_verbose_link_cmd=echo -+ output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -@@ -11123,7 +11500,7 @@ - ;; - - hpux10*) -- if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -@@ -11142,7 +11519,7 @@ - ;; - - hpux11*) -- if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -@@ -11163,7 +11540,46 @@ - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ -+ # Older versions of the 11.00 compiler do not understand -b yet -+ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 -+$as_echo_n "checking if $CC understands -b... " >&6; } -+if test "${lt_cv_prog_compiler__b+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler__b=no -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -b" -+ echo "$lt_simple_link_test_code" > conftest.$ac_ext -+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then -+ # The linker can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test -s conftest.err; then -+ # Append any errors to the config.log. -+ cat conftest.err 1>&5 -+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if diff conftest.exp conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler__b=yes -+ fi -+ else -+ lt_cv_prog_compiler__b=yes -+ fi -+ fi -+ $RM -r conftest* -+ LDFLAGS="$save_LDFLAGS" -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 -+$as_echo "$lt_cv_prog_compiler__b" >&6; } -+ -+if test x"$lt_cv_prog_compiler__b" = xyes; then -+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+else -+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -+fi -+ - ;; - esac - fi -@@ -11191,7 +11607,7 @@ - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -@@ -11202,15 +11618,15 @@ - int foo(void) {} - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' - fi - archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -@@ -11219,7 +11635,7 @@ - link_all_deplibs=yes - ;; - -- netbsd* | netbsdelf*-gnu) -+ netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -11272,17 +11688,17 @@ - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - allow_undefined_flag=unsupported -- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -+ archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - fi - archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -@@ -11292,13 +11708,13 @@ - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ -- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' -+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' - - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' -@@ -11501,44 +11917,50 @@ - # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 - $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -- $RM conftest* -- echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+if test "${lt_cv_archive_cmds_need_lc+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ $RM conftest* -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - -- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 -+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } 2>conftest.err; then -- soname=conftest -- lib=conftest -- libobjs=conftest.$ac_objext -- deplibs= -- wl=$lt_prog_compiler_wl -- pic_flag=$lt_prog_compiler_pic -- compiler_flags=-v -- linker_flags=-v -- verstring= -- output_objdir=. -- libname=conftest -- lt_save_allow_undefined_flag=$allow_undefined_flag -- allow_undefined_flag= -- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 -+ soname=conftest -+ lib=conftest -+ libobjs=conftest.$ac_objext -+ deplibs= -+ wl=$lt_prog_compiler_wl -+ pic_flag=$lt_prog_compiler_pic -+ compiler_flags=-v -+ linker_flags=-v -+ verstring= -+ output_objdir=. -+ libname=conftest -+ lt_save_allow_undefined_flag=$allow_undefined_flag -+ allow_undefined_flag= -+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 - (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -- then -- archive_cmds_need_lc=no -- else -- archive_cmds_need_lc=yes -- fi -- allow_undefined_flag=$lt_save_allow_undefined_flag -- else -- cat conftest.err 1>&5 -- fi -- $RM conftest* -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 --$as_echo "$archive_cmds_need_lc" >&6; } -+ then -+ lt_cv_archive_cmds_need_lc=no -+ else -+ lt_cv_archive_cmds_need_lc=yes -+ fi -+ allow_undefined_flag=$lt_save_allow_undefined_flag -+ else -+ cat conftest.err 1>&5 -+ fi -+ $RM conftest* -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 -+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } -+ archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc - ;; - esac - fi -@@ -11701,6 +12123,11 @@ - - - -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 - $as_echo_n "checking dynamic linker characteristics... " >&6; } - -@@ -11709,16 +12136,23 @@ - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac -- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` -- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then -+ case $host_os in -+ mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; -+ *) lt_sed_strip_eq="s,=/,/,g" ;; -+ esac -+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` -+ case $lt_search_path_spec in -+ *\;*) - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. -- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` -- else -- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -- fi -+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` -+ ;; -+ *) -+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ esac - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= -@@ -11731,7 +12165,7 @@ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done -- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' -+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' - BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; -@@ -11751,7 +12185,13 @@ - if (lt_foo != "") { lt_freq[lt_foo]++; } - if (lt_freq[lt_foo] == 1) { print lt_foo; } - }'` -- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` -+ # AWK program above erroneously prepends '/' to C:/dos/paths -+ # for these hosts. -+ case $host_os in -+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ -+ $SED 's,/\([A-Za-z]:\),\1,g'` ;; -+ esac -+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` - else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" - fi -@@ -11839,7 +12279,7 @@ - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. -- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; -@@ -11870,8 +12310,9 @@ - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -11892,36 +12333,54 @@ - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -+ -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" - ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -- if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -- # It is most probably a Windows format PATH printed by -- # mingw gcc, but we are running on Cygwin. Gcc prints its search -- # path with ; separators, and with drive letters. We can handle the -- # drive letters (cygwin fileutils understands them), so leave them, -- # especially as we might pass files found there to a mingw objdump, -- # which wouldn't understand a cygwinified path. Ahh. -- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -- else -- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -- fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}.lib' -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -12008,6 +12467,19 @@ - hardcode_into_libs=yes - ;; - -+haiku*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ dynamic_linker="$host_os runtime_loader" -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' -+ hardcode_into_libs=yes -+ ;; -+ - hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. -@@ -12050,8 +12522,10 @@ - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac -- # HP-UX runs *really* slowly unless shared libraries are mode 555. -+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ... - postinstall_cmds='chmod 555 $lib' -+ # or fails outright, so override atomically: -+ install_override_mode=555 - ;; - - interix[3-9]*) -@@ -12118,12 +12592,17 @@ - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no -+ - # Some binutils ld are patched to set DT_RUNPATH -- save_LDFLAGS=$LDFLAGS -- save_libdir=$libdir -- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ -- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_shlibpath_overrides_runpath=no -+ save_LDFLAGS=$LDFLAGS -+ save_libdir=$libdir -+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ -+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -12136,13 +12615,17 @@ - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : -- shlibpath_overrides_runpath=yes -+ lt_cv_shlibpath_overrides_runpath=yes - fi - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS=$save_LDFLAGS -- libdir=$save_libdir -+ LDFLAGS=$save_LDFLAGS -+ libdir=$save_libdir -+ -+fi -+ -+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install -@@ -12151,7 +12634,7 @@ - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then -- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - -@@ -12164,18 +12647,6 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - --netbsdelf*-gnu) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- dynamic_linker='NetBSD ld.elf_so' -- ;; -- - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -12466,6 +12937,11 @@ - - - -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 - $as_echo_n "checking how to hardcode library paths into programs... " >&6; } - hardcode_action= -@@ -12796,7 +13272,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 12799 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -12837,7 +13313,13 @@ - # endif - #endif - --void fnord() { int i=42;} -+/* When -fvisbility=hidden is used, assume the code has been annotated -+ correspondingly for the symbols needed. */ -+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -+int fnord () __attribute__((visibility("default"))); -+#endif -+ -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12846,7 +13328,11 @@ - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ else -+ { -+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ else puts (dlerror ()); -+ } - /* dlclose (self); */ - } - else -@@ -12892,7 +13378,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 12895 "configure" -+#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -12933,7 +13419,13 @@ - # endif - #endif - --void fnord() { int i=42;} -+/* When -fvisbility=hidden is used, assume the code has been annotated -+ correspondingly for the symbols needed. */ -+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -+int fnord () __attribute__((visibility("default"))); -+#endif -+ -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -12942,7 +13434,11 @@ - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ else -+ { -+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ else puts (dlerror ()); -+ } - /* dlclose (self); */ - } - else -@@ -13526,6 +14022,7 @@ - $as_echo "not found" >&6; } - fi - -+if test x"$cross_compiling" = xno; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid of user \"$ipsecuser\"" >&5 - $as_echo_n "checking for uid of user \"$ipsecuser\"... " >&6; } - ipsecuid=`id -u $ipsecuser 2>/dev/null` -@@ -13546,6 +14043,11 @@ - else - as_fn_error "not found" "$LINENO" 5 - fi -+else -+ ipsecuid=0 -+ ipsecgid=0 -+fi -+ - - - if test x$eap_aka_3gpp2 = xtrue; then -@@ -18041,131 +18543,150 @@ - sed_quote_subst='$sed_quote_subst' - double_quote_subst='$double_quote_subst' - delay_variable_subst='$delay_variable_subst' --macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' --macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' --enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' --enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' --pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' --enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' --host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' --host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`' --host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`' --build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`' --build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`' --build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`' --SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`' --Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`' --GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`' --EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`' --FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`' --LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`' --NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`' --LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`' --max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`' --ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`' --exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`' --lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`' --lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`' --lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' --reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' --reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' --OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`' --deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' --file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' --AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' --AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`' --STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`' --RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`' --old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' --old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' --old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' --CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`' --CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`' --compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`' --GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`' --lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`' --lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`' --lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`' --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' --objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`' --SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`' --ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`' --MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`' --lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`' --lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`' --lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`' --lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`' --need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`' --DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`' --NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`' --LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`' --OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`' --OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`' --libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`' --shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`' --extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' --archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`' --enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`' --export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' --whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' --compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`' --old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`' --old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' --archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' --archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' --module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`' --module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' --with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`' --allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' --no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`' --inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`' --link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`' --always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`' --export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`' --exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`' --include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`' --prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`' --file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`' --variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`' --need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' --need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`' --version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`' --runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`' --shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' --shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`' --libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`' --library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`' --soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`' --postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' --postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' --finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`' --finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`' --sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`' --sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`' --enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`' --enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`' --enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' --old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' --striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' -+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' -+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' -+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' -+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' -+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' -+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' -+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' -+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' -+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' -+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' -+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' -+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' -+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' -+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' -+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' -+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' -+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' -+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' -+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' -+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' -+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' -+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' -+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' -+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' -+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' -+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' -+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' -+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' -+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' -+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' -+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' -+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' -+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' -+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' -+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' -+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' -+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' -+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' -+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' -+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' -+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' -+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' -+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' -+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' -+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' -+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' -+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' -+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' -+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' -+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' -+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' -+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' -+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' -+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' -+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' -+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' -+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' -+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' -+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' -+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' -+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' -+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' -+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' -+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' -+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' -+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' -+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' -+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' -+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' -+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' -+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -+hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' -+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' -+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' -+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' -+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' -+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' -+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' -+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' -+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' -+fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' -+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' -+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' -+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' -+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' -+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' -+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' -+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' -+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' -+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' -+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' -+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' -+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' -+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' -+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' -+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' -+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' -+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' -+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' -+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' -+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' -+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' -+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' -+sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' -+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' -+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' -+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' -+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' -+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' -+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' - - LTCC='$LTCC' - LTCFLAGS='$LTCFLAGS' - compiler='$compiler_DEFAULT' - -+# A function that is used when there is no print builtin or printf. -+func_fallback_echo () -+{ -+ eval 'cat <<_LTECHO_EOF -+\$1 -+_LTECHO_EOF' -+} -+ - # Quote evaled strings. --for var in SED \ -+for var in SHELL \ -+ECHO \ -+SED \ - GREP \ - EGREP \ - FGREP \ -@@ -18178,6 +18699,10 @@ - OBJDUMP \ - deplibs_check_method \ - file_magic_cmd \ -+file_magic_glob \ -+want_nocaseglob \ -+DLLTOOL \ -+sharedlib_from_linklib_cmd \ - AR \ - AR_FLAGS \ - STRIP \ -@@ -18189,14 +18714,14 @@ - lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ --SHELL \ --ECHO \ -+nm_file_list_spec \ - lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ - lt_prog_compiler_pic \ -+lt_prog_compiler_wl \ - lt_prog_compiler_static \ - lt_cv_prog_compiler_c_o \ - need_locks \ -+MANIFEST_TOOL \ - DSYMUTIL \ - NMEDIT \ - LIPO \ -@@ -18220,12 +18745,13 @@ - libname_spec \ - library_names_spec \ - soname_spec \ -+install_override_mode \ - finish_eval \ - old_striplib \ - striplib; do -- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in -+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[\\\\\\\`\\"\\\$]*) -- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" -+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -@@ -18247,14 +18773,15 @@ - module_expsym_cmds \ - export_symbols_cmds \ - prelink_cmds \ -+postlink_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - finish_cmds \ - sys_lib_search_path_spec \ - sys_lib_dlsearch_path_spec; do -- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in -+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[\\\\\\\`\\"\\\$]*) -- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -@@ -18262,12 +18789,6 @@ - esac - done - --# Fix-up fallback echo if it was mangled by the above quoting rules. --case \$lt_ECHO in --*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\` -- ;; --esac -- - ac_aux_dir='$ac_aux_dir' - xsi_shell='$xsi_shell' - lt_shell_append='$lt_shell_append' -@@ -18926,7 +19447,8 @@ - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -18974,6 +19496,12 @@ - # Whether or not to optimize for fast installation. - fast_install=$enable_fast_install - -+# Shell to use when invoking shell scripts. -+SHELL=$lt_SHELL -+ -+# An echo program that protects backslashes. -+ECHO=$lt_ECHO -+ - # The host system. - host_alias=$host_alias - host=$host -@@ -19023,19 +19551,27 @@ - # turn newlines into spaces. - NL2SP=$lt_lt_NL2SP - --# How to create reloadable object files. --reload_flag=$lt_reload_flag --reload_cmds=$lt_reload_cmds -- - # An object symbol dumper. - OBJDUMP=$lt_OBJDUMP - - # Method to check whether dependent libraries are shared objects. - deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == "file_magic". -+# Command to use when deplibs_check_method = "file_magic". - file_magic_cmd=$lt_file_magic_cmd - -+# How to find potential files when deplibs_check_method = "file_magic". -+file_magic_glob=$lt_file_magic_glob -+ -+# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -+want_nocaseglob=$lt_want_nocaseglob -+ -+# DLL creation program. -+DLLTOOL=$lt_DLLTOOL -+ -+# Command to associate shared and link libraries. -+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -+ - # The archiver. - AR=$lt_AR - AR_FLAGS=$lt_AR_FLAGS -@@ -19048,6 +19584,9 @@ - old_postinstall_cmds=$lt_old_postinstall_cmds - old_postuninstall_cmds=$lt_old_postuninstall_cmds - -+# Whether to use a lock for old archive extraction. -+lock_old_archive_extraction=$lock_old_archive_extraction -+ - # A C compiler. - LTCC=$lt_CC - -@@ -19066,21 +19605,21 @@ - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# Specify filename containing input files for \$NM. -+nm_file_list_spec=$lt_nm_file_list_spec -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - --# Shell to use when invoking shell scripts. --SHELL=$lt_SHELL -- --# An echo program that does not interpret backslashes. --ECHO=$lt_ECHO -- - # Used to examine libraries when file_magic_cmd begins with "file". - MAGIC_CMD=$MAGIC_CMD - - # Must we lock files when doing compilation? - need_locks=$lt_need_locks - -+# Manifest tool. -+MANIFEST_TOOL=$lt_MANIFEST_TOOL -+ - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. - DSYMUTIL=$lt_DSYMUTIL - -@@ -19137,6 +19676,9 @@ - # The coded name of the library, if different from the real name. - soname_spec=$lt_soname_spec - -+# Permission mode override for installation of shared libraries. -+install_override_mode=$lt_install_override_mode -+ - # Command to use after installation of a shared archive. - postinstall_cmds=$lt_postinstall_cmds - -@@ -19176,6 +19718,10 @@ - # The linker used to build libraries. - LD=$lt_LD - -+# How to create reloadable object files. -+reload_flag=$lt_reload_flag -+reload_cmds=$lt_reload_cmds -+ - # Commands used to build an old-style archive. - old_archive_cmds=$lt_old_archive_cmds - -@@ -19188,12 +19734,12 @@ - # Compiler flag to turn off builtin functions. - no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- - # Additional compiler flags for building library objects. - pic_flag=$lt_lt_prog_compiler_pic - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ - # Compiler flag to prevent dynamic linking. - link_static_flag=$lt_lt_prog_compiler_static - -@@ -19298,6 +19844,9 @@ - # Commands necessary for linking programs (against libraries) with templates. - prelink_cmds=$lt_prelink_cmds - -+# Commands necessary for finishing linking programs. -+postlink_cmds=$lt_postlink_cmds -+ - # Specify filename containing input files. - file_list_spec=$lt_file_list_spec - -@@ -19330,212 +19879,169 @@ - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` --} -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "X${3}" \ -- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "X${3}" \ -- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; -- esac --} -- --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` --} -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'` --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -- --_LT_EOF -- ;; -- esac -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -+ if test x"$xsi_shell" = xyes; then -+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -+func_dirname ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_basename ()$/,/^} # func_basename /c\ -+func_basename ()\ -+{\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -+func_dirname_and_basename ()\ -+{\ -+\ case ${1} in\ -+\ */*) func_dirname_result="${1%/*}${2}" ;;\ -+\ * ) func_dirname_result="${3}" ;;\ -+\ esac\ -+\ func_basename_result="${1##*/}"\ -+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -+func_stripname ()\ -+{\ -+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -+\ # positional parameters, so assign one to ordinary parameter first.\ -+\ func_stripname_result=${3}\ -+\ func_stripname_result=${func_stripname_result#"${1}"}\ -+\ func_stripname_result=${func_stripname_result%"${2}"}\ -+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -+func_split_long_opt ()\ -+{\ -+\ func_split_long_opt_name=${1%%=*}\ -+\ func_split_long_opt_arg=${1#*=}\ -+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -+func_split_short_opt ()\ -+{\ -+\ func_split_short_opt_arg=${1#??}\ -+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -+func_lo2o ()\ -+{\ -+\ case ${1} in\ -+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -+\ *) func_lo2o_result=${1} ;;\ -+\ esac\ -+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_xform ()$/,/^} # func_xform /c\ -+func_xform ()\ -+{\ -+ func_xform_result=${1%.*}.lo\ -+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_arith ()$/,/^} # func_arith /c\ -+func_arith ()\ -+{\ -+ func_arith_result=$(( $* ))\ -+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_len ()$/,/^} # func_len /c\ -+func_len ()\ -+{\ -+ func_len_result=${#1}\ -+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+fi -+ -+if test x"$lt_shell_append" = xyes; then -+ sed -e '/^func_append ()$/,/^} # func_append /c\ -+func_append ()\ -+{\ -+ eval "${1}+=\\${2}"\ -+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -+func_append_quoted ()\ -+{\ -+\ func_quote_for_eval "${2}"\ -+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+ -+ -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi -+ -+if test x"$_lt_function_replace_fail" = x":"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -+fi - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - -diff -Nur strongswan-4.4.1.orig/configure.in strongswan-4.4.1/configure.in ---- strongswan-4.4.1.orig/configure.in 2010-07-29 20:10:16.000000000 +0200 -+++ strongswan-4.4.1/configure.in 2010-07-31 21:12:07.164501625 +0200 -@@ -189,6 +189,7 @@ - fi - - dnl translate user/group to numercial ids -+if test x"$cross_compiling" = xno; then - AC_MSG_CHECKING([for uid of user "$ipsecuser"]) - ipsecuid=`id -u $ipsecuser 2>/dev/null` - if test -n "$ipsecuid"; then -@@ -205,6 +206,11 @@ - else - AC_MSG_ERROR([not found]) - fi -+else -+ ipsecuid=0 -+ ipsecgid=0 -+fi -+ - - dnl ========================= - dnl dependency calculation -diff -Nur strongswan-4.4.1.orig/ltmain.sh strongswan-4.4.1/ltmain.sh ---- strongswan-4.4.1.orig/ltmain.sh 2010-01-06 11:24:25.000000000 +0100 -+++ strongswan-4.4.1/ltmain.sh 2010-07-31 21:12:25.148503831 +0200 -@@ -1,9 +1,10 @@ - # Generated from ltmain.m4sh. - --# ltmain.sh (GNU libtool) 2.2.6b -+# libtool (GNU libtool 1.3216 2010-07-08) 2.2.11a - # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 - --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. - # This is free software; see the source for copying conditions. There is NO - # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -@@ -32,50 +33,56 @@ - # - # Provide generalized library-building support services. - # --# --config show all configuration variables --# --debug enable verbose shell tracing --# -n, --dry-run display commands without modifying any files --# --features display basic configuration information and exit --# --mode=MODE use operation mode MODE --# --preserve-dup-deps don't remove duplicate dependency libraries --# --quiet, --silent don't print informational messages --# --tag=TAG use configuration variables from tag TAG --# -v, --verbose print informational messages (default) --# --version print version information --# -h, --help print short or long help message -+# --config show all configuration variables -+# --debug enable verbose shell tracing -+# -n, --dry-run display commands without modifying any files -+# --features display basic configuration information and exit -+# --mode=MODE use operation mode MODE -+# --preserve-dup-deps don't remove duplicate dependency libraries -+# --quiet, --silent don't print informational messages -+# --no-quiet, --no-silent -+# print informational messages (default) -+# --tag=TAG use configuration variables from tag TAG -+# -v, --verbose print more informational messages than default -+# --no-verbose don't print the extra informational messages -+# --version print version information -+# -h, --help, --help-all print short, long, or detailed help message - # - # MODE must be one of the following: - # --# clean remove files from the build directory --# compile compile a source file into a libtool object --# execute automatically set library path, then run a program --# finish complete the installation of libtool libraries --# install install libraries or executables --# link create a library or an executable --# uninstall remove libraries from an installed directory -+# clean remove files from the build directory -+# compile compile a source file into a libtool object -+# execute automatically set library path, then run a program -+# finish complete the installation of libtool libraries -+# install install libraries or executables -+# link create a library or an executable -+# uninstall remove libraries from an installed directory - # --# MODE-ARGS vary depending on the MODE. -+# MODE-ARGS vary depending on the MODE. When passed as first option, -+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. - # Try `$progname --help --mode=MODE' for a more detailed description of MODE. - # - # When reporting a bug, please describe a test case to reproduce it and - # include the following information: - # --# host-triplet: $host --# shell: $SHELL --# compiler: $LTCC --# compiler flags: $LTCFLAGS --# linker: $LD (gnu? $with_gnu_ld) --# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1 --# automake: $automake_version --# autoconf: $autoconf_version -+# host-triplet: $host -+# shell: $SHELL -+# compiler: $LTCC -+# compiler flags: $LTCFLAGS -+# linker: $LD (gnu? $with_gnu_ld) -+# $progname: (GNU libtool 1.3216 2010-07-08) 2.2.11a -+# automake: $automake_version -+# autoconf: $autoconf_version - # - # Report bugs to <bug-libtool@gnu.org>. -+# GNU libtool home page: <http://www.gnu.org/software/libtool/>. -+# General help using GNU software: <http://www.gnu.org/gethelp/>. - --PROGRAM=ltmain.sh -+PROGRAM=libtool - PACKAGE=libtool --VERSION="2.2.6b Debian-2.2.6b-2ubuntu1" --TIMESTAMP="" --package_revision=1.3017 -+VERSION=2.2.11a -+TIMESTAMP=" 1.3216 2010-07-08" -+package_revision=1.3216 - - # Be Bourne compatible - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -@@ -91,10 +98,15 @@ - BIN_SH=xpg4; export BIN_SH # for Tru64 - DUALCASE=1; export DUALCASE # for MKS sh - -+# A function that is used when there is no print builtin or printf. -+func_fallback_echo () -+{ -+ eval 'cat <<_LTECHO_EOF -+$1 -+_LTECHO_EOF' -+} -+ - # NLS nuisances: We save the old values to restore during execute mode. --# Only set LANG and LC_ALL to C if already set. --# These must not be set unconditionally because not all systems understand --# e.g. LANG=C (notably SCO). - lt_user_locale= - lt_safe_locale= - for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -@@ -107,15 +119,24 @@ - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" - fi" - done -+LC_ALL=C -+LANGUAGE=C -+export LANGUAGE LC_ALL - - $lt_unset CDPATH - - -+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -+# is ksh but when the shell is invoked as "sh" and the current value of -+# the _XPG environment variable is not equal to 1 (one), the special -+# positional parameter $0, within a function call, is the name of the -+# function. -+progpath="$0" - - - - : ${CP="cp -f"} --: ${ECHO="echo"} -+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} - : ${EGREP="/bin/grep -E"} - : ${FGREP="/bin/grep -F"} - : ${GREP="/bin/grep"} -@@ -144,6 +165,27 @@ - dirname="s,/[^/]*$,," - basename="s,^.*/,," - -+# func_dirname file append nondir_replacement -+# Compute the dirname of FILE. If nonempty, add APPEND to the result, -+# otherwise set result to NONDIR_REPLACEMENT. -+func_dirname () -+{ -+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+} # func_dirname may be replaced by extended shell implementation -+ -+ -+# func_basename file -+func_basename () -+{ -+ func_basename_result=`$ECHO "${1}" | $SED "$basename"` -+} # func_basename may be replaced by extended shell implementation -+ -+ - # func_dirname_and_basename file append nondir_replacement - # perform func_basename and func_dirname in a single function - # call: -@@ -158,33 +200,183 @@ - # those functions but instead duplicate the functionality here. - func_dirname_and_basename () - { -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi -- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` -+ # Extract subdirectory from the argument. -+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -+} # func_dirname_and_basename may be replaced by extended shell implementation -+ -+ -+# func_stripname prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+# func_strip_suffix prefix name -+func_stripname () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -+ esac -+} # func_stripname may be replaced by extended shell implementation -+ -+ -+# These SED scripts presuppose an absolute path with a trailing slash. -+pathcar='s,^/\([^/]*\).*$,\1,' -+pathcdr='s,^/[^/]*,,' -+removedotparts=':dotsl -+ s@/\./@/@g -+ t dotsl -+ s,/\.$,/,' -+collapseslashes='s@/\{1,\}@/@g' -+finalslash='s,/*$,/,' -+ -+# func_normal_abspath PATH -+# Remove doubled-up and trailing slashes, "." path components, -+# and cancel out any ".." path components in PATH after making -+# it an absolute path. -+# value returned in "$func_normal_abspath_result" -+func_normal_abspath () -+{ -+ # Start from root dir and reassemble the path. -+ func_normal_abspath_result= -+ func_normal_abspath_tpath=$1 -+ func_normal_abspath_altnamespace= -+ case $func_normal_abspath_tpath in -+ "") -+ # Empty path, that just means $cwd. -+ func_stripname '' '/' "`pwd`" -+ func_normal_abspath_result=$func_stripname_result -+ return -+ ;; -+ # The next three entries are used to spot a run of precisely -+ # two leading slashes without using negated character classes; -+ # we take advantage of case's first-match behaviour. -+ ///*) -+ # Unusual form of absolute path, do nothing. -+ ;; -+ //*) -+ # Not necessarily an ordinary path; POSIX reserves leading '//' -+ # and for example Cygwin uses it to access remote file shares -+ # over CIFS/SMB, so we conserve a leading double slash if found. -+ func_normal_abspath_altnamespace=/ -+ ;; -+ /*) -+ # Absolute path, do nothing. -+ ;; -+ *) -+ # Relative path, prepend $cwd. -+ func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath -+ ;; -+ esac -+ # Cancel out all the simple stuff to save iterations. We also want -+ # the path to end with a slash for ease of parsing, so make sure -+ # there is one (and only one) here. -+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ -+ -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` -+ while :; do -+ # Processed it all yet? -+ if test "$func_normal_abspath_tpath" = / ; then -+ # If we ascended to the root using ".." the result may be empty now. -+ if test -z "$func_normal_abspath_result" ; then -+ func_normal_abspath_result=/ -+ fi -+ break -+ fi -+ func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ -+ -e "$pathcar"` -+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ -+ -e "$pathcdr"` -+ # Figure out what to do with it -+ case $func_normal_abspath_tcomponent in -+ "") -+ # Trailing empty path component, ignore it. -+ ;; -+ ..) -+ # Parent dir; strip last assembled component from result. -+ func_dirname "$func_normal_abspath_result" -+ func_normal_abspath_result=$func_dirname_result -+ ;; -+ *) -+ # Actual path component, append it. -+ func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent -+ ;; -+ esac -+ done -+ # Restore leading double-slash if one was found on entry. -+ func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result - } - --# Generated shell functions inserted here. -+# func_relative_path SRCDIR DSTDIR -+# generates a relative path from SRCDIR to DSTDIR, with a trailing -+# slash if non-empty, suitable for immediately appending a filename -+# without needing to append a separator. -+# value returned in "$func_relative_path_result" -+func_relative_path () -+{ -+ func_relative_path_result= -+ func_normal_abspath "$1" -+ func_relative_path_tlibdir=$func_normal_abspath_result -+ func_normal_abspath "$2" -+ func_relative_path_tbindir=$func_normal_abspath_result -+ -+ # Ascend the tree starting from libdir -+ while :; do -+ # check if we have found a prefix of bindir -+ case $func_relative_path_tbindir in -+ $func_relative_path_tlibdir) -+ # found an exact match -+ func_relative_path_tcancelled= -+ break -+ ;; -+ $func_relative_path_tlibdir*) -+ # found a matching prefix -+ func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" -+ func_relative_path_tcancelled=$func_stripname_result -+ if test -z "$func_relative_path_result"; then -+ func_relative_path_result=. -+ fi -+ break -+ ;; -+ *) -+ func_dirname $func_relative_path_tlibdir -+ func_relative_path_tlibdir=${func_dirname_result} -+ if test "x$func_relative_path_tlibdir" = x ; then -+ # Have to descend all the way to the root! -+ func_relative_path_result=../$func_relative_path_result -+ func_relative_path_tcancelled=$func_relative_path_tbindir -+ break -+ fi -+ func_relative_path_result=../$func_relative_path_result -+ ;; -+ esac -+ done - --# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh --# is ksh but when the shell is invoked as "sh" and the current value of --# the _XPG environment variable is not equal to 1 (one), the special --# positional parameter $0, within a function call, is the name of the --# function. --progpath="$0" -+ # Now calculate path; take care to avoid doubling-up slashes. -+ func_stripname '' '/' "$func_relative_path_result" -+ func_relative_path_result=$func_stripname_result -+ func_stripname '/' '/' "$func_relative_path_tcancelled" -+ if test "x$func_stripname_result" != x ; then -+ func_relative_path_result=${func_relative_path_result}/${func_stripname_result} -+ fi -+ -+ # Normalisation. If bindir is libdir, return empty string, -+ # else relative path ending with a slash; either way, target -+ # file name can be directly appended. -+ if test ! -z "$func_relative_path_result"; then -+ func_stripname './' '' "$func_relative_path_result/" -+ func_relative_path_result=$func_stripname_result -+ fi -+} - - # The name of this program: --# In the unlikely event $progname began with a '-', it would play havoc with --# func_echo (imagine progname=-n), so we prepend ./ in that case: - func_dirname_and_basename "$progpath" - progname=$func_basename_result --case $progname in -- -*) progname=./$progname ;; --esac - - # Make sure we have an absolute path for reexecution: - case $progpath in -@@ -243,7 +435,7 @@ - # name if it has been set yet. - func_echo () - { -- $ECHO "$progname${mode+: }$mode: $*" -+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*" - } - - # func_verbose arg... -@@ -258,18 +450,25 @@ - : - } - -+# func_echo_all arg... -+# Invoke $ECHO with all args, space-separated. -+func_echo_all () -+{ -+ $ECHO "$*" -+} -+ - # func_error arg... - # Echo program name prefixed message to standard error. - func_error () - { -- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 -+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 - } - - # func_warning arg... - # Echo program name prefixed warning message to standard error. - func_warning () - { -- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 -+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 - - # bash bug again: - : -@@ -326,9 +525,9 @@ - case $my_directory_path in */*) ;; *) break ;; esac - - # ...otherwise throw away the child directory and loop -- my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"` -+ my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` - done -- my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` -+ my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` - - save_mkdir_p_IFS="$IFS"; IFS=':' - for my_dir in $my_dir_list; do -@@ -378,7 +577,7 @@ - func_fatal_error "cannot create temporary directory \`$my_tmpdir'" - fi - -- $ECHO "X$my_tmpdir" | $Xsed -+ $ECHO "$my_tmpdir" - } - - -@@ -392,7 +591,7 @@ - { - case $1 in - *[\\\`\"\$]*) -- func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;; -+ func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; - *) - func_quote_for_eval_unquoted_result="$1" ;; - esac -@@ -419,7 +618,7 @@ - { - case $1 in - *[\\\`\"]*) -- my_arg=`$ECHO "X$1" | $Xsed \ -+ my_arg=`$ECHO "$1" | $SED \ - -e "$double_quote_subst" -e "$sed_double_backslash"` ;; - *) - my_arg="$1" ;; -@@ -488,15 +687,39 @@ - fi - } - -- -- -+# func_tr_sh -+# Turn $1 into a string suitable for a shell variable name. -+# Result is stored in $func_tr_sh_result. All characters -+# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -+# if $1 begins with a digit, a '_' is prepended as well. -+func_tr_sh () -+{ -+ case $1 in -+ [0-9]* | *[!a-zA-Z0-9_]*) -+ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` -+ ;; -+ * ) -+ func_tr_sh_result=$1 -+ ;; -+ esac -+} - - - # func_version - # Echo version message to standard output and exit. - func_version () - { -- $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / { -+ $opt_debug -+ -+ $SED -n '/(C)/!b go -+ :more -+ /\./!{ -+ N -+ s/\n# / / -+ b more -+ } -+ :go -+ /^# '$PROGRAM' (GNU /,/# warranty; / { - s/^# // - s/^# *$// - s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ -@@ -509,22 +732,28 @@ - # Echo short help message to standard output and exit. - func_usage () - { -- $SED -n '/^# Usage:/,/# -h/ { -+ $opt_debug -+ -+ $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ - p - }' < "$progpath" -- $ECHO -+ echo - $ECHO "run \`$progname --help | more' for full usage" - exit $? - } - --# func_help --# Echo long help message to standard output and exit. -+# func_help [NOEXIT] -+# Echo long help message to standard output and exit, -+# unless 'noexit' is passed as argument. - func_help () - { -+ $opt_debug -+ - $SED -n '/^# Usage:/,/# Report bugs to/ { -+ :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* -@@ -537,8 +766,15 @@ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ - p -- }' < "$progpath" -- exit $? -+ d -+ } -+ /^# .* home page:/b print -+ /^# General help using/b print -+ ' < "$progpath" -+ ret=$? -+ if test -z "$1"; then -+ exit $ret -+ fi - } - - # func_missing_arg argname -@@ -546,63 +782,105 @@ - # exit_cmd. - func_missing_arg () - { -- func_error "missing argument for $1" -+ $opt_debug -+ -+ func_error "missing argument for $1." - exit_cmd=exit - } - --exit_cmd=: - -+# func_split_short_opt shortopt -+# Set func_split_short_opt_name and func_split_short_opt_arg shell -+# variables after splitting SHORTOPT after the 2nd character. -+func_split_short_opt () -+{ -+ my_sed_short_opt='1s/^\(..\).*$/\1/;q' -+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q' -+ -+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` -+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -+} # func_split_short_opt may be replaced by extended shell implementation -+ -+ -+# func_split_long_opt longopt -+# Set func_split_long_opt_name and func_split_long_opt_arg shell -+# variables after splitting LONGOPT at the `=' sign. -+func_split_long_opt () -+{ -+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' -+ my_sed_long_arg='1s/^--[^=]*=//' -+ -+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` -+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -+} # func_split_long_opt may be replaced by extended shell implementation - -+exit_cmd=: - - - --# Check that we have a working $ECHO. --if test "X$1" = X--no-reexec; then -- # Discard the --no-reexec flag, and continue. -- shift --elif test "X$1" = X--fallback-echo; then -- # Avoid inline document here, it may be left over -- : --elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then -- # Yippee, $ECHO works! -- : --else -- # Restart under the correct shell, and then maybe $ECHO will work. -- exec $SHELL "$progpath" --no-reexec ${1+"$@"} --fi - --if test "X$1" = X--fallback-echo; then -- # used as fallback echo -- shift -- cat <<EOF --$* --EOF -- exit $EXIT_SUCCESS --fi - - magic="%%%MAGIC variable%%%" - magic_exe="%%%MAGIC EXE variable%%%" - - # Global variables. --# $mode is unset - nonopt= --execute_dlfiles= - preserve_args= - lo2o="s/\\.lo\$/.${objext}/" - o2lo="s/\\.${objext}\$/.lo/" - extracted_archives= - extracted_serial=0 - --opt_dry_run=false --opt_duplicate_deps=false --opt_silent=false --opt_debug=: -- - # If this variable is set in any of the actions, the command in it - # will be execed at the end. This prevents here-documents from being - # left over by shells. - exec_cmd= - -+# func_append var value -+# Append VALUE to the end of shell variable VAR. -+func_append () -+{ -+ eval "${1}=\$${1}\${2}" -+} # func_append may be replaced by extended shell implementation -+ -+# func_append_quoted var value -+# Quote VALUE and append to the end of shell variable VAR. -+func_append_quoted () -+{ -+ func_quote_for_eval "${2}" -+ eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -+} # func_append_quoted may be replaced by extended shell implementation -+ -+ -+# func_arith arithmetic-term... -+func_arith () -+{ -+ func_arith_result=`expr "${@}"` -+} # func_arith may be replaced by extended shell implementation -+ -+ -+# func_len string -+# STRING may not start with a hyphen. -+func_len () -+{ -+ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -+} # func_len may be replaced by extended shell implementation -+ -+ -+# func_lo2o object -+func_lo2o () -+{ -+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -+} # func_lo2o may be replaced by extended shell implementation -+ -+ -+# func_xform libobj-or-source -+func_xform () -+{ -+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'` -+} # func_xform may be replaced by extended shell implementation -+ -+ - # func_fatal_configuration arg... - # Echo program name prefixed message to standard error, followed by - # a configuration failure hint, and exit. -@@ -636,16 +914,16 @@ - # Display the features supported by this script. - func_features () - { -- $ECHO "host: $host" -+ echo "host: $host" - if test "$build_libtool_libs" = yes; then -- $ECHO "enable shared libraries" -+ echo "enable shared libraries" - else -- $ECHO "disable shared libraries" -+ echo "disable shared libraries" - fi - if test "$build_old_libs" = yes; then -- $ECHO "enable static libraries" -+ echo "enable static libraries" - else -- $ECHO "disable static libraries" -+ echo "disable static libraries" - fi - - exit $? -@@ -692,117 +970,201 @@ - esac - } - --# Parse options once, thoroughly. This comes as soon as possible in --# the script to make things like `libtool --version' happen quickly. -+# func_check_version_match -+# Ensure that we are using m4 macros, and libtool script from the same -+# release of libtool. -+func_check_version_match () - { -+ if test "$package_revision" != "$macro_revision"; then -+ if test "$VERSION" != "$macro_version"; then -+ if test -z "$macro_version"; then -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -+$progname: definition of this LT_INIT comes from an older release. -+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -+$progname: and run autoconf again. -+_LT_EOF -+ else -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -+$progname: and run autoconf again. -+_LT_EOF -+ fi -+ else -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -+$progname: but the definition of this LT_INIT comes from revision $macro_revision. -+$progname: You should recreate aclocal.m4 with macros from revision $package_revision -+$progname: of $PACKAGE $VERSION and run autoconf again. -+_LT_EOF -+ fi - -- # Shorthand for --mode=foo, only valid as the first argument -- case $1 in -- clean|clea|cle|cl) -- shift; set dummy --mode clean ${1+"$@"}; shift -- ;; -- compile|compil|compi|comp|com|co|c) -- shift; set dummy --mode compile ${1+"$@"}; shift -- ;; -- execute|execut|execu|exec|exe|ex|e) -- shift; set dummy --mode execute ${1+"$@"}; shift -- ;; -- finish|finis|fini|fin|fi|f) -- shift; set dummy --mode finish ${1+"$@"}; shift -- ;; -- install|instal|insta|inst|ins|in|i) -- shift; set dummy --mode install ${1+"$@"}; shift -- ;; -- link|lin|li|l) -- shift; set dummy --mode link ${1+"$@"}; shift -- ;; -- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -- shift; set dummy --mode uninstall ${1+"$@"}; shift -- ;; -- esac -+ exit $EXIT_MISMATCH -+ fi -+} -+ -+ -+# Shorthand for --mode=foo, only valid as the first argument -+case $1 in -+clean|clea|cle|cl) -+ shift; set dummy --mode clean ${1+"$@"}; shift -+ ;; -+compile|compil|compi|comp|com|co|c) -+ shift; set dummy --mode compile ${1+"$@"}; shift -+ ;; -+execute|execut|execu|exec|exe|ex|e) -+ shift; set dummy --mode execute ${1+"$@"}; shift -+ ;; -+finish|finis|fini|fin|fi|f) -+ shift; set dummy --mode finish ${1+"$@"}; shift -+ ;; -+install|instal|insta|inst|ins|in|i) -+ shift; set dummy --mode install ${1+"$@"}; shift -+ ;; -+link|lin|li|l) -+ shift; set dummy --mode link ${1+"$@"}; shift -+ ;; -+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -+ shift; set dummy --mode uninstall ${1+"$@"}; shift -+ ;; -+esac - -- # Parse non-mode specific arguments: -- while test "$#" -gt 0; do -+ -+ -+# Option defaults: -+opt_debug=: -+opt_dry_run=false -+opt_config=false -+opt_preserve_dup_deps=false -+opt_features=false -+opt_finish=false -+opt_help=false -+opt_help_all=false -+opt_silent=: -+opt_verbose=: -+opt_silent=false -+opt_verbose=false -+ -+ -+# Parse options once, thoroughly. This comes as soon as possible in the -+# script to make things like `--version' happen as quickly as we can. -+{ -+ # this just eases exit handling -+ while test $# -gt 0; do - opt="$1" - shift -- - case $opt in -- --config) func_config ;; -- -- --debug) preserve_args="$preserve_args $opt" -+ --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" -- opt_debug='set -x' - $opt_debug - ;; -- -- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break -- execute_dlfiles="$execute_dlfiles $1" -- shift -+ --dry-run|--dryrun|-n) -+ opt_dry_run=: - ;; -- -- --dry-run | -n) opt_dry_run=: ;; -- --features) func_features ;; -- --finish) mode="finish" ;; -- -- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break -- case $1 in -- # Valid mode arguments: -- clean) ;; -- compile) ;; -- execute) ;; -- finish) ;; -- install) ;; -- link) ;; -- relink) ;; -- uninstall) ;; -- -- # Catch anything else as an error -- *) func_error "invalid argument for $opt" -- exit_cmd=exit -- break -- ;; -- esac -- -- mode="$1" -+ --config) -+ opt_config=: -+func_config -+ ;; -+ --dlopen|-dlopen) -+ optarg="$1" -+ opt_dlopen="${opt_dlopen+$opt_dlopen -+}$optarg" - shift - ;; -- - --preserve-dup-deps) -- opt_duplicate_deps=: ;; -- -- --quiet|--silent) preserve_args="$preserve_args $opt" -- opt_silent=: -+ opt_preserve_dup_deps=: - ;; -- -- --verbose| -v) preserve_args="$preserve_args $opt" -+ --features) -+ opt_features=: -+func_features -+ ;; -+ --finish) -+ opt_finish=: -+set dummy --mode finish ${1+"$@"}; shift -+ ;; -+ --help) -+ opt_help=: -+ ;; -+ --help-all) -+ opt_help_all=: -+opt_help=': help-all' -+ ;; -+ --mode) -+ test $# = 0 && func_missing_arg $opt && break -+ optarg="$1" -+ opt_mode="$optarg" -+case $optarg in -+ # Valid mode arguments: -+ clean|compile|execute|finish|install|link|relink|uninstall) ;; -+ -+ # Catch anything else as an error -+ *) func_error "invalid argument for $opt" -+ exit_cmd=exit -+ break -+ ;; -+esac -+ shift -+ ;; -+ --no-silent|--no-quiet) - opt_silent=false -+func_append preserve_args " $opt" - ;; -- -- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break -- preserve_args="$preserve_args $opt $1" -- func_enable_tag "$1" # tagname is set here -+ --no-verbose) -+ opt_verbose=false -+func_append preserve_args " $opt" -+ ;; -+ --silent|--quiet) -+ opt_silent=: -+func_append preserve_args " $opt" -+ opt_verbose=false -+ ;; -+ --verbose|-v) -+ opt_verbose=: -+func_append preserve_args " $opt" -+opt_silent=false -+ ;; -+ --tag) -+ test $# = 0 && func_missing_arg $opt && break -+ optarg="$1" -+ opt_tag="$optarg" -+func_append preserve_args " $opt $optarg" -+func_enable_tag "$optarg" - shift - ;; - -+ -\?|-h) func_usage ;; -+ --help) func_help ;; -+ --version) func_version ;; -+ - # Separate optargs to long options: -- -dlopen=*|--mode=*|--tag=*) -- func_opt_split "$opt" -- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} -+ --*=*) -+ func_split_long_opt "$opt" -+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - -- -\?|-h) func_usage ;; -- --help) opt_help=: ;; -- --version) func_version ;; -- -- -*) func_fatal_help "unrecognized option \`$opt'" ;; -- -- *) nonopt="$opt" -- break -+ # Separate non-argument short options: -+ -\?*|-h*|-n*|-v*) -+ func_split_short_opt "$opt" -+ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} -+ shift - ;; -+ -+ --) break ;; -+ -*) func_fatal_help "unrecognized option \`$opt'" ;; -+ *) set dummy "$opt" ${1+"$@"}; shift; break ;; - esac - done - -+ # Validate options: -+ -+ # save first non-option argument -+ nonopt="$opt"; shift -+ -+ # preserve --debug -+ $opt_debug && func_append preserve_args " --debug" - - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) -@@ -810,82 +1172,46 @@ - opt_duplicate_compiler_generated_deps=: - ;; - *) -- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps -+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - -- # Having warned about all mis-specified options, bail out if -- # anything was wrong. -- $exit_cmd $EXIT_FAILURE --} -+ $opt_help || { -+ # Sanity checks first: -+ func_check_version_match - --# func_check_version_match --# Ensure that we are using m4 macros, and libtool script from the same --# release of libtool. --func_check_version_match () --{ -- if test "$package_revision" != "$macro_revision"; then -- if test "$VERSION" != "$macro_version"; then -- if test -z "$macro_version"; then -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, but the --$progname: definition of this LT_INIT comes from an older release. --$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION --$progname: and run autoconf again. --_LT_EOF -- else -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, but the --$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. --$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION --$progname: and run autoconf again. --_LT_EOF -- fi -- else -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, --$progname: but the definition of this LT_INIT comes from revision $macro_revision. --$progname: You should recreate aclocal.m4 with macros from revision $package_revision --$progname: of $PACKAGE $VERSION and run autoconf again. --_LT_EOF -+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then -+ func_fatal_configuration "not configured to build any kind of library" - fi - -- exit $EXIT_MISMATCH -- fi --} -- -+ test -z "$opt_mode" && func_fatal_error "error: you must specify a MODE." - --## ----------- ## --## Main. ## --## ----------- ## -+ # Darwin sucks -+ eval std_shrext=\"$shrext_cmds\" - --$opt_help || { -- # Sanity checks first: -- func_check_version_match -- -- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then -- func_fatal_configuration "not configured to build any kind of library" -- fi -+ # Only execute mode is allowed to have -dlopen flags. -+ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then -+ func_error "unrecognized option \`-dlopen'" -+ $ECHO "$help" 1>&2 -+ exit $EXIT_FAILURE -+ fi - -- test -z "$mode" && func_fatal_error "error: you must specify a MODE." -+ # Change the help message to a mode-specific one. -+ generic_help="$help" -+ help="Try \`$progname --help --mode=$opt_mode' for more information." -+ } - - -- # Darwin sucks -- eval std_shrext=\"$shrext_cmds\" -+ # Bail if the options were screwed -+ $exit_cmd $EXIT_FAILURE -+} - - -- # Only execute mode is allowed to have -dlopen flags. -- if test -n "$execute_dlfiles" && test "$mode" != execute; then -- func_error "unrecognized option \`-dlopen'" -- $ECHO "$help" 1>&2 -- exit $EXIT_FAILURE -- fi - -- # Change the help message to a mode-specific one. -- generic_help="$help" -- help="Try \`$progname --help --mode=$mode' for more information." --} - -+## ----------- ## -+## Main. ## -+## ----------- ## - - # func_lalib_p file - # True iff FILE is a libtool `.la' library or `.lo' object file. -@@ -950,12 +1276,9 @@ - # temporary ltwrapper_script. - func_ltwrapper_scriptname () - { -- func_ltwrapper_scriptname_result="" -- if func_ltwrapper_executable_p "$1"; then -- func_dirname_and_basename "$1" "" "." -- func_stripname '' '.exe' "$func_basename_result" -- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" -- fi -+ func_dirname_and_basename "$1" "" "." -+ func_stripname '' '.exe' "$func_basename_result" -+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" - } - - # func_ltwrapper_p file -@@ -1013,13 +1336,15 @@ - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do -- func_quote_for_eval "$arg" -- CC_quoted="$CC_quoted $func_quote_for_eval_result" -+ func_append_quoted CC_quoted "$arg" - done -+ CC_expanded=`func_echo_all $CC` -+ CC_quoted_expanded=`func_echo_all $CC_quoted` - case $@ in - # Blanks in the command may have been stripped by the calling shell, - # but not from the CC environment variable when configure was run. -- " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;; -+ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ -+ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; - # Blanks at the start of $base_compile will cause this to fail - # if we don't check for them as well. - *) -@@ -1030,11 +1355,13 @@ - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. -- func_quote_for_eval "$arg" -- CC_quoted="$CC_quoted $func_quote_for_eval_result" -+ func_append_quoted CC_quoted "$arg" - done -+ CC_expanded=`func_echo_all $CC` -+ CC_quoted_expanded=`func_echo_all $CC_quoted` - case "$@ " in -- " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) -+ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ -+ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) - # The compiler in the base compile command matches - # the one in the tagged configuration. - # Assume this is the tagged configuration we want. -@@ -1137,12 +1464,12 @@ - ;; - - -pie | -fpie | -fPIE) -- pie_flag="$pie_flag $arg" -+ func_append pie_flag " $arg" - continue - ;; - - -shared | -static | -prefer-pic | -prefer-non-pic) -- later="$later $arg" -+ func_append later " $arg" - continue - ;; - -@@ -1163,15 +1490,14 @@ - save_ifs="$IFS"; IFS=',' - for arg in $args; do - IFS="$save_ifs" -- func_quote_for_eval "$arg" -- lastarg="$lastarg $func_quote_for_eval_result" -+ func_append_quoted lastarg " $arg" - done - IFS="$save_ifs" - func_stripname ' ' '' "$lastarg" - lastarg=$func_stripname_result - - # Add the arguments to base_compile. -- base_compile="$base_compile $lastarg" -+ func_append base_compile " $lastarg" - continue - ;; - -@@ -1187,8 +1513,7 @@ - esac # case $arg_mode - - # Aesthetically quote the previous argument. -- func_quote_for_eval "$lastarg" -- base_compile="$base_compile $func_quote_for_eval_result" -+ func_append_quoted base_compile "$lastarg" - done # for arg - - case $arg_mode in -@@ -1213,7 +1538,7 @@ - *.[cCFSifmso] | \ - *.ada | *.adb | *.ads | *.asm | \ - *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ -- *.[fF][09]? | *.for | *.java | *.obj | *.sx) -+ *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) - func_xform "$libobj" - libobj=$func_xform_result - ;; -@@ -1288,7 +1613,7 @@ - # Calculate the filename of the output object if compiler does - # not support -o with -c - if test "$compiler_c_o" = no; then -- output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} -+ output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" - else - output_obj= -@@ -1319,12 +1644,12 @@ - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi -- removelist="$removelist $output_obj" -+ func_append removelist " $output_obj" - $ECHO "$srcfile" > "$lockfile" - fi - - $opt_dry_run || $RM $removelist -- removelist="$removelist $lockfile" -+ func_append removelist " $lockfile" - trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - - if test -n "$fix_srcfile_path"; then -@@ -1349,7 +1674,7 @@ - - if test -z "$output_obj"; then - # Place PIC objects in $objdir -- command="$command -o $lobj" -+ func_append command " -o $lobj" - fi - - func_show_eval_locale "$command" \ -@@ -1396,11 +1721,11 @@ - command="$base_compile $qsrcfile $pic_flag" - fi - if test "$compiler_c_o" = yes; then -- command="$command -o $obj" -+ func_append command " -o $obj" - fi - - # Suppress compiler output if we already did a PIC compilation. -- command="$command$suppress_output" -+ func_append command "$suppress_output" - func_show_eval_locale "$command" \ - '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - -@@ -1445,13 +1770,13 @@ - } - - $opt_help || { --test "$mode" = compile && func_mode_compile ${1+"$@"} -+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"} - } - - func_mode_help () - { - # We need to display help for each of the modes. -- case $mode in -+ case $opt_mode in - "") - # Generic help is extracted from the usage comments - # at the start of this file. -@@ -1482,10 +1807,11 @@ - - -o OUTPUT-FILE set the output file name to OUTPUT-FILE - -no-suppress do not suppress compiler output for multiple passes -- -prefer-pic try to building PIC objects only -- -prefer-non-pic try to building non-PIC objects only -+ -prefer-pic try to build PIC objects only -+ -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking -+ -Wc,FLAG pass FLAG directly to the compiler - - COMPILE-COMMAND is a command to be used in creating a \`standard' object file - from the given SOURCEFILE. -@@ -1538,7 +1864,7 @@ - - The following components of INSTALL-COMMAND are treated specially: - -- -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation -+ -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation - - The rest of the components are interpreted as arguments to that command (only - BSD-compatible install options are recognized)." -@@ -1558,6 +1884,8 @@ - - -all-static do not do any dynamic linking at all - -avoid-version do not add a version suffix if possible -+ -bindir BINDIR specify path to binaries directory (for systems where -+ libraries must be found in the PATH setting at runtime) - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime - -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols - -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -@@ -1586,6 +1914,11 @@ - -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] - -weak LIBNAME declare that the target provides the LIBNAME interface -+ -Wc,FLAG -+ -Xcompiler FLAG pass linker-specific FLAG directly to the compiler -+ -Wl,FLAG -+ -Xlinker FLAG pass linker-specific FLAG directly to the linker -+ -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) - - All other options (arguments beginning with \`-') are ignored. - -@@ -1619,18 +1952,44 @@ - ;; - - *) -- func_fatal_help "invalid operation mode \`$mode'" -+ func_fatal_help "invalid operation mode \`$opt_mode'" - ;; - esac - -- $ECHO -+ echo - $ECHO "Try \`$progname --help' for more information about other modes." -- -- exit $? - } - -- # Now that we've collected a possible --mode arg, show help if necessary -- $opt_help && func_mode_help -+# Now that we've collected a possible --mode arg, show help if necessary -+if $opt_help; then -+ if test "$opt_help" = :; then -+ func_mode_help -+ else -+ { -+ func_help noexit -+ for opt_mode in compile link execute install finish uninstall clean; do -+ func_mode_help -+ done -+ } | sed -n '1p; 2,$s/^Usage:/ or: /p' -+ { -+ func_help noexit -+ for opt_mode in compile link execute install finish uninstall clean; do -+ echo -+ func_mode_help -+ done -+ } | -+ sed '1d -+ /^When reporting/,/^Report/{ -+ H -+ d -+ } -+ $x -+ /information about other modes/d -+ /more detailed .*MODE/d -+ s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' -+ fi -+ exit $? -+fi - - - # func_mode_execute arg... -@@ -1643,7 +2002,7 @@ - func_fatal_help "you must specify a COMMAND" - - # Handle -dlopen flags immediately. -- for file in $execute_dlfiles; do -+ for file in $opt_dlopen; do - test -f "$file" \ - || func_fatal_help "\`$file' is not a file" - -@@ -1671,7 +2030,7 @@ - dir="$func_dirname_result" - - if test -f "$dir/$objdir/$dlname"; then -- dir="$dir/$objdir" -+ func_append dir "/$objdir" - else - if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" -@@ -1712,7 +2071,7 @@ - for file - do - case $file in -- -*) ;; -+ -* | *.la | *.lo ) ;; - *) - # Do a test to see if this is really a libtool program. - if func_ltwrapper_script_p "$file"; then -@@ -1728,8 +2087,7 @@ - ;; - esac - # Quote arguments (to preserve shell metacharacters). -- func_quote_for_eval "$file" -- args="$args $func_quote_for_eval_result" -+ func_append_quoted args "$file" - done - - if test "X$opt_dry_run" = Xfalse; then -@@ -1754,14 +2112,14 @@ - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" -- $ECHO "export $shlibpath_var" -+ echo "export $shlibpath_var" - fi - $ECHO "$cmd$args" - exit $EXIT_SUCCESS - fi - } - --test "$mode" = execute && func_mode_execute ${1+"$@"} -+test "$opt_mode" = execute && func_mode_execute ${1+"$@"} - - - # func_mode_finish arg... -@@ -1774,7 +2132,7 @@ - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for dir - do -- libdirs="$libdirs $dir" -+ func_append libdirs " $dir" - done - - for libdir in $libdirs; do -@@ -1786,7 +2144,7 @@ - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" -- $opt_dry_run || eval "$cmds" || admincmds="$admincmds -+ $opt_dry_run || eval "$cmds" || func_append admincmds " - $cmds" - fi - done -@@ -1795,23 +2153,23 @@ - # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS - -- $ECHO "X----------------------------------------------------------------------" | $Xsed -- $ECHO "Libraries have been installed in:" -+ echo "----------------------------------------------------------------------" -+ echo "Libraries have been installed in:" - for libdir in $libdirs; do - $ECHO " $libdir" - done -- $ECHO -- $ECHO "If you ever happen to want to link against installed libraries" -- $ECHO "in a given directory, LIBDIR, you must either use libtool, and" -- $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'" -- $ECHO "flag during linking and do at least one of the following:" -+ echo -+ echo "If you ever happen to want to link against installed libraries" -+ echo "in a given directory, LIBDIR, you must either use libtool, and" -+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -+ echo "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then -- $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable" -- $ECHO " during execution" -+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -+ echo " during execution" - fi - if test -n "$runpath_var"; then -- $ECHO " - add LIBDIR to the \`$runpath_var' environment variable" -- $ECHO " during linking" -+ echo " - add LIBDIR to the \`$runpath_var' environment variable" -+ echo " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR -@@ -1823,25 +2181,25 @@ - $ECHO " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then -- $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi -- $ECHO -+ echo - -- $ECHO "See any operating system documentation about shared libraries for" -+ echo "See any operating system documentation about shared libraries for" - case $host in - solaris2.[6789]|solaris2.1[0-9]) -- $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual" -- $ECHO "pages." -+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" -+ echo "pages." - ;; - *) -- $ECHO "more information, such as the ld(1) and ld.so(8) manual pages." -+ echo "more information, such as the ld(1) and ld.so(8) manual pages." - ;; - esac -- $ECHO "X----------------------------------------------------------------------" | $Xsed -+ echo "----------------------------------------------------------------------" - exit $EXIT_SUCCESS - } - --test "$mode" = finish && func_mode_finish ${1+"$@"} -+test "$opt_mode" = finish && func_mode_finish ${1+"$@"} - - - # func_mode_install arg... -@@ -1852,7 +2210,7 @@ - # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || - # Allow the use of GNU shtool's install command. -- $ECHO "X$nonopt" | $GREP shtool >/dev/null; then -+ case $nonopt in *shtool*) :;; *) false;; esac; then - # Aesthetically quote it. - func_quote_for_eval "$nonopt" - install_prog="$func_quote_for_eval_result " -@@ -1866,7 +2224,12 @@ - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - func_quote_for_eval "$arg" -- install_prog="$install_prog$func_quote_for_eval_result" -+ func_append install_prog "$func_quote_for_eval_result" -+ install_shared_prog=$install_prog -+ case " $install_prog " in -+ *[\\\ /]cp\ *) install_cp=: ;; -+ *) install_cp=false ;; -+ esac - - # We need to accept at least all the BSD install flags. - dest= -@@ -1876,10 +2239,12 @@ - install_type= - isdir=no - stripme= -+ no_mode=: - for arg - do -+ arg2= - if test -n "$dest"; then -- files="$files $dest" -+ func_append files " $dest" - dest=$arg - continue - fi -@@ -1887,10 +2252,9 @@ - case $arg in - -d) isdir=yes ;; - -f) -- case " $install_prog " in -- *[\\\ /]cp\ *) ;; -- *) prev=$arg ;; -- esac -+ if $install_cp; then :; else -+ prev=$arg -+ fi - ;; - -g | -m | -o) - prev=$arg -@@ -1904,6 +2268,10 @@ - *) - # If the previous option needed an argument, then skip it. - if test -n "$prev"; then -+ if test "x$prev" = x-m && test -n "$install_override_mode"; then -+ arg2=$install_override_mode -+ no_mode=false -+ fi - prev= - else - dest=$arg -@@ -1914,7 +2282,11 @@ - - # Aesthetically quote the argument. - func_quote_for_eval "$arg" -- install_prog="$install_prog $func_quote_for_eval_result" -+ func_append install_prog " $func_quote_for_eval_result" -+ if test -n "$arg2"; then -+ func_quote_for_eval "$arg2" -+ fi -+ func_append install_shared_prog " $func_quote_for_eval_result" - done - - test -z "$install_prog" && \ -@@ -1923,6 +2295,13 @@ - test -n "$prev" && \ - func_fatal_help "the \`$prev' option requires an argument" - -+ if test -n "$install_override_mode" && $no_mode; then -+ if $install_cp; then :; else -+ func_quote_for_eval "$install_override_mode" -+ func_append install_shared_prog " -m $func_quote_for_eval_result" -+ fi -+ fi -+ - if test -z "$files"; then - if test -z "$dest"; then - func_fatal_help "no file or destination specified" -@@ -1977,7 +2356,7 @@ - case $file in - *.$libext) - # Do the static libraries later. -- staticlibs="$staticlibs $file" -+ func_append staticlibs " $file" - ;; - - *.la) -@@ -1994,23 +2373,23 @@ - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; -- *) current_libdirs="$current_libdirs $libdir" ;; -+ *) func_append current_libdirs " $libdir" ;; - esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; -- *) future_libdirs="$future_libdirs $libdir" ;; -+ *) func_append future_libdirs " $libdir" ;; - esac - fi - - func_dirname "$file" "/" "" - dir="$func_dirname_result" -- dir="$dir$objdir" -+ func_append dir "$objdir" - - if test -n "$relink_command"; then - # Determine the prefix the user has applied to our future dir. -- inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` -+ inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` - - # Don't allow the user to place us outside of our expected - # location b/c this prevents finding dependent libraries that -@@ -2023,9 +2402,9 @@ - - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. -- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` -+ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` - else -- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"` -+ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` - fi - - func_warning "relinking \`$file'" -@@ -2043,7 +2422,7 @@ - test -n "$relink_command" && srcname="$realname"T - - # Install the shared library and build the symlinks. -- func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \ -+ func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ - 'exit $?' - tstripme="$stripme" - case $host_os in -@@ -2083,7 +2462,7 @@ - func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' - - # Maybe install the static library, too. -- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" -+ test -n "$old_library" && func_append staticlibs " $dir/$old_library" - ;; - - *.lo) -@@ -2183,7 +2562,7 @@ - if test -f "$lib"; then - func_source "$lib" - fi -- libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test -+ libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test - if test -n "$libdir" && test ! -f "$libfile"; then - func_warning "\`$lib' has not been installed in \`$libdir'" - finalize=no -@@ -2202,7 +2581,7 @@ - file="$func_basename_result" - outputname="$tmpdir/$file" - # Replace the output file specification. -- relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` -+ relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` - - $opt_silent || { - func_quote_for_expand "$relink_command" -@@ -2221,7 +2600,7 @@ - } - else - # Install the binary that we compiled earlier. -- file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` -+ file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` - fi - fi - -@@ -2280,7 +2659,7 @@ - fi - } - --test "$mode" = install && func_mode_install ${1+"$@"} -+test "$opt_mode" = install && func_mode_install ${1+"$@"} - - - # func_generate_dlsyms outputname originator pic_p -@@ -2323,6 +2702,10 @@ - extern \"C\" { - #endif - -+#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) -+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" -+#endif -+ - /* External symbol declarations for the compiler. */\ - " - -@@ -2332,7 +2715,7 @@ - $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" - - # Add our own program objects to the symbol list. -- progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -+ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` - for progfile in $progfiles; do - func_verbose "extracting global C symbols from \`$progfile'" - $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" -@@ -2371,7 +2754,7 @@ - eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - case $host in -- *cygwin | *mingw* | *cegcc* ) -+ *cygwin* | *mingw* | *cegcc* ) - eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' - ;; -@@ -2384,10 +2767,49 @@ - func_verbose "extracting global C symbols from \`$dlprefile'" - func_basename "$dlprefile" - name="$func_basename_result" -- $opt_dry_run || { -- eval '$ECHO ": $name " >> "$nlist"' -- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" -- } -+ case $host in -+ *cygwin* | *mingw* | *cegcc* ) -+ # if an import library, we need to obtain dlname -+ if func_win32_import_lib_p "$dlprefile"; then -+ func_tr_sh "$dlprefile" -+ eval "curr_lafile=\$libfile_$func_tr_sh_result" -+ dlprefile_dlbasename="" -+ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then -+ # Use subshell, to avoid clobbering current variable values -+ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` -+ if test -n "$dlprefile_dlname" ; then -+ func_basename "$dlprefile_dlname" -+ dlprefile_dlbasename="$func_basename_result" -+ else -+ # no lafile. user explicitly requested -dlpreopen <import library>. -+ $sharedlib_from_linklib "$dlprefile" -+ dlprefile_dlbasename=$sharedlib_from_linklib_result -+ fi -+ fi -+ $opt_dry_run || { -+ if test -n "$dlprefile_dlbasename" ; then -+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' -+ else -+ func_warning "Could not compute DLL name from $name" -+ eval '$ECHO ": $name " >> "$nlist"' -+ fi -+ eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe | -+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" -+ } -+ else # not an import lib -+ $opt_dry_run || { -+ eval '$ECHO ": $name " >> "$nlist"' -+ eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" -+ } -+ fi -+ ;; -+ *) -+ $opt_dry_run || { -+ eval '$ECHO ": $name " >> "$nlist"' -+ eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" -+ } -+ ;; -+ esac - done - - $opt_dry_run || { -@@ -2415,10 +2837,10 @@ - if test -f "$nlist"S; then - eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' - else -- $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms" -+ echo '/* NONE */' >> "$output_objdir/$my_dlsyms" - fi - -- $ECHO >> "$output_objdir/$my_dlsyms" "\ -+ echo >> "$output_objdir/$my_dlsyms" "\ - - /* The mapping between symbol names and symbols. */ - typedef struct { -@@ -2428,7 +2850,7 @@ - " - case $host in - *cygwin* | *mingw* | *cegcc* ) -- $ECHO >> "$output_objdir/$my_dlsyms" "\ -+ echo >> "$output_objdir/$my_dlsyms" "\ - /* DATA imports from DLLs on WIN32 con't be const, because - runtime relocations are performed -- see ld's documentation - on pseudo-relocs. */" -@@ -2441,7 +2863,7 @@ - lt_dlsym_const=const ;; - esac - -- $ECHO >> "$output_objdir/$my_dlsyms" "\ -+ echo >> "$output_objdir/$my_dlsyms" "\ - extern $lt_dlsym_const lt_dlsymlist - lt_${my_prefix}_LTX_preloaded_symbols[]; - $lt_dlsym_const lt_dlsymlist -@@ -2457,7 +2879,7 @@ - eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" - ;; - esac -- $ECHO >> "$output_objdir/$my_dlsyms" "\ -+ echo >> "$output_objdir/$my_dlsyms" "\ - {0, (void *) 0} - }; - -@@ -2500,7 +2922,7 @@ - for arg in $LTCFLAGS; do - case $arg in - -pie | -fpie | -fPIE) ;; -- *) symtab_cflags="$symtab_cflags $arg" ;; -+ *) func_append symtab_cflags " $arg" ;; - esac - done - -@@ -2515,16 +2937,16 @@ - case $host in - *cygwin* | *mingw* | *cegcc* ) - if test -f "$output_objdir/$my_outputname.def"; then -- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` -- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` -+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` -+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - else -- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` -- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` -+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` -+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` - fi - ;; - *) -- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` -- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` -+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` -+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` - ;; - esac - ;; -@@ -2538,8 +2960,8 @@ - # really was required. - - # Nullify the symbol file. -- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` -- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` -+ compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` -+ finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` - fi - } - -@@ -2549,6 +2971,7 @@ - # Need a lot of goo to handle *both* DLLs and import libs - # Has to be a shell function in order to 'eat' the argument - # that is supplied when $file_magic_command is called. -+# Despite the name, also deal with 64 bit binaries. - func_win32_libid () - { - $opt_debug -@@ -2559,8 +2982,9 @@ - win32_libid_type="x86 archive import" - ;; - *ar\ archive*) # could be an import, or static -+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. - if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | -- $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then -+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - win32_nmres=`eval $NM -f posix -A $1 | - $SED -n -e ' - 1,100{ -@@ -2590,6 +3014,129 @@ - $ECHO "$win32_libid_type" - } - -+# func_cygming_dll_for_implib ARG -+# -+# Platform-specific function to extract the -+# name of the DLL associated with the specified -+# import library ARG. -+# Invoked by eval'ing the libtool variable -+# $sharedlib_from_linklib_cmd -+# Result is available in the variable -+# $sharedlib_from_linklib_result -+func_cygming_dll_for_implib () -+{ -+ $opt_debug -+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` -+} -+ -+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs -+# -+# The is the core of a fallback implementation of a -+# platform-specific function to extract the name of the -+# DLL associated with the specified import library LIBNAME. -+# -+# SECTION_NAME is either .idata$6 or .idata$7, depending -+# on the platform and compiler that created the implib. -+# -+# Echos the name of the DLL associated with the -+# specified import library. -+func_cygming_dll_for_implib_fallback_core () -+{ -+ $opt_debug -+ match_literal=`$ECHO "$1" | $SED 's/[].[^$\\*|]/\\\\&/g'` -+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null | -+ $SED '/^Contents of section '"$match_literal"':/{ -+ # Place marker at beginning of archive member dllname section -+ s/.*/====MARK====/ -+ p -+ d -+ } -+ # These lines can sometimes be longer than 43 characters, but -+ # are always uninteresting -+ /:[ ]*file format pe[i]\{,1\}-/d -+ /^In archive [^:]*:/d -+ # Ensure marker is printed -+ /^====MARK====/p -+ # Remove all lines with less than 43 characters -+ /^.\{43\}/!d -+ # From remaining lines, remove first 43 characters -+ s/^.\{43\}//' | -+ $SED -n ' -+ # Join marker and all lines until next marker into a single line -+ /^====MARK====/ b para -+ H -+ $ b para -+ b -+ :para -+ x -+ s/\n//g -+ # Remove the marker -+ s/^====MARK====// -+ # Remove trailing dots and whitespace -+ s/[\. \t]*$// -+ # Print -+ /./p' | -+ # we now have a list, one entry per line, of the stringified -+ # contents of the appropriate section of all members of the -+ # archive which possess that section. Heuristic: eliminate -+ # all those which have a first or second character that is -+ # a '.' (that is, objdump's representation of an unprintable -+ # character.) This should work for all archives with less than -+ # 0x302f exports -- but will fail for DLLs whose name actually -+ # begins with a literal '.' or a single character followed by -+ # a '.'. -+ # -+ # Of those that remain, print the first one. -+ $SED -e '/^\./d;/^.\./d;q' -+} -+ -+# func_cygming_gnu_implib_p ARG -+# This predicate returns with zero status (TRUE) if -+# ARG is a GNU/binutils-style import library. Returns -+# with nonzero status (FALSE) otherwise. -+func_cygming_gnu_implib_p () -+{ -+ $opt_debug -+ func_cygming_gnu_implib_tmp=`$NM $1 | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` -+ test -n "$func_cygming_gnu_implib_tmp" -+} -+ -+# func_cygming_ms_implib_p ARG -+# This predicate returns with zero status (TRUE) if -+# ARG is an MS-style import library. Returns -+# with nonzero status (FALSE) otherwise. -+func_cygming_ms_implib_p () -+{ -+ $opt_debug -+ func_cygming_ms_implib_tmp=`$NM $1 | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` -+ test -n "$func_cygming_ms_implib_tmp" -+} -+ -+# func_cygming_dll_for_implib_fallback ARG -+# Platform-specific function to extract the -+# name of the DLL associated with the specified -+# import library ARG. -+# -+# This fallback implementation is for use when $DLLTOOL -+# does not support the --identify-strict option. -+# Invoked by eval'ing the libtool variable -+# $sharedlib_from_linklib_cmd -+# Result is available in the variable -+# $sharedlib_from_linklib_result -+func_cygming_dll_for_implib_fallback () -+{ -+ $opt_debug -+ if func_cygming_gnu_implib_p "$1" ; then -+ # binutils import library -+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` -+ elif func_cygming_ms_implib_p "$1" ; then -+ # ms-generated import library -+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` -+ else -+ # unknown -+ sharedlib_from_linklib_result="" -+ fi -+} - - - # func_extract_an_archive dir oldlib -@@ -2598,7 +3145,18 @@ - $opt_debug - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" -- func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?' -+ if test "$lock_old_archive_extraction" = yes; then -+ lockfile=$f_ex_an_ar_oldlib.lock -+ until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do -+ func_echo "Waiting for $lockfile to be removed" -+ sleep 2 -+ done -+ fi -+ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ -+ 'stat=$?; rm -f "$lockfile"; exit $stat' -+ if test "$lock_old_archive_extraction" = yes; then -+ $opt_dry_run || rm -f "$lockfile" -+ fi - if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then - : - else -@@ -2669,7 +3227,7 @@ - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do -- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` -+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` - $LIPO -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - $RM -rf unfat-$$ -@@ -2684,25 +3242,30 @@ - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac -- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` -+ func_append my_oldobjs " "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` - done - - func_extract_archives_result="$my_oldobjs" - } - - -- --# func_emit_wrapper_part1 [arg=no] -+# func_emit_wrapper [arg=no] - # --# Emit the first part of a libtool wrapper script on stdout. --# For more information, see the description associated with --# func_emit_wrapper(), below. --func_emit_wrapper_part1 () --{ -- func_emit_wrapper_part1_arg1=no -- if test -n "$1" ; then -- func_emit_wrapper_part1_arg1=$1 -- fi -+# Emit a libtool wrapper script on stdout. -+# Don't directly open a file because we may want to -+# incorporate the script contents within a cygwin/mingw -+# wrapper executable. Must ONLY be called from within -+# func_mode_link because it depends on a number of variables -+# set therein. -+# -+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR -+# variable will take. If 'yes', then the emitted script -+# will assume that the directory in which it is stored is -+# the $objdir directory. This is a cygwin/mingw-specific -+# behavior. -+func_emit_wrapper () -+{ -+ func_emit_wrapper_arg1=${1-no} - - $ECHO "\ - #! $SHELL -@@ -2718,7 +3281,6 @@ - - # Sed substitution that helps us do robust quoting. It backslashifies - # metacharacters that are still active within double-quoted strings. --Xsed='${SED} -e 1s/^X//' - sed_quote_subst='$sed_quote_subst' - - # Be Bourne compatible -@@ -2749,31 +3311,132 @@ - else - # When we are sourced in execute mode, \$file and \$ECHO are already set. - if test \"\$libtool_execute_magic\" != \"$magic\"; then -- ECHO=\"$qecho\" -- file=\"\$0\" -- # Make sure echo works. -- if test \"X\$1\" = X--no-reexec; then -- # Discard the --no-reexec flag, and continue. -- shift -- elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then -- # Yippee, \$ECHO works! -- : -- else -- # Restart under the correct shell, and then maybe \$ECHO will work. -- exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} -- fi -- fi\ -+ file=\"\$0\"" -+ -+ qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` -+ $ECHO "\ -+ -+# A function that is used when there is no print builtin or printf. -+func_fallback_echo () -+{ -+ eval 'cat <<_LTECHO_EOF -+\$1 -+_LTECHO_EOF' -+} -+ ECHO=\"$qECHO\" -+ fi -+ -+# Very basic option parsing. These options are (a) specific to -+# the libtool wrapper, (b) are identical between the wrapper -+# /script/ and the wrapper /executable/ which is used only on -+# windows platforms, and (c) all begin with the string "--lt-" -+# (application programs are unlikely to have options which match -+# this pattern). -+# -+# There are only two supported options: --lt-debug and -+# --lt-dump-script. There is, deliberately, no --lt-help. -+# -+# The first argument to this parsing function should be the -+# script's $0 value, followed by "$@". -+lt_option_debug= -+func_parse_lt_options () -+{ -+ lt_script_arg0=\$0 -+ shift -+ for lt_opt -+ do -+ case \"\$lt_opt\" in -+ --lt-debug) lt_option_debug=1 ;; -+ --lt-dump-script) -+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` -+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. -+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` -+ cat \"\$lt_dump_D/\$lt_dump_F\" -+ exit 0 -+ ;; -+ --lt-*) -+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 -+ exit 1 -+ ;; -+ esac -+ done -+ -+ # Print the debug banner immediately: -+ if test -n \"\$lt_option_debug\"; then -+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 -+ fi -+} -+ -+# Used when --lt-debug. Prints its arguments to stdout -+# (redirection is the responsibility of the caller) -+func_lt_dump_args () -+{ -+ lt_dump_args_N=1; -+ for lt_arg -+ do -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" -+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` -+ done -+} -+ -+# Core function for launching the target application -+func_exec_program_core () -+{ - " -- $ECHO "\ -+ case $host in -+ # Backslashes separate directories on plain windows -+ *-*-mingw | *-*-os2* | *-cegcc*) -+ $ECHO "\ -+ if test -n \"\$lt_option_debug\"; then -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 -+ func_lt_dump_args \${1+\"\$@\"} 1>&2 -+ fi -+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -+" -+ ;; -+ -+ *) -+ $ECHO "\ -+ if test -n \"\$lt_option_debug\"; then -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 -+ func_lt_dump_args \${1+\"\$@\"} 1>&2 -+ fi -+ exec \"\$progdir/\$program\" \${1+\"\$@\"} -+" -+ ;; -+ esac -+ $ECHO "\ -+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 -+ exit 1 -+} -+ -+# A function to encapsulate launching the target application -+# Strips options in the --lt-* namespace from \$@ and -+# launches target application with the remaining arguments. -+func_exec_program () -+{ -+ for lt_wr_arg -+ do -+ case \$lt_wr_arg in -+ --lt-*) ;; -+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; -+ esac -+ shift -+ done -+ func_exec_program_core \${1+\"\$@\"} -+} -+ -+ # Parse options -+ func_parse_lt_options \"\$0\" \${1+\"\$@\"} - - # Find the directory that this script lives in. -- thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` -+ thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` - test \"x\$thisdir\" = \"x\$file\" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. -- file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` -+ file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` - while test -n \"\$file\"; do -- destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` -+ destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` - - # If there was a directory component, then change thisdir. - if test \"x\$destdir\" != \"x\$file\"; then -@@ -2783,30 +3446,13 @@ - esac - fi - -- file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` -- file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` -+ file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` -+ file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` - done --" --} --# end: func_emit_wrapper_part1 -- --# func_emit_wrapper_part2 [arg=no] --# --# Emit the second part of a libtool wrapper script on stdout. --# For more information, see the description associated with --# func_emit_wrapper(), below. --func_emit_wrapper_part2 () --{ -- func_emit_wrapper_part2_arg1=no -- if test -n "$1" ; then -- func_emit_wrapper_part2_arg1=$1 -- fi -- -- $ECHO "\ - - # Usually 'no', except on cygwin/mingw when embedded into - # the cwrapper. -- WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1 -+ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 - if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then - # special case for '.' - if test \"\$thisdir\" = \".\"; then -@@ -2814,7 +3460,7 @@ - fi - # remove .libs from thisdir - case \"\$thisdir\" in -- *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;; -+ *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; - $objdir ) thisdir=. ;; - esac - fi -@@ -2877,7 +3523,7 @@ - - # Some systems cannot cope with colon-terminated $shlibpath_var - # The second colon is a workaround for a bug in BeOS R4 sed -- $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` -+ $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` - - export $shlibpath_var - " -@@ -2894,63 +3540,17 @@ - $ECHO "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. --" -- case $host in -- # Backslashes separate directories on plain windows -- *-*-mingw | *-*-os2* | *-cegcc*) -- $ECHO "\ -- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} --" -- ;; -- -- *) -- $ECHO "\ -- exec \"\$progdir/\$program\" \${1+\"\$@\"} --" -- ;; -- esac -- $ECHO "\ -- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 -- exit 1 -+ func_exec_program \${1+\"\$@\"} - fi - else - # The program doesn't exist. -- \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 -- \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 -- $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 -- exit 1 -- fi --fi\ --" --} --# end: func_emit_wrapper_part2 -- -- --# func_emit_wrapper [arg=no] --# --# Emit a libtool wrapper script on stdout. --# Don't directly open a file because we may want to --# incorporate the script contents within a cygwin/mingw --# wrapper executable. Must ONLY be called from within --# func_mode_link because it depends on a number of variables --# set therein. --# --# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR --# variable will take. If 'yes', then the emitted script --# will assume that the directory in which it is stored is --# the $objdir directory. This is a cygwin/mingw-specific --# behavior. --func_emit_wrapper () --{ -- func_emit_wrapper_arg1=no -- if test -n "$1" ; then -- func_emit_wrapper_arg1=$1 -- fi -- -- # split this up so that func_emit_cwrapperexe_src -- # can call each part independently. -- func_emit_wrapper_part1 "${func_emit_wrapper_arg1}" -- func_emit_wrapper_part2 "${func_emit_wrapper_arg1}" -+ \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 -+ \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 -+ \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 -+ exit 1 -+ fi -+fi\ -+" - } - - -@@ -2978,23 +3578,19 @@ - func_to_host_path () - { - func_to_host_path_result="$1" -- if test -n "$1" ; then -+ if test -n "$1"; then - case $host in - *mingw* ) - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - case $build in - *mingw* ) # actually, msys - # awkward: cmd appends spaces to result -- lt_sed_strip_trailing_spaces="s/[ ]*\$//" -- func_to_host_path_tmp1=`( cmd //c echo "$1" |\ -- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` -- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ -- $SED -e "$lt_sed_naive_backslashify"` -+ func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null | -+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` - ;; - *cygwin* ) -- func_to_host_path_tmp1=`cygpath -w "$1"` -- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ -- $SED -e "$lt_sed_naive_backslashify"` -+ func_to_host_path_result=`cygpath -w "$1" | -+ $SED -e "$lt_sed_naive_backslashify"` - ;; - * ) - # Unfortunately, winepath does not exit with a non-zero -@@ -3006,17 +3602,17 @@ - # the odd construction: - func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` - if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then -- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ -+ func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" | - $SED -e "$lt_sed_naive_backslashify"` - else - # Allow warning below. -- func_to_host_path_result="" -+ func_to_host_path_result= - fi - ;; - esac - if test -z "$func_to_host_path_result" ; then - func_error "Could not determine host path corresponding to" -- func_error " '$1'" -+ func_error " \`$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback: - func_to_host_path_result="$1" -@@ -3049,30 +3645,24 @@ - func_to_host_pathlist () - { - func_to_host_pathlist_result="$1" -- if test -n "$1" ; then -+ if test -n "$1"; then - case $host in - *mingw* ) - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - # Remove leading and trailing path separator characters from - # ARG. msys behavior is inconsistent here, cygpath turns them - # into '.;' and ';.', and winepath ignores them completely. -- func_to_host_pathlist_tmp2="$1" -- # Once set for this call, this variable should not be -- # reassigned. It is used in tha fallback case. -- func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\ -- $SED -e 's|^:*||' -e 's|:*$||'` -+ func_stripname : : "$1" -+ func_to_host_pathlist_tmp1=$func_stripname_result - case $build in - *mingw* ) # Actually, msys. - # Awkward: cmd appends spaces to result. -- lt_sed_strip_trailing_spaces="s/[ ]*\$//" -- func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\ -- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` -- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ -- $SED -e "$lt_sed_naive_backslashify"` -+ func_to_host_pathlist_result=` -+ ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null | -+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` - ;; - *cygwin* ) -- func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"` -- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ -+ func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" | - $SED -e "$lt_sed_naive_backslashify"` - ;; - * ) -@@ -3088,18 +3678,17 @@ - if test -z "$func_to_host_pathlist_result" ; then - func_to_host_pathlist_result="$func_to_host_path_result" - else -- func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result" -+ func_append func_to_host_pathlist_result ";$func_to_host_path_result" - fi - fi - fi -- IFS=: - done - IFS=$func_to_host_pathlist_oldIFS - ;; - esac -- if test -z "$func_to_host_pathlist_result" ; then -+ if test -z "$func_to_host_pathlist_result"; then - func_error "Could not determine the host path(s) corresponding to" -- func_error " '$1'" -+ func_error " \`$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback. This may break if $1 contains DOS-style drive - # specifications. The fix is not to complicate the expression -@@ -3116,7 +3705,7 @@ - ;; - esac - case "$1" in -- *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;" -+ *: ) func_append func_to_host_pathlist_result ";" - ;; - esac - ;; -@@ -3141,31 +3730,23 @@ - - This wrapper executable should never be moved out of the build directory. - If it is, it will not operate correctly. -- -- Currently, it simply execs the wrapper *script* "$SHELL $output", -- but could eventually absorb all of the scripts functionality and -- exec $objdir/$outputname directly. - */ - EOF - cat <<"EOF" -+#ifdef _MSC_VER -+# define _CRT_SECURE_NO_DEPRECATE 1 -+#endif - #include <stdio.h> - #include <stdlib.h> - #ifdef _MSC_VER - # include <direct.h> - # include <process.h> - # include <io.h> --# define setmode _setmode - #else - # include <unistd.h> - # include <stdint.h> - # ifdef __CYGWIN__ - # include <io.h> --# define HAVE_SETENV --# ifdef __STRICT_ANSI__ --char *realpath (const char *, char *); --int putenv (char *); --int setenv (const char *, const char *, int); --# endif - # endif - #endif - #include <malloc.h> -@@ -3177,6 +3758,44 @@ - #include <fcntl.h> - #include <sys/stat.h> - -+/* declarations of non-ANSI functions */ -+#if defined(__MINGW32__) -+# ifdef __STRICT_ANSI__ -+int _putenv (const char *); -+# endif -+#elif defined(__CYGWIN__) -+# ifdef __STRICT_ANSI__ -+char *realpath (const char *, char *); -+int putenv (char *); -+int setenv (const char *, const char *, int); -+# endif -+/* #elif defined (other platforms) ... */ -+#endif -+ -+/* portability defines, excluding path handling macros */ -+#if defined(_MSC_VER) -+# define setmode _setmode -+# define stat _stat -+# define chmod _chmod -+# define getcwd _getcwd -+# define putenv _putenv -+# define S_IXUSR _S_IEXEC -+# ifndef _INTPTR_T_DEFINED -+# define _INTPTR_T_DEFINED -+# define intptr_t int -+# endif -+#elif defined(__MINGW32__) -+# define setmode _setmode -+# define stat _stat -+# define chmod _chmod -+# define getcwd _getcwd -+# define putenv _putenv -+#elif defined(__CYGWIN__) -+# define HAVE_SETENV -+# define FOPEN_WB "wb" -+/* #elif defined (other platforms) ... */ -+#endif -+ - #if defined(PATH_MAX) - # define LT_PATHMAX PATH_MAX - #elif defined(MAXPATHLEN) -@@ -3192,14 +3811,7 @@ - # define S_IXGRP 0 - #endif - --#ifdef _MSC_VER --# define S_IXUSR _S_IEXEC --# define stat _stat --# ifndef _INTPTR_T_DEFINED --# define intptr_t int --# endif --#endif -- -+/* path handling portability macros */ - #ifndef DIR_SEPARATOR - # define DIR_SEPARATOR '/' - # define PATH_SEPARATOR ':' -@@ -3230,10 +3842,6 @@ - # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) - #endif /* PATH_SEPARATOR_2 */ - --#ifdef __CYGWIN__ --# define FOPEN_WB "wb" --#endif -- - #ifndef FOPEN_WB - # define FOPEN_WB "w" - #endif -@@ -3246,22 +3854,13 @@ - if (stale) { free ((void *) stale); stale = 0; } \ - } while (0) - --#undef LTWRAPPER_DEBUGPRINTF --#if defined DEBUGWRAPPER --# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args --static void --ltwrapper_debugprintf (const char *fmt, ...) --{ -- va_list args; -- va_start (args, fmt); -- (void) vfprintf (stderr, fmt, args); -- va_end (args); --} -+#if defined(LT_DEBUGWRAPPER) -+static int lt_debug = 1; - #else --# define LTWRAPPER_DEBUGPRINTF(args) -+static int lt_debug = 0; - #endif - --const char *program_name = NULL; -+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ - - void *xmalloc (size_t num); - char *xstrdup (const char *string); -@@ -3271,31 +3870,17 @@ - int make_executable (const char *path); - int check_executable (const char *path); - char *strendzap (char *str, const char *pat); --void lt_fatal (const char *message, ...); -+void lt_debugprintf (const char *file, int line, const char *fmt, ...); -+void lt_fatal (const char *file, int line, const char *message, ...); -+static const char *nonnull (const char *s); -+static const char *nonempty (const char *s); - void lt_setenv (const char *name, const char *value); - char *lt_extend_str (const char *orig_value, const char *add, int to_end); --void lt_opt_process_env_set (const char *arg); --void lt_opt_process_env_prepend (const char *arg); --void lt_opt_process_env_append (const char *arg); --int lt_split_name_value (const char *arg, char** name, char** value); - void lt_update_exe_path (const char *name, const char *value); - void lt_update_lib_path (const char *name, const char *value); -- --static const char *script_text_part1 = --EOF -- -- func_emit_wrapper_part1 yes | -- $SED -e 's/\([\\"]\)/\\\1/g' \ -- -e 's/^/ "/' -e 's/$/\\n"/' -- echo ";" -- cat <<EOF -- --static const char *script_text_part2 = -+char **prepare_spawn (char **argv); -+void lt_dump_script (FILE *f); - EOF -- func_emit_wrapper_part2 yes | -- $SED -e 's/\([\\"]\)/\\\1/g' \ -- -e 's/^/ "/' -e 's/$/\\n"/' -- echo ";" - - cat <<EOF - const char * MAGIC_EXE = "$magic_exe"; -@@ -3340,24 +3925,10 @@ - cat <<"EOF" - - #define LTWRAPPER_OPTION_PREFIX "--lt-" --#define LTWRAPPER_OPTION_PREFIX_LENGTH 5 - --static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH; - static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX; -- - static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script"; -- --static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7; --static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set"; -- /* argument is putenv-style "foo=bar", value of foo is set to bar */ -- --static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11; --static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend"; -- /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */ -- --static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10; --static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append"; -- /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */ -+static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug"; - - int - main (int argc, char *argv[]) -@@ -3374,10 +3945,13 @@ - int i; - - program_name = (char *) xstrdup (base_name (argv[0])); -- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0])); -- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name)); -+ newargz = XMALLOC (char *, argc + 1); - -- /* very simple arg parsing; don't want to rely on getopt */ -+ /* very simple arg parsing; don't want to rely on getopt -+ * also, copy all non cwrapper options to newargz, except -+ * argz[0], which is handled differently -+ */ -+ newargc=0; - for (i = 1; i < argc; i++) - { - if (strcmp (argv[i], dumpscript_opt) == 0) -@@ -3391,25 +3965,57 @@ - esac - - cat <<"EOF" -- printf ("%s", script_text_part1); -- printf ("%s", script_text_part2); -+ lt_dump_script (stdout); - return 0; - } -+ if (strcmp (argv[i], debug_opt) == 0) -+ { -+ lt_debug = 1; -+ continue; -+ } -+ if (strcmp (argv[i], ltwrapper_option_prefix) == 0) -+ { -+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX -+ namespace, but it is not one of the ones we know about and -+ have already dealt with, above (inluding dump-script), then -+ report an error. Otherwise, targets might begin to believe -+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX -+ namespace. The first time any user complains about this, we'll -+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option -+ or a configure.ac-settable value. -+ */ -+ lt_fatal (__FILE__, __LINE__, -+ "unrecognized %s option: '%s'", -+ ltwrapper_option_prefix, argv[i]); -+ } -+ /* otherwise ... */ -+ newargz[++newargc] = xstrdup (argv[i]); - } -+ newargz[++newargc] = NULL; -+ -+EOF -+ cat <<EOF -+ /* The GNU banner must be the first non-error debug message */ -+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n"); -+EOF -+ cat <<"EOF" -+ lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]); -+ lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name); - -- newargz = XMALLOC (char *, argc + 1); - tmp_pathspec = find_executable (argv[0]); - if (tmp_pathspec == NULL) -- lt_fatal ("Couldn't find %s", argv[0]); -- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n", -- tmp_pathspec)); -+ lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(main) found exe (before symlink chase) at: %s\n", -+ tmp_pathspec); - - actual_cwrapper_path = chase_symlinks (tmp_pathspec); -- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n", -- actual_cwrapper_path)); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(main) found exe (after symlink chase) at: %s\n", -+ actual_cwrapper_path); - XFREE (tmp_pathspec); - -- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path)); -+ actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path)); - strendzap (actual_cwrapper_path, actual_cwrapper_name); - - /* wrapper name transforms */ -@@ -3427,8 +4033,9 @@ - target_name = tmp_pathspec; - tmp_pathspec = 0; - -- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n", -- target_name)); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(main) libtool target name: %s\n", -+ target_name); - EOF - - cat <<EOF -@@ -3481,77 +4088,12 @@ - lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE); - lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE); - -- newargc=0; -- for (i = 1; i < argc; i++) -- { -- if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0) -- { -- if (argv[i][env_set_opt_len] == '=') -- { -- const char *p = argv[i] + env_set_opt_len + 1; -- lt_opt_process_env_set (p); -- } -- else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc) -- { -- lt_opt_process_env_set (argv[++i]); /* don't copy */ -- } -- else -- lt_fatal ("%s missing required argument", env_set_opt); -- continue; -- } -- if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0) -- { -- if (argv[i][env_prepend_opt_len] == '=') -- { -- const char *p = argv[i] + env_prepend_opt_len + 1; -- lt_opt_process_env_prepend (p); -- } -- else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc) -- { -- lt_opt_process_env_prepend (argv[++i]); /* don't copy */ -- } -- else -- lt_fatal ("%s missing required argument", env_prepend_opt); -- continue; -- } -- if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0) -- { -- if (argv[i][env_append_opt_len] == '=') -- { -- const char *p = argv[i] + env_append_opt_len + 1; -- lt_opt_process_env_append (p); -- } -- else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc) -- { -- lt_opt_process_env_append (argv[++i]); /* don't copy */ -- } -- else -- lt_fatal ("%s missing required argument", env_append_opt); -- continue; -- } -- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0) -- { -- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX -- namespace, but it is not one of the ones we know about and -- have already dealt with, above (inluding dump-script), then -- report an error. Otherwise, targets might begin to believe -- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX -- namespace. The first time any user complains about this, we'll -- need to make LTWRAPPER_OPTION_PREFIX a configure-time option -- or a configure.ac-settable value. -- */ -- lt_fatal ("Unrecognized option in %s namespace: '%s'", -- ltwrapper_option_prefix, argv[i]); -- } -- /* otherwise ... */ -- newargz[++newargc] = xstrdup (argv[i]); -- } -- newargz[++newargc] = NULL; -- -- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>"))); -+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", -+ nonnull (lt_argv_zero)); - for (i = 0; i < newargc; i++) - { -- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>"))); -+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", -+ i, nonnull (newargz[i])); - } - - EOF -@@ -3560,11 +4102,14 @@ - mingw*) - cat <<"EOF" - /* execv doesn't actually work on mingw as expected on unix */ -+ newargz = prepare_spawn (newargz); - rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz); - if (rval == -1) - { - /* failed to start process */ -- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(main) failed to launch target \"%s\": %s\n", -+ lt_argv_zero, nonnull (strerror (errno))); - return 127; - } - return rval; -@@ -3586,7 +4131,7 @@ - { - void *p = (void *) malloc (num); - if (!p) -- lt_fatal ("Memory exhausted"); -+ lt_fatal (__FILE__, __LINE__, "memory exhausted"); - - return p; - } -@@ -3620,8 +4165,8 @@ - { - struct stat st; - -- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", -- path ? (*path ? path : "EMPTY!") : "NULL!")); -+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", -+ nonempty (path)); - if ((!path) || (!*path)) - return 0; - -@@ -3638,8 +4183,8 @@ - int rval = 0; - struct stat st; - -- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", -- path ? (*path ? path : "EMPTY!") : "NULL!")); -+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", -+ nonempty (path)); - if ((!path) || (!*path)) - return 0; - -@@ -3665,8 +4210,8 @@ - int tmp_len; - char *concat_name; - -- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", -- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); -+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", -+ nonempty (wrapper)); - - if ((wrapper == NULL) || (*wrapper == '\0')) - return NULL; -@@ -3719,7 +4264,8 @@ - { - /* empty path: current directory */ - if (getcwd (tmp, LT_PATHMAX) == NULL) -- lt_fatal ("getcwd failed"); -+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", -+ nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = - XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); -@@ -3744,7 +4290,8 @@ - } - /* Relative path | not found in path: prepend cwd */ - if (getcwd (tmp, LT_PATHMAX) == NULL) -- lt_fatal ("getcwd failed"); -+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", -+ nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); -@@ -3770,8 +4317,9 @@ - int has_symlinks = 0; - while (strlen (tmp_pathspec) && !has_symlinks) - { -- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", -- tmp_pathspec)); -+ lt_debugprintf (__FILE__, __LINE__, -+ "checking path component for symlinks: %s\n", -+ tmp_pathspec); - if (lstat (tmp_pathspec, &s) == 0) - { - if (S_ISLNK (s.st_mode) != 0) -@@ -3793,8 +4341,9 @@ - } - else - { -- char *errstr = strerror (errno); -- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); -+ lt_fatal (__FILE__, __LINE__, -+ "error accessing file \"%s\": %s", -+ tmp_pathspec, nonnull (strerror (errno))); - } - } - XFREE (tmp_pathspec); -@@ -3807,7 +4356,8 @@ - tmp_pathspec = realpath (pathspec, buf); - if (tmp_pathspec == 0) - { -- lt_fatal ("Could not follow symlinks for %s", pathspec); -+ lt_fatal (__FILE__, __LINE__, -+ "could not follow symlinks for %s", pathspec); - } - return xstrdup (tmp_pathspec); - #endif -@@ -3833,11 +4383,25 @@ - return str; - } - -+void -+lt_debugprintf (const char *file, int line, const char *fmt, ...) -+{ -+ va_list args; -+ if (lt_debug) -+ { -+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); -+ va_start (args, fmt); -+ (void) vfprintf (stderr, fmt, args); -+ va_end (args); -+ } -+} -+ - static void --lt_error_core (int exit_status, const char *mode, -+lt_error_core (int exit_status, const char *file, -+ int line, const char *mode, - const char *message, va_list ap) - { -- fprintf (stderr, "%s: %s: ", program_name, mode); -+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); - vfprintf (stderr, message, ap); - fprintf (stderr, ".\n"); - -@@ -3846,20 +4410,32 @@ - } - - void --lt_fatal (const char *message, ...) -+lt_fatal (const char *file, int line, const char *message, ...) - { - va_list ap; - va_start (ap, message); -- lt_error_core (EXIT_FAILURE, "FATAL", message, ap); -+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); - va_end (ap); - } - -+static const char * -+nonnull (const char *s) -+{ -+ return s ? s : "(null)"; -+} -+ -+static const char * -+nonempty (const char *s) -+{ -+ return (s && !*s) ? "(empty)" : nonnull (s); -+} -+ - void - lt_setenv (const char *name, const char *value) - { -- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", -- (name ? name : "<NULL>"), -- (value ? value : "<NULL>"))); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_setenv) setting '%s' to '%s'\n", -+ nonnull (name), nonnull (value)); - { - #ifdef HAVE_SETENV - /* always make a copy, for consistency with !HAVE_SETENV */ -@@ -3904,95 +4480,12 @@ - return new_value; - } - --int --lt_split_name_value (const char *arg, char** name, char** value) --{ -- const char *p; -- int len; -- if (!arg || !*arg) -- return 1; -- -- p = strchr (arg, (int)'='); -- -- if (!p) -- return 1; -- -- *value = xstrdup (++p); -- -- len = strlen (arg) - strlen (*value); -- *name = XMALLOC (char, len); -- strncpy (*name, arg, len-1); -- (*name)[len - 1] = '\0'; -- -- return 0; --} -- --void --lt_opt_process_env_set (const char *arg) --{ -- char *name = NULL; -- char *value = NULL; -- -- if (lt_split_name_value (arg, &name, &value) != 0) -- { -- XFREE (name); -- XFREE (value); -- lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg); -- } -- -- lt_setenv (name, value); -- XFREE (name); -- XFREE (value); --} -- --void --lt_opt_process_env_prepend (const char *arg) --{ -- char *name = NULL; -- char *value = NULL; -- char *new_value = NULL; -- -- if (lt_split_name_value (arg, &name, &value) != 0) -- { -- XFREE (name); -- XFREE (value); -- lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg); -- } -- -- new_value = lt_extend_str (getenv (name), value, 0); -- lt_setenv (name, new_value); -- XFREE (new_value); -- XFREE (name); -- XFREE (value); --} -- --void --lt_opt_process_env_append (const char *arg) --{ -- char *name = NULL; -- char *value = NULL; -- char *new_value = NULL; -- -- if (lt_split_name_value (arg, &name, &value) != 0) -- { -- XFREE (name); -- XFREE (value); -- lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg); -- } -- -- new_value = lt_extend_str (getenv (name), value, 1); -- lt_setenv (name, new_value); -- XFREE (new_value); -- XFREE (name); -- XFREE (value); --} -- - void - lt_update_exe_path (const char *name, const char *value) - { -- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", -- (name ? name : "<NULL>"), -- (value ? value : "<NULL>"))); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", -+ nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { -@@ -4011,9 +4504,9 @@ - void - lt_update_lib_path (const char *name, const char *value) - { -- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", -- (name ? name : "<NULL>"), -- (value ? value : "<NULL>"))); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", -+ nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { -@@ -4023,11 +4516,152 @@ - } - } - -+EOF -+ case $host_os in -+ mingw*) -+ cat <<"EOF" -+ -+/* Prepares an argument vector before calling spawn(). -+ Note that spawn() does not by itself call the command interpreter -+ (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : -+ ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); -+ GetVersionEx(&v); -+ v.dwPlatformId == VER_PLATFORM_WIN32_NT; -+ }) ? "cmd.exe" : "command.com"). -+ Instead it simply concatenates the arguments, separated by ' ', and calls -+ CreateProcess(). We must quote the arguments since Win32 CreateProcess() -+ interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a -+ special way: -+ - Space and tab are interpreted as delimiters. They are not treated as -+ delimiters if they are surrounded by double quotes: "...". -+ - Unescaped double quotes are removed from the input. Their only effect is -+ that within double quotes, space and tab are treated like normal -+ characters. -+ - Backslashes not followed by double quotes are not special. -+ - But 2*n+1 backslashes followed by a double quote become -+ n backslashes followed by a double quote (n >= 0): -+ \" -> " -+ \\\" -> \" -+ \\\\\" -> \\" -+ */ -+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -+char ** -+prepare_spawn (char **argv) -+{ -+ size_t argc; -+ char **new_argv; -+ size_t i; -+ -+ /* Count number of arguments. */ -+ for (argc = 0; argv[argc] != NULL; argc++) -+ ; -+ -+ /* Allocate new argument vector. */ -+ new_argv = XMALLOC (char *, argc + 1); -+ -+ /* Put quoted arguments into the new argument vector. */ -+ for (i = 0; i < argc; i++) -+ { -+ const char *string = argv[i]; -+ -+ if (string[0] == '\0') -+ new_argv[i] = xstrdup ("\"\""); -+ else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) -+ { -+ int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); -+ size_t length; -+ unsigned int backslashes; -+ const char *s; -+ char *quoted_string; -+ char *p; -+ -+ length = 0; -+ backslashes = 0; -+ if (quote_around) -+ length++; -+ for (s = string; *s != '\0'; s++) -+ { -+ char c = *s; -+ if (c == '"') -+ length += backslashes + 1; -+ length++; -+ if (c == '\\') -+ backslashes++; -+ else -+ backslashes = 0; -+ } -+ if (quote_around) -+ length += backslashes + 1; -+ -+ quoted_string = XMALLOC (char, length + 1); -+ -+ p = quoted_string; -+ backslashes = 0; -+ if (quote_around) -+ *p++ = '"'; -+ for (s = string; *s != '\0'; s++) -+ { -+ char c = *s; -+ if (c == '"') -+ { -+ unsigned int j; -+ for (j = backslashes + 1; j > 0; j--) -+ *p++ = '\\'; -+ } -+ *p++ = c; -+ if (c == '\\') -+ backslashes++; -+ else -+ backslashes = 0; -+ } -+ if (quote_around) -+ { -+ unsigned int j; -+ for (j = backslashes; j > 0; j--) -+ *p++ = '\\'; -+ *p++ = '"'; -+ } -+ *p = '\0'; -+ -+ new_argv[i] = quoted_string; -+ } -+ else -+ new_argv[i] = (char *) string; -+ } -+ new_argv[argc] = NULL; -+ -+ return new_argv; -+} -+EOF -+ ;; -+ esac -+ -+ cat <<"EOF" -+void lt_dump_script (FILE* f) -+{ -+EOF -+ func_emit_wrapper yes | -+ $SED -e 's/\([\\"]\)/\\\1/g' \ -+ -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' - -+ cat <<"EOF" -+} - EOF - } - # end: func_emit_cwrapperexe_src - -+# func_win32_import_lib_p ARG -+# True if ARG is an import lib, as indicated by $file_magic_cmd -+func_win32_import_lib_p () -+{ -+ $opt_debug -+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in -+ *import*) : ;; -+ *) false ;; -+ esac -+} -+ - # func_mode_link arg... - func_mode_link () - { -@@ -4072,6 +4706,7 @@ - new_inherited_linker_flags= - - avoid_version=no -+ bindir= - dlfiles= - dlprefiles= - dlself=no -@@ -4164,6 +4799,11 @@ - esac - - case $prev in -+ bindir) -+ bindir="$arg" -+ prev= -+ continue -+ ;; - dlfiles|dlprefiles) - if test "$preload" = no; then - # Add the symbol object into the linking commands. -@@ -4195,9 +4835,9 @@ - ;; - *) - if test "$prev" = dlfiles; then -- dlfiles="$dlfiles $arg" -+ func_append dlfiles " $arg" - else -- dlprefiles="$dlprefiles $arg" -+ func_append dlprefiles " $arg" - fi - prev= - continue -@@ -4221,7 +4861,7 @@ - *-*-darwin*) - case "$deplibs " in - *" $qarg.ltframework "*) ;; -- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later -+ *) func_append deplibs " $qarg.ltframework" # this is fixed later - ;; - esac - ;; -@@ -4240,7 +4880,7 @@ - moreargs= - for fil in `cat "$save_arg"` - do --# moreargs="$moreargs $fil" -+# func_append moreargs " $fil" - arg=$fil - # A libtool-controlled object. - -@@ -4269,7 +4909,7 @@ - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -- dlfiles="$dlfiles $pic_object" -+ func_append dlfiles " $pic_object" - prev= - continue - else -@@ -4281,7 +4921,7 @@ - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. -- dlprefiles="$dlprefiles $pic_object" -+ func_append dlprefiles " $pic_object" - prev= - fi - -@@ -4351,12 +4991,12 @@ - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; -- *) rpath="$rpath $arg" ;; -+ *) func_append rpath " $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; -- *) xrpath="$xrpath $arg" ;; -+ *) func_append xrpath " $arg" ;; - esac - fi - prev= -@@ -4368,28 +5008,28 @@ - continue - ;; - weak) -- weak_libs="$weak_libs $arg" -+ func_append weak_libs " $arg" - prev= - continue - ;; - xcclinker) -- linker_flags="$linker_flags $qarg" -- compiler_flags="$compiler_flags $qarg" -+ func_append linker_flags " $qarg" -+ func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xcompiler) -- compiler_flags="$compiler_flags $qarg" -+ func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xlinker) -- linker_flags="$linker_flags $qarg" -- compiler_flags="$compiler_flags $wl$qarg" -+ func_append linker_flags " $qarg" -+ func_append compiler_flags " $wl$qarg" - prev= - func_append compile_command " $wl$qarg" - func_append finalize_command " $wl$qarg" -@@ -4425,6 +5065,11 @@ - continue - ;; - -+ -bindir) -+ prev=bindir -+ continue -+ ;; -+ - -dlopen) - prev=dlfiles - continue -@@ -4497,22 +5142,22 @@ - case "$deplibs " in - *" -L$dir "*) ;; - *) -- deplibs="$deplibs -L$dir" -- lib_search_path="$lib_search_path $dir" -+ func_append deplibs " -L$dir" -+ func_append lib_search_path " $dir" - ;; - esac - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) -- testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` -+ testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$dir:"*) ;; - ::) dllsearchpath=$dir;; -- *) dllsearchpath="$dllsearchpath:$dir";; -+ *) func_append dllsearchpath ":$dir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; -- *) dllsearchpath="$dllsearchpath:$testbindir";; -+ *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac -@@ -4522,7 +5167,7 @@ - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*) -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) - # These systems don't actually have a C or math library (as such) - continue - ;; -@@ -4536,7 +5181,7 @@ - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C and math libraries are in the System framework -- deplibs="$deplibs System.ltframework" -+ func_append deplibs " System.ltframework" - continue - ;; - *-*-sco3.2v5* | *-*-sco5v6*) -@@ -4556,7 +5201,7 @@ - ;; - esac - fi -- deplibs="$deplibs $arg" -+ func_append deplibs " $arg" - continue - ;; - -@@ -4569,7 +5214,7 @@ - # classes, name mangling, and exception handling. - # Darwin uses the -arch flag to determine output architecture. - -model|-arch|-isysroot) -- compiler_flags="$compiler_flags $arg" -+ func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - prev=xcompiler -@@ -4577,12 +5222,12 @@ - ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) -- compiler_flags="$compiler_flags $arg" -+ func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - case "$new_inherited_linker_flags " in - *" $arg "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; -+ * ) func_append new_inherited_linker_flags " $arg" ;; - esac - continue - ;; -@@ -4655,7 +5300,7 @@ - esac - case "$xrpath " in - *" $dir "*) ;; -- *) xrpath="$xrpath $dir" ;; -+ *) func_append xrpath " $dir" ;; - esac - continue - ;; -@@ -4708,8 +5353,8 @@ - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" -- arg="$arg $wl$func_quote_for_eval_result" -- compiler_flags="$compiler_flags $func_quote_for_eval_result" -+ func_append arg " $func_quote_for_eval_result" -+ func_append compiler_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" -@@ -4724,9 +5369,9 @@ - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" -- arg="$arg $wl$func_quote_for_eval_result" -- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" -- linker_flags="$linker_flags $func_quote_for_eval_result" -+ func_append arg " $wl$func_quote_for_eval_result" -+ func_append compiler_flags " $wl$func_quote_for_eval_result" -+ func_append linker_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" -@@ -4754,23 +5399,24 @@ - arg="$func_quote_for_eval_result" - ;; - -- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler -- # -r[0-9][0-9]* specifies the processor on the SGI compiler -- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler -- # +DA*, +DD* enable 64-bit mode on the HP compiler -- # -q* pass through compiler args for the IBM compiler -- # -m*, -t[45]*, -txscale* pass through architecture-specific -- # compiler args for GCC -- # -F/path gives path to uninstalled frameworks, gcc on darwin -- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC -- # @file GCC response files -+ # Flags to be passed through unchanged, with rationale: -+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler -+ # -r[0-9][0-9]* specify processor for the SGI compiler -+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler -+ # +DA*, +DD* enable 64-bit mode for the HP compiler -+ # -q* compiler args for the IBM compiler -+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC -+ # -F/path path to uninstalled frameworks, gcc on darwin -+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC -+ # @file GCC response files -+ # -tp=* Portland pgcc target processor selection - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" - func_append finalize_command " $arg" -- compiler_flags="$compiler_flags $arg" -+ func_append compiler_flags " $arg" - continue - ;; - -@@ -4782,7 +5428,7 @@ - - *.$objext) - # A standard object. -- objs="$objs $arg" -+ func_append objs " $arg" - ;; - - *.lo) -@@ -4813,7 +5459,7 @@ - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -- dlfiles="$dlfiles $pic_object" -+ func_append dlfiles " $pic_object" - prev= - continue - else -@@ -4825,7 +5471,7 @@ - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. -- dlprefiles="$dlprefiles $pic_object" -+ func_append dlprefiles " $pic_object" - prev= - fi - -@@ -4870,8 +5516,8 @@ - - *.$libext) - # An archive. -- deplibs="$deplibs $arg" -- old_deplibs="$old_deplibs $arg" -+ func_append deplibs " $arg" -+ func_append old_deplibs " $arg" - continue - ;; - -@@ -4880,14 +5526,14 @@ - - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. -- dlfiles="$dlfiles $arg" -+ func_append dlfiles " $arg" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. -- dlprefiles="$dlprefiles $arg" -+ func_append dlprefiles " $arg" - prev= - else -- deplibs="$deplibs $arg" -+ func_append deplibs " $arg" - fi - continue - ;; -@@ -4925,7 +5571,7 @@ - - if test -n "$shlibpath_var"; then - # get the directories listed in $shlibpath_var -- eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` -+ eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` - else - shlib_search_path= - fi -@@ -4954,12 +5600,12 @@ - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) - for deplib in $deplibs; do -- if $opt_duplicate_deps ; then -+ if $opt_preserve_dup_deps ; then - case "$libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi -- libs="$libs $deplib" -+ func_append libs " $deplib" - done - - if test "$linkmode" = lib; then -@@ -4972,9 +5618,9 @@ - if $opt_duplicate_compiler_generated_deps; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in -- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; -+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; - esac -- pre_post_deps="$pre_post_deps $pre_post_dep" -+ func_append pre_post_deps " $pre_post_dep" - done - fi - pre_post_deps= -@@ -5033,10 +5679,7 @@ - case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; -- link) -- libs="$deplibs %DEPLIBS%" -- test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" -- ;; -+ link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; - esac - fi - if test "$linkmode,$pass" = "lib,dlpreopen"; then -@@ -5051,10 +5694,11 @@ - # Collect preopened libtool deplibs, except any this library - # has declared as weak libs - for deplib in $dependency_libs; do -- deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"` -+ func_basename "$deplib" -+ deplib_base=$func_basename_result - case " $weak_libs " in - *" $deplib_base "*) ;; -- *) deplibs="$deplibs $deplib" ;; -+ *) func_append deplibs " $deplib" ;; - esac - done - done -@@ -5075,11 +5719,11 @@ - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else -- compiler_flags="$compiler_flags $deplib" -+ func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; -+ * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi -@@ -5164,7 +5808,7 @@ - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; -+ * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi -@@ -5177,7 +5821,7 @@ - test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" -+ func_append newlib_search_path " $func_stripname_result" - ;; - prog) - if test "$pass" = conv; then -@@ -5191,7 +5835,7 @@ - finalize_deplibs="$deplib $finalize_deplibs" - fi - func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" -+ func_append newlib_search_path " $func_stripname_result" - ;; - *) - func_warning "\`-L' is ignored for archives/objects" -@@ -5206,7 +5850,7 @@ - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; -- *) xrpath="$xrpath $dir" ;; -+ *) func_append xrpath " $dir" ;; - esac - fi - deplibs="$deplib $deplibs" -@@ -5230,7 +5874,7 @@ - match_pattern*) - set dummy $deplibs_check_method; shift - match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` -- if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \ -+ if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes - fi -@@ -5240,15 +5884,15 @@ - ;; - esac - if test "$valid_a_lib" != yes; then -- $ECHO -+ echo - $ECHO "*** Warning: Trying to link with static lib archive $deplib." -- $ECHO "*** I have the capability to make that library automatically link in when" -- $ECHO "*** you link to this library. But I can only do this if you have a" -- $ECHO "*** shared version of the library, which you do not appear to have" -- $ECHO "*** because the file extensions .$libext of this argument makes me believe" -- $ECHO "*** that it is just a static archive that I should not use here." -+ echo "*** I have the capability to make that library automatically link in when" -+ echo "*** you link to this library. But I can only do this if you have a" -+ echo "*** shared version of the library, which you do not appear to have" -+ echo "*** because the file extensions .$libext of this argument makes me believe" -+ echo "*** that it is just a static archive that I should not use here." - else -- $ECHO -+ echo - $ECHO "*** Warning: Linking the shared library $output against the" - $ECHO "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" -@@ -5275,11 +5919,11 @@ - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. -- newdlprefiles="$newdlprefiles $deplib" -+ func_append newdlprefiles " $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else -- newdlfiles="$newdlfiles $deplib" -+ func_append newdlfiles " $deplib" - fi - fi - continue -@@ -5321,20 +5965,20 @@ - - # Convert "-framework foo" to "foo.ltframework" - if test -n "$inherited_linker_flags"; then -- tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'` -+ tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` - for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do - case " $new_inherited_linker_flags " in - *" $tmp_inherited_linker_flag "*) ;; -- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; -+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; - esac - done - fi -- dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -+ dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then -- test -n "$dlopen" && dlfiles="$dlfiles $dlopen" -- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" -+ test -n "$dlopen" && func_append dlfiles " $dlopen" -+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" - fi - - if test "$pass" = conv; then -@@ -5345,21 +5989,21 @@ - func_fatal_error "cannot find name of link library for \`$lib'" - fi - # It is a libtool convenience library, so add in its objects. -- convenience="$convenience $ladir/$objdir/$old_library" -- old_convenience="$old_convenience $ladir/$objdir/$old_library" -- tmp_libs= -- for deplib in $dependency_libs; do -- deplibs="$deplib $deplibs" -- if $opt_duplicate_deps ; then -- case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -- esac -- fi -- tmp_libs="$tmp_libs $deplib" -- done -+ func_append convenience " $ladir/$objdir/$old_library" -+ func_append old_convenience " $ladir/$objdir/$old_library" - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" - fi -+ tmp_libs= -+ for deplib in $dependency_libs; do -+ deplibs="$deplib $deplibs" -+ if $opt_preserve_dup_deps ; then -+ case "$tmp_libs " in -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; -+ esac -+ fi -+ func_append tmp_libs " $deplib" -+ done - continue - fi # $pass = conv - -@@ -5385,9 +6029,9 @@ - # statically, we need to preload. We also need to preload any - # dependent libraries so libltdl's deplib preloader doesn't - # bomb out in the load deplibs phase. -- dlprefiles="$dlprefiles $lib $dependency_libs" -+ func_append dlprefiles " $lib $dependency_libs" - else -- newdlfiles="$newdlfiles $lib" -+ func_append newdlfiles " $lib" - fi - continue - fi # $pass = dlopen -@@ -5424,12 +6068,12 @@ - dir="$ladir" - absdir="$abs_ladir" - # Remove this search path later -- notinst_path="$notinst_path $abs_ladir" -+ func_append notinst_path " $abs_ladir" - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later -- notinst_path="$notinst_path $abs_ladir" -+ func_append notinst_path " $abs_ladir" - fi - fi # $installed = yes - func_stripname 'lib' '.la' "$laname" -@@ -5440,20 +6084,46 @@ - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" - fi -- # Prefer using a static library (so that no silly _DYNAMIC symbols -- # are required to link). -- if test -n "$old_library"; then -- newdlprefiles="$newdlprefiles $dir/$old_library" -- # Keep a list of preopened convenience libraries to check -- # that they are being used correctly in the link pass. -- test -z "$libdir" && \ -- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" -- # Otherwise, use the dlname, so that lt_dlopen finds it. -- elif test -n "$dlname"; then -- newdlprefiles="$newdlprefiles $dir/$dlname" -- else -- newdlprefiles="$newdlprefiles $dir/$linklib" -- fi -+ case "$host" in -+ # special handling for platforms with PE-DLLs. -+ *cygwin* | *mingw* | *cegcc* ) -+ # Linker will automatically link against shared library if both -+ # static and shared are present. Therefore, ensure we extract -+ # symbols from the import library if a shared library is present -+ # (otherwise, the dlopen module name will be incorrect). We do -+ # this by putting the import library name into $newdlprefiles. -+ # We recover the dlopen module name by 'saving' the la file -+ # name in a special purpose variable, and (later) extracting the -+ # dlname from the la file. -+ if test -n "$dlname"; then -+ func_tr_sh "$dir/$linklib" -+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" -+ func_append newdlprefiles " $dir/$linklib" -+ else -+ func_append newdlprefiles " $dir/$old_library" -+ # Keep a list of preopened convenience libraries to check -+ # that they are being used correctly in the link pass. -+ test -z "$libdir" && \ -+ func_append dlpreconveniencelibs " $dir/$old_library" -+ fi -+ ;; -+ * ) -+ # Prefer using a static library (so that no silly _DYNAMIC symbols -+ # are required to link). -+ if test -n "$old_library"; then -+ func_append newdlprefiles " $dir/$old_library" -+ # Keep a list of preopened convenience libraries to check -+ # that they are being used correctly in the link pass. -+ test -z "$libdir" && \ -+ func_append dlpreconveniencelibs " $dir/$old_library" -+ # Otherwise, use the dlname, so that lt_dlopen finds it. -+ elif test -n "$dlname"; then -+ func_append newdlprefiles " $dir/$dlname" -+ else -+ func_append newdlprefiles " $dir/$linklib" -+ fi -+ ;; -+ esac - fi # $pass = dlpreopen - - if test -z "$libdir"; then -@@ -5471,7 +6141,7 @@ - - - if test "$linkmode" = prog && test "$pass" != link; then -- newlib_search_path="$newlib_search_path $ladir" -+ func_append newlib_search_path " $ladir" - deplibs="$lib $deplibs" - - linkalldeplibs=no -@@ -5484,7 +6154,7 @@ - for deplib in $dependency_libs; do - case $deplib in - -L*) func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" -+ func_append newlib_search_path " $func_stripname_result" - ;; - esac - # Need to link against all dependency_libs? -@@ -5495,12 +6165,12 @@ - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi -- if $opt_duplicate_deps ; then -+ if $opt_preserve_dup_deps ; then - case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi -- tmp_libs="$tmp_libs $deplib" -+ func_append tmp_libs " $deplib" - done # for deplib - continue - fi # $linkmode = prog... -@@ -5515,7 +6185,7 @@ - # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in - *"$absdir:"*) ;; -- *) temp_rpath="$temp_rpath$absdir:" ;; -+ *) func_append temp_rpath "$absdir:" ;; - esac - fi - -@@ -5527,7 +6197,7 @@ - *) - case "$compile_rpath " in - *" $absdir "*) ;; -- *) compile_rpath="$compile_rpath $absdir" -+ *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac -@@ -5536,7 +6206,7 @@ - *) - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" -+ *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac -@@ -5561,12 +6231,12 @@ - case $host in - *cygwin* | *mingw* | *cegcc*) - # No point in relinking DLLs because paths are not encoded -- notinst_deplibs="$notinst_deplibs $lib" -+ func_append notinst_deplibs " $lib" - need_relink=no - ;; - *) - if test "$installed" = no; then -- notinst_deplibs="$notinst_deplibs $lib" -+ func_append notinst_deplibs " $lib" - need_relink=yes - fi - ;; -@@ -5583,7 +6253,7 @@ - fi - done - if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then -- $ECHO -+ echo - if test "$linkmode" = prog; then - $ECHO "*** Warning: Linking the executable $output against the loadable module" - else -@@ -5601,7 +6271,7 @@ - *) - case "$compile_rpath " in - *" $absdir "*) ;; -- *) compile_rpath="$compile_rpath $absdir" -+ *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac -@@ -5610,7 +6280,7 @@ - *) - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" -+ *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac -@@ -5664,7 +6334,7 @@ - linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" - -- if test "$linkmode" = prog || test "$mode" != relink; then -+ if test "$linkmode" = prog || test "$opt_mode" != relink; then - add_shlibpath= - add_dir= - add= -@@ -5686,9 +6356,9 @@ - if test "X$dlopenmodule" != "X$lib"; then - $ECHO "*** Warning: lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then -- $ECHO -- $ECHO "*** And there doesn't seem to be a static archive available" -- $ECHO "*** The link will probably fail, sorry" -+ echo -+ echo "*** And there doesn't seem to be a static archive available" -+ echo "*** The link will probably fail, sorry" - else - add="$dir/$old_library" - fi -@@ -5720,7 +6390,7 @@ - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) -- add_dir="$add_dir -L$inst_prefix_dir$libdir" -+ func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi -@@ -5742,7 +6412,7 @@ - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; -- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; -+ *) func_append compile_shlibpath "$add_shlibpath:" ;; - esac - fi - if test "$linkmode" = prog; then -@@ -5756,13 +6426,13 @@ - test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; -- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; -+ *) func_append finalize_shlibpath "$libdir:" ;; - esac - fi - fi - fi - -- if test "$linkmode" = prog || test "$mode" = relink; then -+ if test "$linkmode" = prog || test "$opt_mode" = relink; then - add_shlibpath= - add_dir= - add= -@@ -5776,7 +6446,7 @@ - elif test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; -- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; -+ *) func_append finalize_shlibpath "$libdir:" ;; - esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then -@@ -5793,7 +6463,7 @@ - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) -- add_dir="$add_dir -L$inst_prefix_dir$libdir" -+ func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi -@@ -5828,21 +6498,21 @@ - - # Just print a warning and add the library to dependency_libs so - # that the program can be linked against the static library. -- $ECHO -+ echo - $ECHO "*** Warning: This system can not link to static lib archive $lib." -- $ECHO "*** I have the capability to make that library automatically link in when" -- $ECHO "*** you link to this library. But I can only do this if you have a" -- $ECHO "*** shared version of the library, which you do not appear to have." -+ echo "*** I have the capability to make that library automatically link in when" -+ echo "*** you link to this library. But I can only do this if you have a" -+ echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then -- $ECHO "*** But as you try to build a module library, libtool will still create " -- $ECHO "*** a static module, that should work as long as the dlopening application" -- $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime." -+ echo "*** But as you try to build a module library, libtool will still create " -+ echo "*** a static module, that should work as long as the dlopening application" -+ echo "*** is linked with the -dlopen flag to resolve symbols at runtime." - if test -z "$global_symbol_pipe"; then -- $ECHO -- $ECHO "*** However, this would only work if libtool was able to extract symbol" -- $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" -- $ECHO "*** not find such a program. So, this module is probably useless." -- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." -+ echo -+ echo "*** However, this would only work if libtool was able to extract symbol" -+ echo "*** lists from a program, using \`nm' or equivalent, but libtool could" -+ echo "*** not find such a program. So, this module is probably useless." -+ echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - build_libtool_libs=module -@@ -5870,27 +6540,27 @@ - temp_xrpath=$func_stripname_result - case " $xrpath " in - *" $temp_xrpath "*) ;; -- *) xrpath="$xrpath $temp_xrpath";; -+ *) func_append xrpath " $temp_xrpath";; - esac;; -- *) temp_deplibs="$temp_deplibs $libdir";; -+ *) func_append temp_deplibs " $libdir";; - esac - done - dependency_libs="$temp_deplibs" - fi - -- newlib_search_path="$newlib_search_path $absdir" -+ func_append newlib_search_path " $absdir" - # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" - # ... and its dependency_libs - tmp_libs= - for deplib in $dependency_libs; do - newdependency_libs="$deplib $newdependency_libs" -- if $opt_duplicate_deps ; then -+ if $opt_preserve_dup_deps ; then - case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi -- tmp_libs="$tmp_libs $deplib" -+ func_append tmp_libs " $deplib" - done - - if test "$link_all_deplibs" != no; then -@@ -5928,8 +6598,8 @@ - if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` - fi -- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" -- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" -+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" -+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" - path= - fi - fi -@@ -5962,7 +6632,7 @@ - compile_deplibs="$new_inherited_linker_flags $compile_deplibs" - finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" - else -- compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -+ func_append compiler_flags " "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - fi - fi - dependency_libs="$newdependency_libs" -@@ -5979,7 +6649,7 @@ - for dir in $newlib_search_path; do - case "$lib_search_path " in - *" $dir "*) ;; -- *) lib_search_path="$lib_search_path $dir" ;; -+ *) func_append lib_search_path " $dir" ;; - esac - done - newlib_search_path= -@@ -6037,10 +6707,10 @@ - -L*) - case " $tmp_libs " in - *" $deplib "*) ;; -- *) tmp_libs="$tmp_libs $deplib" ;; -+ *) func_append tmp_libs " $deplib" ;; - esac - ;; -- *) tmp_libs="$tmp_libs $deplib" ;; -+ *) func_append tmp_libs " $deplib" ;; - esac - done - eval $var=\"$tmp_libs\" -@@ -6056,7 +6726,7 @@ - ;; - esac - if test -n "$i" ; then -- tmp_libs="$tmp_libs $i" -+ func_append tmp_libs " $i" - fi - done - dependency_libs=$tmp_libs -@@ -6097,7 +6767,7 @@ - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" -- objs="$objs$old_deplibs" -+ func_append objs "$old_deplibs" - ;; - - lib) -@@ -6130,10 +6800,10 @@ - if test "$deplibs_check_method" != pass_all; then - func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" - else -- $ECHO -+ echo - $ECHO "*** Warning: Linking the shared library $output against the non-libtool" - $ECHO "*** objects $objs is not portable!" -- libobjs="$libobjs $objs" -+ func_append libobjs " $objs" - fi - fi - -@@ -6198,7 +6868,7 @@ - age="$number_minor" - revision="$number_revision" - ;; -- freebsd-aout|freebsd-elf|sunos) -+ freebsd-aout|freebsd-elf|qnx|sunos) - current="$number_major" - revision="$number_minor" - age="0" -@@ -6210,9 +6880,6 @@ - revision="$number_minor" - lt_irix_increment=no - ;; -- *) -- func_fatal_configuration "$modename: unknown library version type \`$version_type'" -- ;; - esac - ;; - no) -@@ -6334,7 +7001,7 @@ - done - - # Make executables depend on our current version. -- verstring="$verstring:${current}.0" -+ func_append verstring ":${current}.0" - ;; - - qnx) -@@ -6402,10 +7069,10 @@ - fi - - func_generate_dlsyms "$libname" "$libname" "yes" -- libobjs="$libobjs $symfileobj" -+ func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= - -- if test "$mode" != relink; then -+ if test "$opt_mode" != relink; then - # Remove our outputs, but don't remove object files since they - # may have been created when compiling PIC objects. - removelist= -@@ -6421,7 +7088,7 @@ - continue - fi - fi -- removelist="$removelist $p" -+ func_append removelist " $p" - ;; - *) ;; - esac -@@ -6432,27 +7099,27 @@ - - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then -- oldlibs="$oldlibs $output_objdir/$libname.$libext" -+ func_append oldlibs " $output_objdir/$libname.$libext" - - # Transform .lo files to .o files. -- oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` -+ oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` - fi - - # Eliminate all temporary directories. - #for path in $notinst_path; do -- # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"` -- # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"` -- # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"` -+ # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` -+ # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` -+ # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` - #done - - if test -n "$xrpath"; then - # If the user specified any rpath flags, then add them. - temp_xrpath= - for libdir in $xrpath; do -- temp_xrpath="$temp_xrpath -R$libdir" -+ func_append temp_xrpath " -R$libdir" - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" ;; -+ *) func_append finalize_rpath " $libdir" ;; - esac - done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then -@@ -6466,7 +7133,7 @@ - for lib in $old_dlfiles; do - case " $dlprefiles $dlfiles " in - *" $lib "*) ;; -- *) dlfiles="$dlfiles $lib" ;; -+ *) func_append dlfiles " $lib" ;; - esac - done - -@@ -6476,19 +7143,19 @@ - for lib in $old_dlprefiles; do - case "$dlprefiles " in - *" $lib "*) ;; -- *) dlprefiles="$dlprefiles $lib" ;; -+ *) func_append dlprefiles " $lib" ;; - esac - done - - if test "$build_libtool_libs" = yes; then - if test -n "$rpath"; then - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*) -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) - # these systems don't actually have a c library (as such)! - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C library is in the System framework -- deplibs="$deplibs System.ltframework" -+ func_append deplibs " System.ltframework" - ;; - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. -@@ -6505,7 +7172,7 @@ - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -- deplibs="$deplibs -lc" -+ func_append deplibs " -lc" - fi - ;; - esac -@@ -6554,7 +7221,7 @@ - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $i "*) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - i="" - ;; - esac -@@ -6565,21 +7232,21 @@ - set dummy $deplib_matches; shift - deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - else - droppeddeps=yes -- $ECHO -+ echo - $ECHO "*** Warning: dynamic linker does not accept needed library $i." -- $ECHO "*** I have the capability to make that library automatically link in when" -- $ECHO "*** you link to this library. But I can only do this if you have a" -- $ECHO "*** shared version of the library, which I believe you do not have" -- $ECHO "*** because a test_compile did reveal that the linker did not use it for" -- $ECHO "*** its dynamic dependency list that programs get resolved with at runtime." -+ echo "*** I have the capability to make that library automatically link in when" -+ echo "*** you link to this library. But I can only do this if you have a" -+ echo "*** shared version of the library, which I believe you do not have" -+ echo "*** because a test_compile did reveal that the linker did not use it for" -+ echo "*** its dynamic dependency list that programs get resolved with at runtime." - fi - fi - ;; - *) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - ;; - esac - done -@@ -6597,7 +7264,7 @@ - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $i "*) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - i="" - ;; - esac -@@ -6608,29 +7275,29 @@ - set dummy $deplib_matches; shift - deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - else - droppeddeps=yes -- $ECHO -+ echo - $ECHO "*** Warning: dynamic linker does not accept needed library $i." -- $ECHO "*** I have the capability to make that library automatically link in when" -- $ECHO "*** you link to this library. But I can only do this if you have a" -- $ECHO "*** shared version of the library, which you do not appear to have" -- $ECHO "*** because a test_compile did reveal that the linker did not use this one" -- $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime." -+ echo "*** I have the capability to make that library automatically link in when" -+ echo "*** you link to this library. But I can only do this if you have a" -+ echo "*** shared version of the library, which you do not appear to have" -+ echo "*** because a test_compile did reveal that the linker did not use this one" -+ echo "*** as a dynamic dependency that programs can get resolved with at runtime." - fi - fi - else - droppeddeps=yes -- $ECHO -+ echo - $ECHO "*** Warning! Library $i is needed by this library but I was not able to" -- $ECHO "*** make it link in! You will probably need to install it or some" -- $ECHO "*** library that it depends on before this library will be fully" -- $ECHO "*** functional. Installing it before continuing would be even better." -+ echo "*** make it link in! You will probably need to install it or some" -+ echo "*** library that it depends on before this library will be fully" -+ echo "*** functional. Installing it before continuing would be even better." - fi - ;; - *) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - ;; - esac - done -@@ -6647,15 +7314,27 @@ - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then - libname=`eval "\\$ECHO \"$libname_spec\""` -+ if test -n "$file_magic_glob"; then -+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` -+ else -+ libnameglob=$libname -+ fi -+ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -- potential_libs=`ls $i/$libname[.-]* 2>/dev/null` -+ if test "$want_nocaseglob" = yes; then -+ shopt -s nocaseglob -+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` -+ $nocaseglob -+ else -+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` -+ fi - for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null | -@@ -6672,13 +7351,13 @@ - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` - case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; -- *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; -+ *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; - esac - done - if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | - $SED -e 10q | - $EGREP "$file_magic_regex" > /dev/null; then -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi -@@ -6687,12 +7366,12 @@ - fi - if test -n "$a_deplib" ; then - droppeddeps=yes -- $ECHO -+ echo - $ECHO "*** Warning: linker path does not have real file for library $a_deplib." -- $ECHO "*** I have the capability to make that library automatically link in when" -- $ECHO "*** you link to this library. But I can only do this if you have a" -- $ECHO "*** shared version of the library, which you do not appear to have" -- $ECHO "*** because I did check the linker path looking for a file starting" -+ echo "*** I have the capability to make that library automatically link in when" -+ echo "*** you link to this library. But I can only do this if you have a" -+ echo "*** shared version of the library, which you do not appear to have" -+ echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $ECHO "*** with $libname but no candidates were found. (...for file magic test)" - else -@@ -6703,7 +7382,7 @@ - ;; - *) - # Add a -L argument. -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. -@@ -6719,7 +7398,7 @@ - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - ;; - esac -@@ -6730,9 +7409,9 @@ - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test -- if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \ -+ if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ - $EGREP "$match_pattern_regex" > /dev/null; then -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi -@@ -6741,12 +7420,12 @@ - fi - if test -n "$a_deplib" ; then - droppeddeps=yes -- $ECHO -+ echo - $ECHO "*** Warning: linker path does not have real file for library $a_deplib." -- $ECHO "*** I have the capability to make that library automatically link in when" -- $ECHO "*** you link to this library. But I can only do this if you have a" -- $ECHO "*** shared version of the library, which you do not appear to have" -- $ECHO "*** because I did check the linker path looking for a file starting" -+ echo "*** I have the capability to make that library automatically link in when" -+ echo "*** you link to this library. But I can only do this if you have a" -+ echo "*** shared version of the library, which you do not appear to have" -+ echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" - else -@@ -6757,32 +7436,32 @@ - ;; - *) - # Add a -L argument. -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. - ;; - none | unknown | *) - newdeplibs="" -- tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \ -- -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'` -+ tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do - # can't use Xsed below, because $i might contain '/' -- tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"` -+ tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` - done - fi -- if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' | -- $GREP . >/dev/null; then -- $ECHO -+ case $tmp_deplibs in -+ *[!\ \ ]*) -+ echo - if test "X$deplibs_check_method" = "Xnone"; then -- $ECHO "*** Warning: inter-library dependencies are not supported in this platform." -+ echo "*** Warning: inter-library dependencies are not supported in this platform." - else -- $ECHO "*** Warning: inter-library dependencies are not known to be supported." -+ echo "*** Warning: inter-library dependencies are not known to be supported." - fi -- $ECHO "*** All declared inter-library dependencies are being dropped." -+ echo "*** All declared inter-library dependencies are being dropped." - droppeddeps=yes -- fi -+ ;; -+ esac - ;; - esac - versuffix=$versuffix_save -@@ -6794,23 +7473,23 @@ - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library with the System framework -- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'` -+ newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` - ;; - esac - - if test "$droppeddeps" = yes; then - if test "$module" = yes; then -- $ECHO -- $ECHO "*** Warning: libtool could not satisfy all declared inter-library" -+ echo -+ echo "*** Warning: libtool could not satisfy all declared inter-library" - $ECHO "*** dependencies of module $libname. Therefore, libtool will create" -- $ECHO "*** a static module, that should work as long as the dlopening" -- $ECHO "*** application is linked with the -dlopen flag." -+ echo "*** a static module, that should work as long as the dlopening" -+ echo "*** application is linked with the -dlopen flag." - if test -z "$global_symbol_pipe"; then -- $ECHO -- $ECHO "*** However, this would only work if libtool was able to extract symbol" -- $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" -- $ECHO "*** not find such a program. So, this module is probably useless." -- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." -+ echo -+ echo "*** However, this would only work if libtool was able to extract symbol" -+ echo "*** lists from a program, using \`nm' or equivalent, but libtool could" -+ echo "*** not find such a program. So, this module is probably useless." -+ echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" -@@ -6820,16 +7499,16 @@ - build_libtool_libs=no - fi - else -- $ECHO "*** The inter-library dependencies that have been dropped here will be" -- $ECHO "*** automatically added whenever a program is linked with this library" -- $ECHO "*** or is declared to -dlopen it." -+ echo "*** The inter-library dependencies that have been dropped here will be" -+ echo "*** automatically added whenever a program is linked with this library" -+ echo "*** or is declared to -dlopen it." - - if test "$allow_undefined" = no; then -- $ECHO -- $ECHO "*** Since this library must not contain undefined symbols," -- $ECHO "*** because either the platform does not support them or" -- $ECHO "*** it was explicitly requested with -no-undefined," -- $ECHO "*** libtool will only create a static version of it." -+ echo -+ echo "*** Since this library must not contain undefined symbols," -+ echo "*** because either the platform does not support them or" -+ echo "*** it was explicitly requested with -no-undefined," -+ echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module -@@ -6846,9 +7525,9 @@ - # Time to change all our "foo.ltframework" stuff back to "-framework foo" - case $host in - *-*-darwin*) -- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -- new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -- deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -+ newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` -+ new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` -+ deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - ;; - esac - -@@ -6861,7 +7540,7 @@ - *) - case " $deplibs " in - *" -L$path/$objdir "*) -- new_libs="$new_libs -L$path/$objdir" ;; -+ func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac -@@ -6871,10 +7550,10 @@ - -L*) - case " $new_libs " in - *" $deplib "*) ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - done - deplibs="$new_libs" -@@ -6891,7 +7570,7 @@ - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" -- test "$mode" != relink && rpath="$compile_rpath$rpath" -+ test "$opt_mode" != relink && rpath="$compile_rpath$rpath" - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then -@@ -6903,18 +7582,18 @@ - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" -- dep_rpath="$dep_rpath $flag" -+ func_append dep_rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; -- *) perm_rpath="$perm_rpath $libdir" ;; -+ *) func_apped perm_rpath " $libdir" ;; - esac - fi - done -@@ -6932,7 +7611,7 @@ - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do -- rpath="$rpath$dir:" -+ func_append rpath "$dir:" - done - eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" - fi -@@ -6940,7 +7619,7 @@ - fi - - shlibpath="$finalize_shlibpath" -- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" -+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" - if test -n "$shlibpath"; then - eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi -@@ -6966,18 +7645,18 @@ - linknames= - for link - do -- linknames="$linknames $link" -+ func_append linknames " $link" - done - - # Use standard objects if they are pic -- test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -+ test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` - test "X$libobjs" = "X " && libobjs= - - delfiles= - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" -- delfiles="$delfiles $export_symbols" -+ func_append delfiles " $export_symbols" - fi - - orig_export_symbols= -@@ -7008,14 +7687,31 @@ - $opt_dry_run || $RM $export_symbols - cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' -- for cmd in $cmds; do -+ for cmd1 in $cmds; do - IFS="$save_ifs" -- eval cmd=\"$cmd\" -+ eval cmd=\"$cmd1\" - func_len " $cmd" - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - func_show_eval "$cmd" 'exit $?' - skipped_export=false -+ elif test -n "$nm_file_list_spec"; then -+ func_basename "$output" -+ output_la=$func_basename_result -+ save_libobjs=$libobjs -+ save_output=$output -+ output=${output_objdir}/${output_la}.nm -+ libobjs=$nm_file_list_spec$output -+ func_append delfiles " $output" -+ func_verbose "creating $NM input file list: $output" -+ for obj in $save_libobjs; do -+ $ECHO "$obj" -+ done > "$output" -+ eval cmd=\"$cmd1\" -+ func_show_eval "$cmd" 'exit $?' -+ output=$save_output -+ libobjs=$save_libobjs -+ skipped_export=false - else - # The command line is too long to execute in one step. - func_verbose "using reloadable object file for export list..." -@@ -7036,7 +7732,7 @@ - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" -- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' -+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then -@@ -7048,7 +7744,7 @@ - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter -- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" -+ func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi -@@ -7058,7 +7754,7 @@ - case " $convenience " in - *" $test_deplib "*) ;; - *) -- tmp_deplibs="$tmp_deplibs $test_deplib" -+ func_append tmp_deplibs " $test_deplib" - ;; - esac - done -@@ -7078,21 +7774,21 @@ - test "X$libobjs" = "X " && libobjs= - else - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $convenience -- libobjs="$libobjs $func_extract_archives_result" -+ func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then - eval flag=\"$thread_safe_flag_spec\" -- linker_flags="$linker_flags $flag" -+ func_append linker_flags " $flag" - fi - - # Make a backup of the uninstalled library when relinking -- if test "$mode" = relink; then -+ if test "$opt_mode" = relink; then - $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? - fi - -@@ -7137,7 +7833,8 @@ - save_libobjs=$libobjs - fi - save_output=$output -- output_la=`$ECHO "X$output" | $Xsed -e "$basename"` -+ func_basename "$output" -+ output_la=$func_basename_result - - # Clear the reloadable object creation command queue and - # initialize k to one. -@@ -7150,13 +7847,13 @@ - if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then - output=${output_objdir}/${output_la}.lnkscript - func_verbose "creating GNU ld script: $output" -- $ECHO 'INPUT (' > $output -+ echo 'INPUT (' > $output - for obj in $save_libobjs - do - $ECHO "$obj" >> $output - done -- $ECHO ')' >> $output -- delfiles="$delfiles $output" -+ echo ')' >> $output -+ func_append delfiles " $output" - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk - func_verbose "creating linker input file list: $output" -@@ -7172,7 +7869,7 @@ - do - $ECHO "$obj" >> $output - done -- delfiles="$delfiles $output" -+ func_append delfiles " $output" - output=$firstobj\"$file_list_spec$output\" - else - if test -n "$save_libobjs"; then -@@ -7197,17 +7894,19 @@ - # command to the queue. - if test "$k" -eq 1 ; then - # The first file doesn't have a previous command to add. -- eval concat_cmds=\"$reload_cmds $objlist $last_robj\" -+ reload_objs=$objlist -+ eval concat_cmds=\"$reload_cmds\" - else - # All subsequent reloadable object files will link in - # the last one created. -- eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\" -+ reload_objs="$objlist $last_robj" -+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" - fi - last_robj=$output_objdir/$output_la-${k}.$objext - func_arith $k + 1 - k=$func_arith_result - output=$output_objdir/$output_la-${k}.$objext -- objlist=$obj -+ objlist=" $obj" - func_len " $last_robj" - func_arith $len0 + $func_len_result - len=$func_arith_result -@@ -7217,11 +7916,12 @@ - # reloadable object file. All subsequent reloadable object - # files will link in the last one created. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -- eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" -+ reload_objs="$objlist $last_robj" -+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\" - if test -n "$last_robj"; then - eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" - fi -- delfiles="$delfiles $output" -+ func_append delfiles " $output" - - else - output= -@@ -7255,7 +7955,7 @@ - lt_exit=$? - - # Restore the uninstalled library and exit -- if test "$mode" = relink; then -+ if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) -@@ -7276,7 +7976,7 @@ - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" -- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' -+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test -n "$orig_export_symbols"; then -@@ -7288,7 +7988,7 @@ - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter -- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" -+ func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi -@@ -7329,10 +8029,10 @@ - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles -- libobjs="$libobjs $func_extract_archives_result" -+ func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - -@@ -7348,7 +8048,7 @@ - lt_exit=$? - - # Restore the uninstalled library and exit -- if test "$mode" = relink; then -+ if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) -@@ -7360,7 +8060,7 @@ - IFS="$save_ifs" - - # Restore the uninstalled library and exit -- if test "$mode" = relink; then -+ if test "$opt_mode" = relink; then - $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? - - if test -n "$convenience"; then -@@ -7441,18 +8141,21 @@ - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" -- reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` -+ reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` - else - gentop="$output_objdir/${obj}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi - -+ # If we're not building shared, we need to use non_pic_objs -+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" -+ - # Create the old-style object. -- reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test -+ reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - - output="$obj" - func_execute_cmds "$reload_cmds" 'exit $?' -@@ -7512,8 +8215,8 @@ - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework -- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` -- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` -+ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` -+ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` - ;; - esac - -@@ -7524,14 +8227,14 @@ - if test "$tagname" = CXX ; then - case ${MACOSX_DEPLOYMENT_TARGET-10.0} in - 10.[0123]) -- compile_command="$compile_command ${wl}-bind_at_load" -- finalize_command="$finalize_command ${wl}-bind_at_load" -+ func_append compile_command " ${wl}-bind_at_load" -+ func_append finalize_command " ${wl}-bind_at_load" - ;; - esac - fi - # Time to change all our "foo.ltframework" stuff back to "-framework foo" -- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -+ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` -+ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - ;; - esac - -@@ -7545,7 +8248,7 @@ - *) - case " $compile_deplibs " in - *" -L$path/$objdir "*) -- new_libs="$new_libs -L$path/$objdir" ;; -+ func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac -@@ -7555,17 +8258,17 @@ - -L*) - case " $new_libs " in - *" $deplib "*) ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - done - compile_deplibs="$new_libs" - - -- compile_command="$compile_command $compile_deplibs" -- finalize_command="$finalize_command $finalize_deplibs" -+ func_append compile_command " $compile_deplibs" -+ func_append finalize_command " $finalize_deplibs" - - if test -n "$rpath$xrpath"; then - # If the user specified any rpath flags, then add them. -@@ -7573,7 +8276,7 @@ - # This is the magic to use -rpath. - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" ;; -+ *) func_append finalize_rpath " $libdir" ;; - esac - done - fi -@@ -7592,18 +8295,18 @@ - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" -- rpath="$rpath $flag" -+ func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; -- *) perm_rpath="$perm_rpath $libdir" ;; -+ *) func_append perm_rpath " $libdir" ;; - esac - fi - case $host in -@@ -7612,12 +8315,12 @@ - case :$dllsearchpath: in - *":$libdir:"*) ;; - ::) dllsearchpath=$libdir;; -- *) dllsearchpath="$dllsearchpath:$libdir";; -+ *) func_append dllsearchpath ":$libdir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; -- *) dllsearchpath="$dllsearchpath:$testbindir";; -+ *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac -@@ -7643,18 +8346,18 @@ - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ func_append hardcode_libdirs "_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" -- rpath="$rpath $flag" -+ func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in - *" $libdir "*) ;; -- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; -+ *) func_append finalize_perm_rpath " $libdir" ;; - esac - fi - done -@@ -7668,8 +8371,8 @@ - - if test -n "$libobjs" && test "$build_old_libs" = yes; then - # Transform all the library objects into standard objects. -- compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -- finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -+ compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` -+ finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` - fi - - func_generate_dlsyms "$outputname" "@PROGRAM@" "no" -@@ -7681,15 +8384,15 @@ - - wrappers_required=yes - case $host in -+ *cegcc* | *mingw32ce*) -+ # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. -+ wrappers_required=no -+ ;; - *cygwin* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi - ;; -- *cegcc) -- # Disable wrappers for cegcc, we are cross compiling anyway. -- wrappers_required=no -- ;; - *) - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - wrappers_required=no -@@ -7698,13 +8401,18 @@ - esac - if test "$wrappers_required" = no; then - # Replace the output file specification. -- compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` -+ compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" - - # We have no uninstalled library dependencies, so finalize right now. - exit_status=0 - func_show_eval "$link_command" 'exit_status=$?' - -+ if test -n "$postlink_cmds"; then -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' -+ fi -+ - # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' -@@ -7727,7 +8435,7 @@ - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do -- rpath="$rpath$dir:" -+ func_append rpath "$dir:" - done - compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi -@@ -7735,7 +8443,7 @@ - # We should set the runpath_var. - rpath= - for dir in $finalize_perm_rpath; do -- rpath="$rpath$dir:" -+ func_append rpath "$dir:" - done - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi -@@ -7745,11 +8453,17 @@ - # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" - # Replace the output file specification. -- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` -+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - # Delete the old output file. - $opt_dry_run || $RM $output - # Link the executable and exit - func_show_eval "$link_command" 'exit $?' -+ -+ if test -n "$postlink_cmds"; then -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' -+ fi -+ - exit $EXIT_SUCCESS - fi - -@@ -7764,7 +8478,7 @@ - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then -- relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` -+ relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= -@@ -7776,13 +8490,18 @@ - fi - - # Replace the output file specification. -- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` -+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` - - # Delete the old output files. - $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname - - func_show_eval "$link_command" 'exit $?' - -+ if test -n "$postlink_cmds"; then -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' -+ fi -+ - # Now create the wrapper script. - func_verbose "creating $output" - -@@ -7800,18 +8519,7 @@ - fi - done - relink_command="(cd `pwd`; $relink_command)" -- relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` -- fi -- -- # Quote $ECHO for shipping. -- if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then -- case $progpath in -- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; -- *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; -- esac -- qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"` -- else -- qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"` -+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - fi - - # Only actually do things if not in dry run mode. -@@ -7891,7 +8599,7 @@ - else - oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then -- oldobjs="$oldobjs $symfileobj" -+ func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" -@@ -7899,10 +8607,10 @@ - - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $addlibs -- oldobjs="$oldobjs $func_extract_archives_result" -+ func_append oldobjs " $func_extract_archives_result" - fi - - # Do each command in the archive commands. -@@ -7913,10 +8621,10 @@ - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles -- oldobjs="$oldobjs $func_extract_archives_result" -+ func_append oldobjs " $func_extract_archives_result" - fi - - # POSIX demands no paths to be encoded in archives. We have -@@ -7932,9 +8640,9 @@ - done | sort | sort -uc >/dev/null 2>&1); then - : - else -- $ECHO "copying selected object files to avoid basename conflicts..." -+ echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - func_mkdir_p "$gentop" - save_oldobjs=$oldobjs - oldobjs= -@@ -7958,9 +8666,9 @@ - esac - done - func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" -- oldobjs="$oldobjs $gentop/$newobj" -+ func_append oldobjs " $gentop/$newobj" - ;; -- *) oldobjs="$oldobjs $obj" ;; -+ *) func_append oldobjs " $obj" ;; - esac - done - fi -@@ -8043,7 +8751,7 @@ - done - # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" -- relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` -+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then - relink_command= - fi -@@ -8066,9 +8774,9 @@ - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" -- newdependency_libs="$newdependency_libs $libdir/$name" -+ func_append newdependency_libs " $libdir/$name" - ;; -- *) newdependency_libs="$newdependency_libs $deplib" ;; -+ *) func_append newdependency_libs " $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" -@@ -8082,9 +8790,9 @@ - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" -- newdlfiles="$newdlfiles $libdir/$name" -+ func_append newdlfiles " $libdir/$name" - ;; -- *) newdlfiles="$newdlfiles $lib" ;; -+ *) func_append newdlfiles " $lib" ;; - esac - done - dlfiles="$newdlfiles" -@@ -8101,7 +8809,7 @@ - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" -- newdlprefiles="$newdlprefiles $libdir/$name" -+ func_append newdlprefiles " $libdir/$name" - ;; - esac - done -@@ -8113,7 +8821,7 @@ - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac -- newdlfiles="$newdlfiles $abs" -+ func_append newdlfiles " $abs" - done - dlfiles="$newdlfiles" - newdlprefiles= -@@ -8122,15 +8830,33 @@ - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac -- newdlprefiles="$newdlprefiles $abs" -+ func_append newdlprefiles " $abs" - done - dlprefiles="$newdlprefiles" - fi - $RM $output - # place dlname in correct position for cygwin -+ # In fact, it would be nice if we could use this code for all target -+ # systems that can't hard-code library paths into their executables -+ # and that have no shared library path variable independent of PATH, -+ # but it turns out we can't easily determine that from inspecting -+ # libtool variables, so we have to hard-code the OSs to which it -+ # applies here; at the moment, that means platforms that use the PE -+ # object format with DLL files. See the long comment at the top of -+ # tests/bindir.at for full details. - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in -- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; -+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) -+ # If a -bindir argument was supplied, place the dll there. -+ if test "x$bindir" != x ; -+ then -+ func_relative_path "$install_libdir" "$bindir" -+ tdlname=$func_relative_path_result$dlname -+ else -+ # Otherwise fall back on heuristic. -+ tdlname=../bin/$dlname -+ fi -+ ;; - esac - $ECHO > $output "\ - # $outputname - a libtool library file -@@ -8189,7 +8915,7 @@ - exit $EXIT_SUCCESS - } - --{ test "$mode" = link || test "$mode" = relink; } && -+{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} - - -@@ -8209,9 +8935,9 @@ - for arg - do - case $arg in -- -f) RM="$RM $arg"; rmforce=yes ;; -- -*) RM="$RM $arg" ;; -- *) files="$files $arg" ;; -+ -f) func_append RM " $arg"; rmforce=yes ;; -+ -*) func_append RM " $arg" ;; -+ *) func_append files " $arg" ;; - esac - done - -@@ -8220,24 +8946,23 @@ - - rmdirs= - -- origobjdir="$objdir" - for file in $files; do - func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then -- objdir="$origobjdir" -+ odir="$objdir" - else -- objdir="$dir/$origobjdir" -+ odir="$dir/$objdir" - fi - func_basename "$file" - name="$func_basename_result" -- test "$mode" = uninstall && objdir="$dir" -+ test "$opt_mode" = uninstall && odir="$dir" - -- # Remember objdir for removal later, being careful to avoid duplicates -- if test "$mode" = clean; then -+ # Remember odir for removal later, being careful to avoid duplicates -+ if test "$opt_mode" = clean; then - case " $rmdirs " in -- *" $objdir "*) ;; -- *) rmdirs="$rmdirs $objdir" ;; -+ *" $odir "*) ;; -+ *) func_append rmdirs " $odir" ;; - esac - fi - -@@ -8263,18 +8988,17 @@ - - # Delete the libtool libraries and symlinks. - for n in $library_names; do -- rmfiles="$rmfiles $objdir/$n" -+ func_append rmfiles " $odir/$n" - done -- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" -+ test -n "$old_library" && func_append rmfiles " $odir/$old_library" - -- case "$mode" in -+ case "$opt_mode" in - clean) -- case " $library_names " in -- # " " in the beginning catches empty $dlname -+ case " $library_names " in - *" $dlname "*) ;; -- *) rmfiles="$rmfiles $objdir/$dlname" ;; -+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; - esac -- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" -+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" - ;; - uninstall) - if test -n "$library_names"; then -@@ -8302,19 +9026,19 @@ - # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then -- rmfiles="$rmfiles $dir/$pic_object" -+ func_append rmfiles " $dir/$pic_object" - fi - - # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then -- rmfiles="$rmfiles $dir/$non_pic_object" -+ func_append rmfiles " $dir/$non_pic_object" - fi - fi - ;; - - *) -- if test "$mode" = clean ; then -+ if test "$opt_mode" = clean ; then - noexename=$name - case $file in - *.exe) -@@ -8324,7 +9048,7 @@ - noexename=$func_stripname_result - # $file with .exe has already been added to rmfiles, - # add $file without .exe -- rmfiles="$rmfiles $file" -+ func_append rmfiles " $file" - ;; - esac - # Do a test to see if this is a libtool program. -@@ -8333,7 +9057,7 @@ - func_ltwrapper_scriptname "$file" - relink_command= - func_source $func_ltwrapper_scriptname_result -- rmfiles="$rmfiles $func_ltwrapper_scriptname_result" -+ func_append rmfiles " $func_ltwrapper_scriptname_result" - else - relink_command= - func_source $dir/$noexename -@@ -8341,12 +9065,12 @@ - - # note $name still contains .exe if it was in $file originally - # as does the version of $file that was added into $rmfiles -- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" -+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then -- rmfiles="$rmfiles $objdir/lt-$name" -+ func_append rmfiles " $odir/lt-$name" - fi - if test "X$noexename" != "X$name" ; then -- rmfiles="$rmfiles $objdir/lt-${noexename}.c" -+ func_append rmfiles " $odir/lt-${noexename}.c" - fi - fi - fi -@@ -8354,7 +9078,6 @@ - esac - func_show_eval "$RM $rmfiles" 'exit_status=1' - done -- objdir="$origobjdir" - - # Try to remove the ${objdir}s in the directories where we deleted files - for dir in $rmdirs; do -@@ -8366,16 +9089,16 @@ - exit $exit_status - } - --{ test "$mode" = uninstall || test "$mode" = clean; } && -+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} - --test -z "$mode" && { -+test -z "$opt_mode" && { - help="$generic_help" - func_fatal_help "you must specify a MODE" - } - - test -z "$exec_cmd" && \ -- func_fatal_help "invalid operation mode \`$mode'" -+ func_fatal_help "invalid operation mode \`$opt_mode'" - - if test -n "$exec_cmd"; then - eval exec "$exec_cmd" -diff -Nur strongswan-4.4.1.orig/m4/config/libtool.m4 strongswan-4.4.1/m4/config/libtool.m4 ---- strongswan-4.4.1.orig/m4/config/libtool.m4 2010-01-06 11:24:25.000000000 +0100 -+++ strongswan-4.4.1/m4/config/libtool.m4 2010-07-31 21:12:25.272504820 +0200 -@@ -1,7 +1,8 @@ - # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - # - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is free software; the Free Software Foundation gives -@@ -10,7 +11,8 @@ - - m4_define([_LT_COPYING], [dnl - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008 Free Software Foundation, Inc. -+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -+# Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is part of GNU Libtool. -@@ -37,7 +39,7 @@ - # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - ]) - --# serial 56 LT_INIT -+# serial 57 LT_INIT - - - # LT_PREREQ(VERSION) -@@ -66,6 +68,7 @@ - # ------------------ - AC_DEFUN([LT_INIT], - [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT -+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl - AC_BEFORE([$0], [LT_LANG])dnl - AC_BEFORE([$0], [LT_OUTPUT])dnl - AC_BEFORE([$0], [LTDL_INIT])dnl -@@ -82,6 +85,8 @@ - AC_REQUIRE([LTOBSOLETE_VERSION])dnl - m4_require([_LT_PROG_LTMAIN])dnl - -+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) -+ - dnl Parse OPTIONS - _LT_SET_OPTIONS([$0], [$1]) - -@@ -118,7 +123,7 @@ - *) break;; - esac - done --cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` - ]) - - -@@ -138,6 +143,9 @@ - m4_defun([_LT_SETUP], - [AC_REQUIRE([AC_CANONICAL_HOST])dnl - AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl -+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl -+ - _LT_DECL([], [host_alias], [0], [The host system])dnl - _LT_DECL([], [host], [0])dnl - _LT_DECL([], [host_os], [0])dnl -@@ -162,6 +170,7 @@ - m4_require([_LT_CHECK_SHELL_FEATURES])dnl - m4_require([_LT_CMD_RELOAD])dnl - m4_require([_LT_CHECK_MAGIC_METHOD])dnl -+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl - m4_require([_LT_CMD_OLD_ARCHIVE])dnl - m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl - -@@ -179,7 +188,6 @@ - _LT_CHECK_OBJDIR - - m4_require([_LT_TAG_COMPILER])dnl --_LT_PROG_ECHO_BACKSLASH - - case $host_os in - aix3*) -@@ -193,23 +201,6 @@ - ;; - esac - --# Sed substitution that helps us do robust quoting. It backslashifies --# metacharacters that are still active within double-quoted strings. --sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' -- --# Same as above, but do not quote variable references. --double_quote_subst='s/\([["`\\]]\)/\\\1/g' -- --# Sed substitution to delay expansion of an escaped shell variable in a --# double_quote_subst'ed string. --delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -- --# Sed substitution to delay expansion of an escaped single quote. --delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' -- --# Sed substitution to avoid accidental globbing in evaled expressions --no_glob_subst='s/\*/\\\*/g' -- - # Global variables: - ofile=libtool - can_build_shared=yes -@@ -250,6 +241,28 @@ - ])# _LT_SETUP - - -+# _LT_PREPARE_SED_QUOTE_VARS -+# -------------------------- -+# Define a few sed substitution that help us do robust quoting. -+m4_defun([_LT_PREPARE_SED_QUOTE_VARS], -+[# Backslashify metacharacters that are still active within -+# double-quoted strings. -+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' -+ -+# Same as above, but do not quote variable references. -+double_quote_subst='s/\([["`\\]]\)/\\\1/g' -+ -+# Sed substitution to delay expansion of an escaped shell variable in a -+# double_quote_subst'ed string. -+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -+ -+# Sed substitution to delay expansion of an escaped single quote. -+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' -+ -+# Sed substitution to avoid accidental globbing in evaled expressions -+no_glob_subst='s/\*/\\\*/g' -+]) -+ - # _LT_PROG_LTMAIN - # --------------- - # Note that this code is called both from `configure', and `config.status' -@@ -408,7 +421,7 @@ - # declaration there will have the same value as in `configure'. VARNAME - # must have a single quote delimited value for this to work. - m4_define([_LT_CONFIG_STATUS_DECLARE], --[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) -+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) - - - # _LT_CONFIG_STATUS_DECLARATIONS -@@ -418,7 +431,7 @@ - # embedded single quotes properly. In configure, this macro expands - # each variable declared with _LT_DECL (and _LT_TAGDECL) into: - # --# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`' -+# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`' - m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], - [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), - [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) -@@ -517,12 +530,20 @@ - LTCFLAGS='$LTCFLAGS' - compiler='$compiler_DEFAULT' - -+# A function that is used when there is no print builtin or printf. -+func_fallback_echo () -+{ -+ eval 'cat <<_LTECHO_EOF -+\$[]1 -+_LTECHO_EOF' -+} -+ - # Quote evaled strings. - for var in lt_decl_all_varnames([[ \ - ]], lt_decl_quote_varnames); do -- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in -+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[[\\\\\\\`\\"\\\$]]*) -- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" -+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -@@ -533,9 +554,9 @@ - # Double-quote double-evaled strings. - for var in lt_decl_all_varnames([[ \ - ]], lt_decl_dquote_varnames); do -- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in -+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[[\\\\\\\`\\"\\\$]]*) -- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -@@ -543,16 +564,38 @@ - esac - done - --# Fix-up fallback echo if it was mangled by the above quoting rules. --case \$lt_ECHO in --*'\\\[$]0 --fallback-echo"')dnl " -- lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` -- ;; --esac -- - _LT_OUTPUT_LIBTOOL_INIT - ]) - -+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) -+# ------------------------------------ -+# Generate a child script FILE with all initialization necessary to -+# reuse the environment learned by the parent script, and make the -+# file executable. If COMMENT is supplied, it is inserted after the -+# `#!' sequence but before initialization text begins. After this -+# macro, additional text can be appended to FILE to form the body of -+# the child script. The macro ends with non-zero status if the -+# file could not be fully written (such as if the disk is full). -+m4_ifdef([AS_INIT_GENERATED], -+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], -+[m4_defun([_LT_GENERATED_FILE_INIT], -+[m4_require([AS_PREPARE])]dnl -+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl -+[lt_write_fail=0 -+cat >$1 <<_ASEOF || lt_write_fail=1 -+#! $SHELL -+# Generated by $as_me. -+$2 -+SHELL=\${CONFIG_SHELL-$SHELL} -+export SHELL -+_ASEOF -+cat >>$1 <<\_ASEOF || lt_write_fail=1 -+AS_SHELL_SANITIZE -+_AS_PREPARE -+exec AS_MESSAGE_FD>&1 -+_ASEOF -+test $lt_write_fail = 0 && chmod +x $1[]dnl -+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT - - # LT_OUTPUT - # --------- -@@ -562,20 +605,11 @@ - AC_DEFUN([LT_OUTPUT], - [: ${CONFIG_LT=./config.lt} - AC_MSG_NOTICE([creating $CONFIG_LT]) --cat >"$CONFIG_LT" <<_LTEOF --#! $SHELL --# Generated by $as_me. --# Run this file to recreate a libtool stub with the current configuration. -- --lt_cl_silent=false --SHELL=\${CONFIG_SHELL-$SHELL} --_LTEOF -+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], -+[# Run this file to recreate a libtool stub with the current configuration.]) - - cat >>"$CONFIG_LT" <<\_LTEOF --AS_SHELL_SANITIZE --_AS_PREPARE -- --exec AS_MESSAGE_FD>&1 -+lt_cl_silent=false - exec AS_MESSAGE_LOG_FD>>config.log - { - echo -@@ -601,7 +635,7 @@ - m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) - configured by $[0], generated by m4_PACKAGE_STRING. - --Copyright (C) 2008 Free Software Foundation, Inc. -+Copyright (C) 2010 Free Software Foundation, Inc. - This config.lt script is free software; the Free Software Foundation - gives unlimited permision to copy, distribute and modify it." - -@@ -646,15 +680,13 @@ - # appending to config.log, which fails on DOS, as config.log is still kept - # open by configure. Here we exec the FD to /dev/null, effectively closing - # config.log, so it can be properly (re)opened and appended to by config.lt. --if test "$no_create" != yes; then -- lt_cl_success=: -- test "$silent" = yes && -- lt_config_lt_args="$lt_config_lt_args --quiet" -- exec AS_MESSAGE_LOG_FD>/dev/null -- $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false -- exec AS_MESSAGE_LOG_FD>>config.log -- $lt_cl_success || AS_EXIT(1) --fi -+lt_cl_success=: -+test "$silent" = yes && -+ lt_config_lt_args="$lt_config_lt_args --quiet" -+exec AS_MESSAGE_LOG_FD>/dev/null -+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false -+exec AS_MESSAGE_LOG_FD>>config.log -+$lt_cl_success || AS_EXIT(1) - ])# LT_OUTPUT - - -@@ -717,15 +749,12 @@ - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- _LT_PROG_XSI_SHELLFNS -+ sed '$q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -+ _LT_PROG_REPLACE_SHELLFNS - -- mv -f "$cfgfile" "$ofile" || -+ mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - ], -@@ -831,11 +860,13 @@ - AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) - AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) - AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) -+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) - dnl aclocal-1.4 backwards compatibility: - dnl AC_DEFUN([AC_LIBTOOL_CXX], []) - dnl AC_DEFUN([AC_LIBTOOL_F77], []) - dnl AC_DEFUN([AC_LIBTOOL_FC], []) - dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) -+dnl AC_DEFUN([AC_LIBTOOL_RC], []) - - - # _LT_TAG_COMPILER -@@ -940,6 +971,31 @@ - [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" - ]) -+ AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], -+ [lt_cv_ld_force_load=no -+ cat > conftest.c << _LT_EOF -+int forced_loaded() { return 2;} -+_LT_EOF -+ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD -+ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD -+ echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD -+ $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD -+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD -+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD -+ cat > conftest.c << _LT_EOF -+int main() { return 0;} -+_LT_EOF -+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD -+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err -+ _lt_result=$? -+ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then -+ lt_cv_ld_force_load=yes -+ else -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ fi -+ rm -f conftest.err libconftest.a conftest conftest.c -+ rm -rf conftest.dSYM -+ ]) - case $host_os in - rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -@@ -967,7 +1023,7 @@ - else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi -- if test "$DSYMUTIL" != ":"; then -+ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= -@@ -987,7 +1043,11 @@ - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_automatic, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -- _LT_TAGVAR(whole_archive_flag_spec, $1)='' -+ if test "$lt_cv_ld_force_load" = "yes"; then -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' -+ else -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='' -+ fi - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" - case $cc_basename in -@@ -995,7 +1055,7 @@ - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; then -- output_verbose_link_cmd=echo -+ output_verbose_link_cmd=func_echo_all - _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -@@ -1041,170 +1101,65 @@ - # _LT_SHELL_INIT(ARG) - # ------------------- - m4_define([_LT_SHELL_INIT], --[ifdef([AC_DIVERSION_NOTICE], -- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], -- [AC_DIVERT_PUSH(NOTICE)]) --$1 --AC_DIVERT_POP --])# _LT_SHELL_INIT -+[m4_divert_text([M4SH-INIT], [$1 -+])])# _LT_SHELL_INIT -+ - - - # _LT_PROG_ECHO_BACKSLASH - # ----------------------- --# Add some code to the start of the generated configure script which --# will find an echo command which doesn't interpret backslashes. -+# Find how we can fake an echo command that does not interpret backslash. -+# In particular, with Autoconf 2.60 or later we add some code to the start -+# of the generated configure script which will find a shell with a builtin -+# printf (which we can use as an echo command). - m4_defun([_LT_PROG_ECHO_BACKSLASH], --[_LT_SHELL_INIT([ --# Check that we are running under the correct shell. --SHELL=${CONFIG_SHELL-/bin/sh} -- --case X$lt_ECHO in --X*--fallback-echo) -- # Remove one level of quotation (which was required for Make). -- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` -- ;; --esac -- --ECHO=${lt_ECHO-echo} --if test "X[$]1" = X--no-reexec; then -- # Discard the --no-reexec flag, and continue. -- shift --elif test "X[$]1" = X--fallback-echo; then -- # Avoid inline document here, it may be left over -- : --elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then -- # Yippee, $ECHO works! -- : -+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO -+ -+AC_MSG_CHECKING([how to print strings]) -+# Test print first, because it will be a builtin if present. -+if test "X`print -r -- -n 2>/dev/null`" = X-n && \ -+ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then -+ ECHO='print -r --' -+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then -+ ECHO='printf %s\n' - else -- # Restart under the correct shell. -- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} --fi -- --if test "X[$]1" = X--fallback-echo; then -- # used as fallback echo -- shift -- cat <<_LT_EOF --[$]* --_LT_EOF -- exit 0 -+ # Use this function as a fallback that always works. -+ func_fallback_echo () -+ { -+ eval 'cat <<_LTECHO_EOF -+$[]1 -+_LTECHO_EOF' -+ } -+ ECHO='func_fallback_echo' - fi - --# The HP-UX ksh and POSIX shell print the target directory to stdout --# if CDPATH is set. --(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -- --if test -z "$lt_ECHO"; then -- if test "X${echo_test_string+set}" != Xset; then -- # find a string as large as possible, as long as the shell can cope with it -- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do -- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... -- if { echo_test_string=`eval $cmd`; } 2>/dev/null && -- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null -- then -- break -- fi -- done -- fi -- -- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && -- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- : -- else -- # The Solaris, AIX, and Digital Unix default echo programs unquote -- # backslashes. This makes it impossible to quote backslashes using -- # echo "$something" | sed 's/\\/\\\\/g' -- # -- # So, first we look for a working echo in the user's PATH. -- -- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -- for dir in $PATH /usr/ucb; do -- IFS="$lt_save_ifs" -- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && -- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- ECHO="$dir/echo" -- break -- fi -- done -- IFS="$lt_save_ifs" -- -- if test "X$ECHO" = Xecho; then -- # We didn't find a better echo, so look for alternatives. -- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && -- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- # This shell has a builtin print -r that does the trick. -- ECHO='print -r' -- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && -- test "X$CONFIG_SHELL" != X/bin/ksh; then -- # If we have ksh, try running configure again with it. -- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -- export ORIGINAL_CONFIG_SHELL -- CONFIG_SHELL=/bin/ksh -- export CONFIG_SHELL -- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} -- else -- # Try using printf. -- ECHO='printf %s\n' -- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && -- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- # Cool, printf works -- : -- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -- test "X$echo_testing_string" = 'X\t' && -- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL -- export CONFIG_SHELL -- SHELL="$CONFIG_SHELL" -- export SHELL -- ECHO="$CONFIG_SHELL [$]0 --fallback-echo" -- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -- test "X$echo_testing_string" = 'X\t' && -- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- ECHO="$CONFIG_SHELL [$]0 --fallback-echo" -- else -- # maybe with a smaller string... -- prev=: -- -- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do -- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null -- then -- break -- fi -- prev="$cmd" -- done -+# func_echo_all arg... -+# Invoke $ECHO with all args, space-separated. -+func_echo_all () -+{ -+ $ECHO "$*" -+} - -- if test "$prev" != 'sed 50q "[$]0"'; then -- echo_test_string=`eval $prev` -- export echo_test_string -- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} -- else -- # Oops. We lost completely, so just stick with echo. -- ECHO=echo -- fi -- fi -- fi -- fi -- fi --fi -+case "$ECHO" in -+ printf*) AC_MSG_RESULT([printf]) ;; -+ print*) AC_MSG_RESULT([print -r]) ;; -+ *) AC_MSG_RESULT([cat]) ;; -+esac - --# Copy echo and quote the copy suitably for passing to libtool from --# the Makefile, instead of quoting the original, which is used later. --lt_ECHO=$ECHO --if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then -- lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" --fi -+m4_ifdef([_AS_DETECT_SUGGESTED], -+[_AS_DETECT_SUGGESTED([ -+ test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( -+ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO -+ PATH=/empty FPATH=/empty; export PATH FPATH -+ test "X`printf %s $ECHO`" = "X$ECHO" \ -+ || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) - --AC_SUBST(lt_ECHO) --]) - _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) --_LT_DECL([], [ECHO], [1], -- [An echo program that does not interpret backslashes]) -+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) - ])# _LT_PROG_ECHO_BACKSLASH - - -@@ -1236,7 +1191,7 @@ - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '[#]line __oline__ "configure"' > conftest.$ac_ext -+ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in -@@ -1388,10 +1343,19 @@ - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" - fi -+ -+case $host_os in -+ darwin*) -+ lock_old_archive_extraction=yes ;; -+ *) -+ lock_old_archive_extraction=no ;; -+esac - _LT_DECL([], [old_postinstall_cmds], [2]) - _LT_DECL([], [old_postuninstall_cmds], [2]) - _LT_TAGDECL([], [old_archive_cmds], [2], - [Commands used to build an old-style archive]) -+_LT_DECL([], [lock_old_archive_extraction], [0], -+ [Whether to use a lock for old archive extraction]) - ])# _LT_CMD_OLD_ARCHIVE - - -@@ -1416,15 +1380,15 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&AS_MESSAGE_LOG_FD -- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD -+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - $2=yes -@@ -1464,7 +1428,7 @@ - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&AS_MESSAGE_LOG_FD -- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - $2=yes -@@ -1527,6 +1491,11 @@ - lt_cv_sys_max_cmd_len=8192; - ;; - -+ mint*) -+ # On MiNT this can take a long time and run out of memory. -+ lt_cv_sys_max_cmd_len=8192; -+ ;; -+ - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. -@@ -1591,8 +1560,8 @@ - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. -- while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ -- = "XX$teststring$teststring"; } >/dev/null 2>&1 && -+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ -+ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` -@@ -1643,7 +1612,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --[#line __oline__ "configure" -+[#line $LINENO "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -1684,7 +1653,13 @@ - # endif - #endif - --void fnord() { int i=42;} -+/* When -fvisbility=hidden is used, assume the code has been annotated -+ correspondingly for the symbols needed. */ -+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -+int fnord () __attribute__((visibility("default"))); -+#endif -+ -+int fnord () { return 42; } - int main () - { - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -1693,7 +1668,11 @@ - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ else -+ { -+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ else puts (dlerror ()); -+ } - /* dlclose (self); */ - } - else -@@ -1869,16 +1848,16 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&AS_MESSAGE_LOG_FD -- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD -+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings -- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes -@@ -2037,6 +2016,7 @@ - m4_require([_LT_FILEUTILS_DEFAULTS])dnl - m4_require([_LT_DECL_OBJDUMP])dnl - m4_require([_LT_DECL_SED])dnl -+m4_require([_LT_CHECK_SHELL_FEATURES])dnl - AC_MSG_CHECKING([dynamic linker characteristics]) - m4_if([$1], - [], [ -@@ -2045,16 +2025,23 @@ - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac -- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` -- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then -+ case $host_os in -+ mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; -+ *) lt_sed_strip_eq="s,=/,/,g" ;; -+ esac -+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` -+ case $lt_search_path_spec in -+ *\;*) - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. -- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` -- else -- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -- fi -+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` -+ ;; -+ *) -+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` -+ ;; -+ esac - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= -@@ -2067,7 +2054,7 @@ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done -- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' -+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' - BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; -@@ -2087,7 +2074,13 @@ - if (lt_foo != "") { lt_freq[[lt_foo]]++; } - if (lt_freq[[lt_foo]] == 1) { print lt_foo; } - }'` -- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` -+ # AWK program above erroneously prepends '/' to C:/dos/paths -+ # for these hosts. -+ case $host_os in -+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ -+ $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; -+ esac -+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` - else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" - fi]) -@@ -2175,7 +2168,7 @@ - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. -- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; -@@ -2206,8 +2199,9 @@ - need_version=no - need_lib_prefix=no - -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ case $GCC,$cc_basename in -+ yes,*) -+ # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -@@ -2228,36 +2222,54 @@ - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -+m4_if([$1], [],[ -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) - ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -- if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then -- # It is most probably a Windows format PATH printed by -- # mingw gcc, but we are running on Cygwin. Gcc prints its search -- # path with ; separators, and with drive letters. We can handle the -- # drive letters (cygwin fileutils understands them), so leave them, -- # especially as we might pass files found there to a mingw objdump, -- # which wouldn't understand a cygwinified path. Ahh. -- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -- else -- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -- fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - esac -+ dynamic_linker='Win32 ld.exe' -+ ;; -+ -+ *,cl*) -+ # Native MSVC -+ libname_spec='$name' -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}.lib' -+ sys_lib_search_path_spec="$LIB" -+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then -+ # It is most probably a Windows format PATH. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # FIXME: find the short name or the path components, as spaces are -+ # common. (e.g. "Program Files" -> "PROGRA~1") -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ dynamic_linker='Win32 link.exe' - ;; - - *) -+ # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ dynamic_linker='Win32 ld.exe' - ;; - esac -- dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -@@ -2344,6 +2356,19 @@ - hardcode_into_libs=yes - ;; - -+haiku*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ dynamic_linker="$host_os runtime_loader" -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' -+ hardcode_into_libs=yes -+ ;; -+ - hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. -@@ -2386,8 +2411,10 @@ - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac -- # HP-UX runs *really* slowly unless shared libraries are mode 555. -+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ... - postinstall_cmds='chmod 555 $lib' -+ # or fails outright, so override atomically: -+ install_override_mode=555 - ;; - - interix[[3-9]]*) -@@ -2454,16 +2481,21 @@ - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no -+ - # Some binutils ld are patched to set DT_RUNPATH -- save_LDFLAGS=$LDFLAGS -- save_libdir=$libdir -- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ -- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" -- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], -- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], -- [shlibpath_overrides_runpath=yes])]) -- LDFLAGS=$save_LDFLAGS -- libdir=$save_libdir -+ AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], -+ [lt_cv_shlibpath_overrides_runpath=no -+ save_LDFLAGS=$LDFLAGS -+ save_libdir=$libdir -+ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ -+ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], -+ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], -+ [lt_cv_shlibpath_overrides_runpath=yes])]) -+ LDFLAGS=$save_LDFLAGS -+ libdir=$save_libdir -+ ]) -+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install -@@ -2472,7 +2504,7 @@ - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then -- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - -@@ -2485,18 +2517,6 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - --netbsdelf*-gnu) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- dynamic_linker='NetBSD ld.elf_so' -- ;; -- - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -2717,6 +2737,8 @@ - The last name is the one that the linker finds with -lNAME]]) - _LT_DECL([], [soname_spec], [1], - [[The coded name of the library, if different from the real name]]) -+_LT_DECL([], [install_override_mode], [1], -+ [Permission mode override for installation of shared libraries]) - _LT_DECL([], [postinstall_cmds], [2], - [Command to use after installation of a shared archive]) - _LT_DECL([], [postuninstall_cmds], [2], -@@ -2829,6 +2851,7 @@ - AC_REQUIRE([AC_CANONICAL_BUILD])dnl - m4_require([_LT_DECL_SED])dnl - m4_require([_LT_DECL_EGREP])dnl -+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl - - AC_ARG_WITH([gnu-ld], - [AS_HELP_STRING([--with-gnu-ld], -@@ -2958,8 +2981,8 @@ - fi - ;; - esac --_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl --_LT_DECL([], [reload_cmds], [2])dnl -+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl -+_LT_TAGDECL([], [reload_cmds], [2])dnl - ])# _LT_CMD_RELOAD - - -@@ -3011,16 +3034,18 @@ - # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump', - # unless we find 'file', for example because we are cross-compiling. -- if ( file / ) >/dev/null 2>&1; then -+ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. -+ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ # Keep this pattern in sync with the one in func_win32_libid. -+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; - --cegcc) -+cegcc*) - # use the weaker test based on 'objdump'. See mingw*. - lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' -@@ -3050,6 +3075,10 @@ - lt_cv_deplibs_check_method=pass_all - ;; - -+haiku*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ - hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in -@@ -3058,11 +3087,11 @@ - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) -- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] -+ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) -- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' -+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac -@@ -3088,7 +3117,7 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --netbsd* | netbsdelf*-gnu) -+netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else -@@ -3162,6 +3191,21 @@ - ;; - esac - ]) -+ -+file_magic_glob= -+want_nocaseglob=no -+if test "$build" = "$host"; then -+ case $host_os in -+ mingw* | pw32*) -+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then -+ want_nocaseglob=yes -+ else -+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` -+ fi -+ ;; -+ esac -+fi -+ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -3169,7 +3213,11 @@ - _LT_DECL([], [deplibs_check_method], [1], - [Method to check whether dependent libraries are shared objects]) - _LT_DECL([], [file_magic_cmd], [1], -- [Command to use when deplibs_check_method == "file_magic"]) -+ [Command to use when deplibs_check_method = "file_magic"]) -+_LT_DECL([], [file_magic_glob], [1], -+ [How to find potential files when deplibs_check_method = "file_magic"]) -+_LT_DECL([], [want_nocaseglob], [1], -+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) - ])# _LT_CHECK_MAGIC_METHOD - - -@@ -3226,7 +3274,19 @@ - NM="$lt_cv_path_NM" - else - # Didn't find any BSD compatible name lister, look for dumpbin. -- AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) -+ if test -n "$DUMPBIN"; then : -+ # Let the user override the test. -+ else -+ AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) -+ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in -+ *COFF*) -+ DUMPBIN="$DUMPBIN -symbols" -+ ;; -+ *) -+ DUMPBIN=: -+ ;; -+ esac -+ fi - AC_SUBST([DUMPBIN]) - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" -@@ -3239,13 +3299,13 @@ - AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], - [lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext -- (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) -+ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&AS_MESSAGE_LOG_FD -- (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) -+ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&AS_MESSAGE_LOG_FD -- (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) -+ (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) - cat conftest.out >&AS_MESSAGE_LOG_FD - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" -@@ -3260,6 +3320,67 @@ - dnl AC_DEFUN([AM_PROG_NM], []) - dnl AC_DEFUN([AC_PROG_NM], []) - -+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB -+# -------------------------------- -+# how to determine the name of the shared library -+# associated with a specific link library. -+# -- PORTME fill in with the dynamic library characteristics -+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], -+[m4_require([_LT_DECL_EGREP]) -+m4_require([_LT_DECL_OBJDUMP]) -+m4_require([_LT_DECL_DLLTOOL]) -+AC_CACHE_CHECK([how to associate runtime and link libraries], -+lt_cv_sharedlib_from_linklib_cmd, -+[lt_cv_sharedlib_from_linklib_cmd='unknown' -+ -+case $host_os in -+cygwin* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh -+ # decide which to use based on capabilities of $DLLTOOL -+ case `$DLLTOOL --help 2>&1` in -+ *--identify-strict*) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -+ ;; -+ *) -+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback -+ ;; -+ esac -+ ;; -+*) -+ # fallback: assume linklib IS sharedlib -+ lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ ;; -+esac -+]) -+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -+ -+_LT_DECL([], [sharedlib_from_linklib_cmd], [1], -+ [Command to associate shared and link libraries]) -+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB -+ -+ -+# _LT_PATH_MANIFEST_TOOL -+# ---------------------- -+# locate the manifest tool -+m4_defun([_LT_PATH_MANIFEST_TOOL], -+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) -+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], -+ [lt_cv_path_mainfest_tool=no -+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD -+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then -+ lt_cv_path_mainfest_tool=yes -+ fi -+ rm -f conftest*]) -+if test "x$lt_cv_path_mainfest_tool" != xyes; then -+ MANIFEST_TOOL=: -+fi -+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl -+])# _LT_PATH_MANIFEST_TOOL -+ - - # LT_LIB_M - # -------- -@@ -3268,7 +3389,7 @@ - [AC_REQUIRE([AC_CANONICAL_HOST])dnl - LIBM= - case $host in --*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) -+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; - *-ncr-sysv4.3*) -@@ -3296,7 +3417,12 @@ - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - - if test "$GCC" = yes; then -- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -+ case $cc_basename in -+ nvcc*) -+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; -+ *) -+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; -+ esac - - _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], - lt_cv_prog_compiler_rtti_exceptions, -@@ -3313,6 +3439,7 @@ - m4_defun([_LT_CMD_GLOBAL_SYMBOLS], - [AC_REQUIRE([AC_CANONICAL_HOST])dnl - AC_REQUIRE([AC_PROG_CC])dnl -+AC_REQUIRE([AC_PROG_AWK])dnl - AC_REQUIRE([LT_PATH_NM])dnl - AC_REQUIRE([LT_PATH_LD])dnl - m4_require([_LT_DECL_SED])dnl -@@ -3380,8 +3507,8 @@ - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -3438,7 +3565,7 @@ - if AC_TRY_EVAL(ac_compile); then - # Now try to grab the symbols. - nlist=conftest.nm -- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then -+ if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" -@@ -3528,6 +3655,13 @@ - AC_MSG_RESULT(ok) - fi - -+# Response file support. -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ nm_file_list_spec='@' -+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then -+ nm_file_list_spec='@' -+fi -+ - _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], - [Take the output of nm and produce a listing of raw symbols and C names]) - _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], -@@ -3538,6 +3672,8 @@ - _LT_DECL([global_symbol_to_c_name_address_lib_prefix], - [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], - [Transform the output of nm in a C name address pair when lib prefix is needed]) -+_LT_DECL([], [nm_file_list_spec], [1], -+ [Specify filename containing input files for $NM]) - ]) # _LT_CMD_GLOBAL_SYMBOLS - - -@@ -3549,7 +3685,6 @@ - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)= - --AC_MSG_CHECKING([for $compiler option to produce PIC]) - m4_if([$1], [CXX], [ - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then -@@ -3600,6 +3735,11 @@ - # DJGPP does not support shared libraries at all - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - ;; -+ haiku*) -+ # PIC is the default for Haiku. -+ # The "-static" flag exists, but is broken. -+ _LT_TAGVAR(lt_prog_compiler_static, $1)= -+ ;; - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. -@@ -3738,8 +3878,8 @@ - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; -- xlc* | xlC*) -- # IBM XL 8.0 on PPC -+ xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) -+ # IBM XL 8.0, 9.0 on PPC and BlueGene - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' -@@ -3769,7 +3909,7 @@ - ;; - esac - ;; -- netbsd* | netbsdelf*-gnu) -+ netbsd*) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise -@@ -3801,7 +3941,7 @@ - ;; - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -@@ -3905,6 +4045,12 @@ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - -+ haiku*) -+ # PIC is the default for Haiku. -+ # The "-static" flag exists, but is broken. -+ _LT_TAGVAR(lt_prog_compiler_static, $1)= -+ ;; -+ - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag -@@ -3947,6 +4093,13 @@ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac -+ -+ case $cc_basename in -+ nvcc*) # Cuda Compiler Driver 2.2 -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' -+ ;; -+ esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in -@@ -4010,7 +4163,7 @@ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' - _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' - ;; -- pgcc* | pgf77* | pgf90* | pgf95*) -+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -@@ -4022,25 +4175,25 @@ - # All Alpha code is PIC. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; -- xl*) -- # IBM XL C 8.0/Fortran 10.1 on PPC -+ xl* | bgxl* | bgf* | mpixl*) -+ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in -- *Sun\ C*) -- # Sun C 5.9 -+ *Sun\ F* | *Sun*Fortran*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='' - ;; -- *Sun\ F*) -- # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ *Sun\ C*) -+ # Sun C 5.9 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='' -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - esac - ;; -@@ -4072,7 +4225,7 @@ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - case $cc_basename in -- f77* | f90* | f95*) -+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; - *) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; -@@ -4129,9 +4282,11 @@ - _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" - ;; - esac --AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) --_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], -- [How to pass a linker flag through the compiler]) -+ -+AC_CACHE_CHECK([for $compiler option to produce PIC], -+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], -+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) - - # - # Check to make sure the PIC flag actually works. -@@ -4150,6 +4305,8 @@ - _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], - [Additional compiler flags for building library objects]) - -+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], -+ [How to pass a linker flag through the compiler]) - # - # Check to make sure the static flag actually works. - # -@@ -4170,6 +4327,7 @@ - m4_defun([_LT_LINKER_SHLIBS], - [AC_REQUIRE([LT_PATH_LD])dnl - AC_REQUIRE([LT_PATH_NM])dnl -+m4_require([_LT_PATH_MANIFEST_TOOL])dnl - m4_require([_LT_FILEUTILS_DEFAULTS])dnl - m4_require([_LT_DECL_EGREP])dnl - m4_require([_LT_DECL_SED])dnl -@@ -4178,30 +4336,35 @@ - AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) - m4_if([$1], [CXX], [ - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - case $host_os in - aix[[4-9]]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ # Also, AIX nm treats weak defined symbols like other global defined -+ # symbols, whereas GNU nm marks them as "W". - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" -- ;; -+ ;; - cygwin* | mingw* | cegcc*) -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -- linux* | k*bsd*-gnu) -- _LT_TAGVAR(link_all_deplibs, $1)=no -- ;; -+ case $cc_basename in -+ cl*) ;; -+ *) -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] -+ ;; -+ esac -+ ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -+ ;; - esac -- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - ], [ - runpath_var= - _LT_TAGVAR(allow_undefined_flag, $1)= -@@ -4261,13 +4424,36 @@ - openbsd*) - with_gnu_ld=no - ;; -- linux* | k*bsd*-gnu) -- _LT_TAGVAR(link_all_deplibs, $1)=no -- ;; - esac - - _LT_TAGVAR(ld_shlibs, $1)=yes -+ -+ # On some targets, GNU ld is compatible enough with the native linker -+ # that we're better off using the native interface for both. -+ lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then -+ case $host_os in -+ aix*) -+ # The AIX port of GNU ld has always aspired to compatibility -+ # with the native linker. However, as the warning in the GNU ld -+ # block says, versions before 2.19.5* couldn't really create working -+ # shared libraries, regardless of the interface used. -+ case `$LD -v 2>&1` in -+ *\ \(GNU\ Binutils\)\ 2.19.5*) ;; -+ *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; -+ *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; -+ *) -+ lt_use_gnu_ld_interface=yes -+ ;; -+ esac -+ ;; -+ *) -+ lt_use_gnu_ld_interface=yes -+ ;; -+ esac -+ fi -+ -+ if test "$lt_use_gnu_ld_interface" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - -@@ -4301,11 +4487,12 @@ - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - --*** Warning: the GNU linker, at least up to release 2.9.1, is reported -+*** Warning: the GNU linker, at least up to release 2.19, is reported - *** to be unable to reliably create shared libraries on AIX. - *** Therefore, libtool is disabling shared libraries support. If you --*** really care for shared libraries, you may want to modify your PATH --*** so that a non-GNU linker is found, and then restart. -+*** really care for shared libraries, you may want to install binutils -+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. -+*** You will then need to restart the configuration process. - - _LT_EOF - fi -@@ -4341,10 +4528,12 @@ - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -@@ -4362,6 +4551,11 @@ - fi - ;; - -+ haiku*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ ;; -+ - interix[[3-9]]*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -@@ -4391,11 +4585,12 @@ - tmp_sharedflag='-shared' - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler -- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; -- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ pgf77* | pgf90* | pgf95* | pgfortran*) -+ # Portland Group f77 and f90 compilers -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; -@@ -4406,13 +4601,17 @@ - lf95*) # Lahey Fortran 8.1 - _LT_TAGVAR(whole_archive_flag_spec, $1)= - tmp_sharedflag='--shared' ;; -- xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) -+ xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) - tmp_sharedflag='-qmkshrobj' - tmp_addflag= ;; -+ nvcc*) # Cuda Compiler Driver 2.2 -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' -+ _LT_TAGVAR(compiler_needs_object, $1)=yes -+ ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 -- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 -@@ -4428,17 +4627,17 @@ - fi - - case $cc_basename in -- xlf*) -+ xlf* | bgf* | bgxlf* | mpixlf*) - # IBM XL Fortran 10.1 on PPC cannot create shared libs itself - _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' -- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -4447,7 +4646,7 @@ - fi - ;; - -- netbsd* | netbsdelf*-gnu) -+ netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -4559,8 +4758,10 @@ - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ # Also, AIX nm treats weak defined symbols like other global -+ # defined symbols, whereas GNU nm marks them as "W". - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi -@@ -4622,7 +4823,6 @@ - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi -- _LT_TAGVAR(link_all_deplibs, $1)=no - else - # not using gcc - if test "$host_cpu" = ia64; then -@@ -4650,7 +4850,7 @@ - # empty executable. - _LT_SYS_MODULE_PATH_AIX - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -@@ -4665,8 +4865,13 @@ - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' -- # Exported symbols can be pulled into shared objects from archives -- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -+ if test "$with_gnu_ld" = yes; then -+ # We only use this code for GNU lds that support --whole-archive. -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -+ else -+ # Exported symbols can be pulled into shared objects from archives -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -+ fi - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -@@ -4698,20 +4903,60 @@ - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -- # FIXME: Should let the user specify the lib program. -- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' -- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' -- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ case $cc_basename in -+ cl*) -+ # Native MSVC -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=yes -+ _LT_TAGVAR(file_list_spec, $1)='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs @$output_objdir/$soname.exp -Wl,-DLL~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' -+ # Don't use ranlib -+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' -+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) lt_outputfile="$lt_outputfile.exe" ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_outputfile.manifest" -outputresource:"$lt_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # Assume MSVC wrapper -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ # FIXME: Should let the user specify the lib program. -+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -4772,7 +5017,7 @@ - ;; - - hpux10*) -- if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -@@ -4791,7 +5036,7 @@ - ;; - - hpux11*) -- if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -@@ -4812,7 +5057,14 @@ - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ m4_if($1, [], [ -+ # Older versions of the 11.00 compiler do not understand -b yet -+ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) -+ _LT_LINKER_OPTION([if $CC understands -b], -+ _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], -+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], -+ [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], -+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) - ;; - esac - fi -@@ -4840,19 +5092,19 @@ - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - AC_LINK_IFELSE(int foo(void) {}, -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - ) - LDFLAGS="$save_LDFLAGS" - else -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -@@ -4861,7 +5113,7 @@ - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - -- netbsd* | netbsdelf*-gnu) -+ netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -4914,17 +5166,17 @@ - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -@@ -4934,13 +5186,13 @@ - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ -- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' -+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' - - # Both c and cxx compiler support -rpath directly - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -@@ -5131,36 +5383,38 @@ - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. -- AC_MSG_CHECKING([whether -lc should be explicitly linked in]) -- $RM conftest* -- echo "$lt_simple_compile_test_code" > conftest.$ac_ext -- -- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then -- soname=conftest -- lib=conftest -- libobjs=conftest.$ac_objext -- deplibs= -- wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) -- pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) -- compiler_flags=-v -- linker_flags=-v -- verstring= -- output_objdir=. -- libname=conftest -- lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) -- _LT_TAGVAR(allow_undefined_flag, $1)= -- if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) -- then -- _LT_TAGVAR(archive_cmds_need_lc, $1)=no -- else -- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes -- fi -- _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag -- else -- cat conftest.err 1>&5 -- fi -- $RM conftest* -- AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) -+ AC_CACHE_CHECK([whether -lc should be explicitly linked in], -+ [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), -+ [$RM conftest* -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then -+ soname=conftest -+ lib=conftest -+ libobjs=conftest.$ac_objext -+ deplibs= -+ wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) -+ pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) -+ compiler_flags=-v -+ linker_flags=-v -+ verstring= -+ output_objdir=. -+ libname=conftest -+ lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) -+ _LT_TAGVAR(allow_undefined_flag, $1)= -+ if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) -+ then -+ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ else -+ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes -+ fi -+ _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag -+ else -+ cat conftest.err 1>&5 -+ fi -+ $RM conftest* -+ ]) -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) - ;; - esac - fi -@@ -5237,6 +5491,8 @@ - [Symbols that must always be exported]) - _LT_TAGDECL([], [prelink_cmds], [2], - [Commands necessary for linking programs (against libraries) with templates]) -+_LT_TAGDECL([], [postlink_cmds], [2], -+ [Commands necessary for finishing linking programs]) - _LT_TAGDECL([], [file_list_spec], [1], - [Specify filename containing input files]) - dnl FIXME: Not yet implemented -@@ -5330,37 +5586,22 @@ - ])# _LT_LANG_C_CONFIG - - --# _LT_PROG_CXX --# ------------ --# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ --# compiler, we have our own version here. --m4_defun([_LT_PROG_CXX], --[ --pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) --AC_PROG_CXX --if test -n "$CXX" && ( test "X$CXX" != "Xno" && -- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -- (test "X$CXX" != "Xg++"))) ; then -- AC_PROG_CXXCPP --else -- _lt_caught_CXX_error=yes --fi --popdef([AC_MSG_ERROR]) --])# _LT_PROG_CXX -- --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([_LT_PROG_CXX], []) -- -- - # _LT_LANG_CXX_CONFIG([TAG]) - # -------------------------- - # Ensure that the configuration variables for a C++ compiler are suitably - # defined. These variables are subsequently used by _LT_CONFIG to write - # the compiler configuration to `libtool'. - m4_defun([_LT_LANG_CXX_CONFIG], --[AC_REQUIRE([_LT_PROG_CXX])dnl --m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl - m4_require([_LT_DECL_EGREP])dnl -+m4_require([_LT_PATH_MANIFEST_TOOL])dnl -+if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ AC_PROG_CXXCPP -+else -+ _lt_caught_CXX_error=yes -+fi - - AC_LANG_PUSH(C++) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no -@@ -5382,6 +5623,8 @@ - _LT_TAGVAR(module_expsym_cmds, $1)= - _LT_TAGVAR(link_all_deplibs, $1)=unknown - _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+_LT_TAGVAR(reload_flag, $1)=$reload_flag -+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds - _LT_TAGVAR(no_undefined_flag, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -@@ -5484,7 +5727,7 @@ - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - - else - GXX=no -@@ -5596,7 +5839,7 @@ - _LT_SYS_MODULE_PATH_AIX - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -@@ -5611,8 +5854,13 @@ - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' -- # Exported symbols can be pulled into shared objects from archives -- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -+ if test "$with_gnu_ld" = yes; then -+ # We only use this code for GNU lds that support --whole-archive. -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -+ else -+ # Exported symbols can be pulled into shared objects from archives -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -+ fi - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared - # libraries. -@@ -5642,28 +5890,70 @@ - ;; - - cygwin* | mingw* | pw32* | cegcc*) -- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -- # as there is no search path for DLLs. -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -- _LT_TAGVAR(always_export_symbols, $1)=no -- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -- -- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is; otherwise, prepend... -- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- else -- _LT_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -+ case $GXX,$cc_basename in -+ ,cl* | no,cl*) -+ # Native MSVC -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=yes -+ _LT_TAGVAR(file_list_spec, $1)='@' -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -+ else -+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs @$output_objdir/$soname.exp -Wl,-DLL~ -+ linknames=' -+ # The linker will not automatically build a static lib if we build a DLL. -+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ # Don't use ranlib -+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' -+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) lt_outputfile="$lt_outputfile.exe" ;; -+ esac~ -+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_outputfile.manifest" -outputresource:"$lt_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' -+ ;; -+ *) -+ # g++ -+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -+ # as there is no search path for DLLs. -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=no -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ -+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; -@@ -5705,6 +5995,11 @@ - gnu*) - ;; - -+ haiku*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ ;; -+ - hpux9*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: -@@ -5729,7 +6024,7 @@ - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. -- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes; then -@@ -5794,7 +6089,7 @@ - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. -- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes; then -@@ -5837,7 +6132,7 @@ - case $cc_basename in - CC*) - # SGI C++ -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is -@@ -5848,9 +6143,9 @@ - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' - fi - fi - _LT_TAGVAR(link_all_deplibs, $1)=yes -@@ -5879,7 +6174,7 @@ - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. -- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -@@ -5916,26 +6211,26 @@ - pgCC* | pgcpp*) - # Portland Group C++ compiler - case `$CC -V` in -- *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) -+ *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) - _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ -- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' -+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' - _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ -- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ -+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' - _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; -- *) # Version 6 will use weak symbols -+ *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; -@@ -5943,7 +6238,7 @@ - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) - # Compaq C++ -@@ -5962,9 +6257,9 @@ - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. -- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' - ;; -- xl*) -+ xl* | mpixl* | bgxl*) - # IBM XL 8.0 on PPC, with GNU ld - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -@@ -5984,13 +6279,13 @@ - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. -- output_verbose_link_cmd='echo' -+ output_verbose_link_cmd='func_echo_all' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is -@@ -6059,7 +6354,7 @@ - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi -- output_verbose_link_cmd=echo -+ output_verbose_link_cmd=func_echo_all - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -@@ -6094,15 +6389,15 @@ - case $host in - osf3*) - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - ;; - *) - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ -- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ -+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - ;; -@@ -6118,17 +6413,17 @@ - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. -- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - case $host in - osf3*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - -@@ -6138,7 +6433,7 @@ - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - - else - # FIXME: insert proper C++ library support -@@ -6174,7 +6469,7 @@ - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(archive_cmds_need_lc,$1)=yes - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' -@@ -6195,7 +6490,7 @@ - esac - _LT_TAGVAR(link_all_deplibs, $1)=yes - -- output_verbose_link_cmd='echo' -+ output_verbose_link_cmd='func_echo_all' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is -@@ -6222,7 +6517,7 @@ - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. -@@ -6233,7 +6528,7 @@ - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. -- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - fi - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' -@@ -6287,6 +6582,10 @@ - CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ -+ '"$_LT_TAGVAR(old_archive_cmds, $1)" -+ _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ -+ '"$_LT_TAGVAR(reload_cmds, $1)" - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -@@ -6533,7 +6832,7 @@ - - solaris*) - case $cc_basename in -- CC*) -+ CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as -@@ -6577,32 +6876,16 @@ - ])# _LT_SYS_HIDDEN_LIBDEPS - - --# _LT_PROG_F77 --# ------------ --# Since AC_PROG_F77 is broken, in that it returns the empty string --# if there is no fortran compiler, we have our own version here. --m4_defun([_LT_PROG_F77], --[ --pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) --AC_PROG_F77 --if test -z "$F77" || test "X$F77" = "Xno"; then -- _lt_disable_F77=yes --fi --popdef([AC_MSG_ERROR]) --])# _LT_PROG_F77 -- --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([_LT_PROG_F77], []) -- -- - # _LT_LANG_F77_CONFIG([TAG]) - # -------------------------- - # Ensure that the configuration variables for a Fortran 77 compiler are - # suitably defined. These variables are subsequently used by _LT_CONFIG - # to write the compiler configuration to `libtool'. - m4_defun([_LT_LANG_F77_CONFIG], --[AC_REQUIRE([_LT_PROG_F77])dnl --AC_LANG_PUSH(Fortran 77) -+[AC_LANG_PUSH(Fortran 77) -+if test -z "$F77" || test "X$F77" = "Xno"; then -+ _lt_disable_F77=yes -+fi - - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(allow_undefined_flag, $1)= -@@ -6621,6 +6904,8 @@ - _LT_TAGVAR(module_expsym_cmds, $1)= - _LT_TAGVAR(link_all_deplibs, $1)=unknown - _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+_LT_TAGVAR(reload_flag, $1)=$reload_flag -+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds - _LT_TAGVAR(no_undefined_flag, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -@@ -6720,32 +7005,17 @@ - ])# _LT_LANG_F77_CONFIG - - --# _LT_PROG_FC --# ----------- --# Since AC_PROG_FC is broken, in that it returns the empty string --# if there is no fortran compiler, we have our own version here. --m4_defun([_LT_PROG_FC], --[ --pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) --AC_PROG_FC --if test -z "$FC" || test "X$FC" = "Xno"; then -- _lt_disable_FC=yes --fi --popdef([AC_MSG_ERROR]) --])# _LT_PROG_FC -- --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([_LT_PROG_FC], []) -- -- - # _LT_LANG_FC_CONFIG([TAG]) - # ------------------------- - # Ensure that the configuration variables for a Fortran compiler are - # suitably defined. These variables are subsequently used by _LT_CONFIG - # to write the compiler configuration to `libtool'. - m4_defun([_LT_LANG_FC_CONFIG], --[AC_REQUIRE([_LT_PROG_FC])dnl --AC_LANG_PUSH(Fortran) -+[AC_LANG_PUSH(Fortran) -+ -+if test -z "$FC" || test "X$FC" = "Xno"; then -+ _lt_disable_FC=yes -+fi - - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(allow_undefined_flag, $1)= -@@ -6764,6 +7034,8 @@ - _LT_TAGVAR(module_expsym_cmds, $1)= - _LT_TAGVAR(link_all_deplibs, $1)=unknown - _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+_LT_TAGVAR(reload_flag, $1)=$reload_flag -+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds - _LT_TAGVAR(no_undefined_flag, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -@@ -6909,6 +7181,8 @@ - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - - _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+_LT_TAGVAR(reload_flag, $1)=$reload_flag -+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change -@@ -7037,6 +7311,15 @@ - AC_SUBST([OBJDUMP]) - ]) - -+# _LT_DECL_DLLTOOL -+# ---------------- -+# Ensure DLLTOOL variable is set. -+m4_defun([_LT_DECL_DLLTOOL], -+[AC_CHECK_TOOL(DLLTOOL, dlltool, false) -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) -+AC_SUBST([DLLTOOL]) -+]) - - # _LT_DECL_SED - # ------------ -@@ -7130,8 +7413,8 @@ - # Try some XSI features - xsi_shell=no - ( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -@@ -7170,208 +7453,95 @@ - ])# _LT_CHECK_SHELL_FEATURES - - --# _LT_PROG_XSI_SHELLFNS --# --------------------- --# Bourne and XSI compatible variants of some useful shell functions. --m4_defun([_LT_PROG_XSI_SHELLFNS], --[case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -- --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -- --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -- --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $[*] )) --} -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -- --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) -+# ------------------------------------------------------ -+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and -+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. -+m4_defun([_LT_PROG_FUNCTION_REPLACE], -+[dnl { -+sed -e '/^$1 ()$/,/^} # $1 /c\ -+$1 ()\ -+{\ -+m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) -+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+test 0 -eq $? || _lt_function_replace_fail=: -+]) - --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} - --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` --} -+# _LT_PROG_REPLACE_SHELLFNS -+# ------------------------- -+# Replace existing portable implementations of several shell functions with -+# equivalent extended shell implementations where those features are available.. -+m4_defun([_LT_PROG_REPLACE_SHELLFNS], -+[if test x"$xsi_shell" = xyes; then -+ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl -+ func_basename_result="${1##*/}"]) -+ -+ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac -+ func_basename_result="${1##*/}"]) - --dnl func_dirname_and_basename --dnl A portable version of this function is already defined in general.m4sh --dnl so there is no need for it here. -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "X${3}" \ -- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "X${3}" \ -- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; -- esac --} -+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl -+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -+ # positional parameters, so assign one to ordinary parameter first. -+ func_stripname_result=${3} -+ func_stripname_result=${func_stripname_result#"${1}"} -+ func_stripname_result=${func_stripname_result%"${2}"}]) - --# sed scripts: --my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[[^=]]*=//' -+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl -+ func_split_long_opt_name=${1%%=*} -+ func_split_long_opt_arg=${1#*=}]) - --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` --} -+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl -+ func_split_short_opt_arg=${1#??} -+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) - --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` --} -+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl -+ case ${1} in -+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -+ *) func_lo2o_result=${1} ;; -+ esac]) - --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` --} -+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) - --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$[@]"` --} -+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) - --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` --} -+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -+fi - --_LT_EOF --esac -+if test x"$lt_shell_append" = xyes; then -+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) - --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$[1]+=\$[2]" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl -+ func_quote_for_eval "${2}" -+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ -+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) - --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$[1]=\$$[1]\$[2]" --} -+ # Save a `func_append' function call where possible by direct use of '+=' -+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+else -+ # Save a `func_append' function call even when '+=' is not available -+ sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -+ && mv -f "$cfgfile.tmp" "$cfgfile" \ -+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -+ test 0 -eq $? || _lt_function_replace_fail=: -+fi - --_LT_EOF -- ;; -- esac -+if test x"$_lt_function_replace_fail" = x":"; then -+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -+fi - ]) -diff -Nur strongswan-4.4.1.orig/m4/config/lt~obsolete.m4 strongswan-4.4.1/m4/config/lt~obsolete.m4 ---- strongswan-4.4.1.orig/m4/config/lt~obsolete.m4 2010-01-06 11:24:25.000000000 +0100 -+++ strongswan-4.4.1/m4/config/lt~obsolete.m4 2010-07-31 21:12:25.672506327 +0200 -@@ -1,13 +1,13 @@ - # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- - # --# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. -+# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. - # Written by Scott James Remnant, 2004. - # - # 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. - --# serial 4 lt~obsolete.m4 -+# serial 5 lt~obsolete.m4 - - # These exist entirely to fool aclocal when bootstrapping libtool. - # -@@ -77,7 +77,6 @@ - m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) - m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) - m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) --m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) - m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) - m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) - m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) -@@ -90,3 +89,10 @@ - m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) - m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) - m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) -+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) -+m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) -+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) -+m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) -+m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) -+m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) -+m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) -diff -Nur strongswan-4.4.1.orig/m4/config/ltoptions.m4 strongswan-4.4.1/m4/config/ltoptions.m4 ---- strongswan-4.4.1.orig/m4/config/ltoptions.m4 2010-01-06 11:24:25.000000000 +0100 -+++ strongswan-4.4.1/m4/config/ltoptions.m4 2010-07-31 21:12:25.388506195 +0200 -@@ -1,13 +1,14 @@ - # Helper functions for option handling. -*- Autoconf -*- - # --# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. -+# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # Written by Gary V. Vaughan, 2004 - # - # 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. - --# serial 6 ltoptions.m4 -+# serial 7 ltoptions.m4 - - # This is to help aclocal find these macros, as it can't see m4_define. - AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) -@@ -125,7 +126,7 @@ - [enable_win32_dll=yes - - case $host in --*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) -+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) -@@ -133,13 +134,13 @@ - esac - - test -z "$AS" && AS=as --_LT_DECL([], [AS], [0], [Assembler program])dnl -+_LT_DECL([], [AS], [1], [Assembler program])dnl - - test -z "$DLLTOOL" && DLLTOOL=dlltool --_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl -+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl - - test -z "$OBJDUMP" && OBJDUMP=objdump --_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl -+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl - ])# win32-dll - - AU_DEFUN([AC_LIBTOOL_WIN32_DLL], -diff -Nur strongswan-4.4.1.orig/m4/config/ltversion.m4 strongswan-4.4.1/m4/config/ltversion.m4 ---- strongswan-4.4.1.orig/m4/config/ltversion.m4 2010-01-06 11:24:25.000000000 +0100 -+++ strongswan-4.4.1/m4/config/ltversion.m4 2010-07-31 21:12:25.544503719 +0200 -@@ -9,15 +9,15 @@ - - # Generated from ltversion.in. - --# serial 3017 ltversion.m4 -+# serial 3216 ltversion.m4 - # This file is part of GNU Libtool - --m4_define([LT_PACKAGE_VERSION], [2.2.6b]) --m4_define([LT_PACKAGE_REVISION], [1.3017]) -+m4_define([LT_PACKAGE_VERSION], [2.2.11a]) -+m4_define([LT_PACKAGE_REVISION], [1.3216]) - - AC_DEFUN([LTVERSION_VERSION], --[macro_version='2.2.6b' --macro_revision='1.3017' -+[macro_version='2.2.11a' -+macro_revision='1.3216' - _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) - _LT_DECL(, macro_revision, 0) - ]) -diff -Nur strongswan-4.4.1.orig/Makefile.in strongswan-4.4.1/Makefile.in ---- strongswan-4.4.1.orig/Makefile.in 2010-07-29 20:11:18.000000000 +0200 -+++ strongswan-4.4.1/Makefile.in 2010-07-31 21:12:58.824502787 +0200 -@@ -127,6 +127,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -154,6 +155,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -234,7 +236,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/scripts/Makefile.in strongswan-4.4.1/scripts/Makefile.in ---- strongswan-4.4.1.orig/scripts/Makefile.in 2010-07-29 20:11:10.000000000 +0200 -+++ strongswan-4.4.1/scripts/Makefile.in 2010-07-31 21:12:37.316499254 +0200 -@@ -124,6 +124,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -151,6 +152,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -231,7 +233,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/charon/Makefile.in strongswan-4.4.1/src/charon/Makefile.in ---- strongswan-4.4.1.orig/src/charon/Makefile.in 2010-07-29 20:11:10.000000000 +0200 -+++ strongswan-4.4.1/src/charon/Makefile.in 2010-07-31 21:12:38.156499541 +0200 -@@ -97,6 +97,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -124,6 +125,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -204,7 +206,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/checksum/Makefile.in strongswan-4.4.1/src/checksum/Makefile.in ---- strongswan-4.4.1.orig/src/checksum/Makefile.in 2010-07-29 20:11:11.000000000 +0200 -+++ strongswan-4.4.1/src/checksum/Makefile.in 2010-07-31 21:12:38.364502299 +0200 -@@ -135,6 +135,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -162,6 +163,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -242,7 +244,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/_copyright/Makefile.in strongswan-4.4.1/src/_copyright/Makefile.in ---- strongswan-4.4.1.orig/src/_copyright/Makefile.in 2010-07-29 20:11:10.000000000 +0200 -+++ strongswan-4.4.1/src/_copyright/Makefile.in 2010-07-31 21:12:37.668499672 +0200 -@@ -119,6 +119,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -146,6 +147,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -226,7 +228,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/dumm/Makefile.in strongswan-4.4.1/src/dumm/Makefile.in ---- strongswan-4.4.1.orig/src/dumm/Makefile.in 2010-07-29 20:11:11.000000000 +0200 -+++ strongswan-4.4.1/src/dumm/Makefile.in 2010-07-31 21:12:38.560499331 +0200 -@@ -124,6 +124,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -151,6 +152,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -231,7 +233,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/include/Makefile.in strongswan-4.4.1/src/include/Makefile.in ---- strongswan-4.4.1.orig/src/include/Makefile.in 2010-07-29 20:11:11.000000000 +0200 -+++ strongswan-4.4.1/src/include/Makefile.in 2010-07-31 21:12:38.696502118 +0200 -@@ -70,6 +70,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -97,6 +98,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -177,7 +179,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/ipsec/Makefile.in strongswan-4.4.1/src/ipsec/Makefile.in ---- strongswan-4.4.1.orig/src/ipsec/Makefile.in 2010-07-29 20:11:11.000000000 +0200 -+++ strongswan-4.4.1/src/ipsec/Makefile.in 2010-07-31 21:12:38.840499519 +0200 -@@ -98,6 +98,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -125,6 +126,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -205,7 +207,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/Makefile.in strongswan-4.4.1/src/libcharon/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/Makefile.in 2010-07-29 20:11:11.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/Makefile.in 2010-07-31 21:12:40.036506053 +0200 -@@ -437,6 +437,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -464,6 +465,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -544,7 +546,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/addrblock/Makefile.in strongswan-4.4.1/src/libcharon/plugins/addrblock/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/addrblock/Makefile.in 2010-07-29 20:11:11.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/addrblock/Makefile.in 2010-07-31 21:12:40.260499937 +0200 -@@ -121,6 +121,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -148,6 +149,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -228,7 +230,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/android/Makefile.in strongswan-4.4.1/src/libcharon/plugins/android/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/android/Makefile.in 2010-07-29 20:11:11.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/android/Makefile.in 2010-07-31 21:12:40.480499758 +0200 -@@ -121,6 +121,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -148,6 +149,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -228,7 +230,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/dhcp/Makefile.in strongswan-4.4.1/src/libcharon/plugins/dhcp/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/dhcp/Makefile.in 2010-07-29 20:11:11.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/dhcp/Makefile.in 2010-07-31 21:12:40.680499803 +0200 -@@ -118,6 +118,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -145,6 +146,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -225,7 +227,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/eap_aka/Makefile.in strongswan-4.4.1/src/libcharon/plugins/eap_aka/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/eap_aka/Makefile.in 2010-07-29 20:11:11.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/eap_aka/Makefile.in 2010-07-31 21:12:40.856500721 +0200 -@@ -121,6 +121,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -148,6 +149,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -228,7 +230,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/eap_aka_3gpp2/Makefile.in strongswan-4.4.1/src/libcharon/plugins/eap_aka_3gpp2/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/eap_aka_3gpp2/Makefile.in 2010-07-29 20:11:12.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/eap_aka_3gpp2/Makefile.in 2010-07-31 21:12:41.032499956 +0200 -@@ -122,6 +122,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -149,6 +150,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -229,7 +231,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/eap_gtc/Makefile.in strongswan-4.4.1/src/libcharon/plugins/eap_gtc/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/eap_gtc/Makefile.in 2010-07-29 20:11:12.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/eap_gtc/Makefile.in 2010-07-31 21:12:41.200500113 +0200 -@@ -119,6 +119,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -146,6 +147,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -226,7 +228,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/eap_identity/Makefile.in strongswan-4.4.1/src/libcharon/plugins/eap_identity/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/eap_identity/Makefile.in 2010-07-29 20:11:12.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/eap_identity/Makefile.in 2010-07-31 21:12:41.372501083 +0200 -@@ -121,6 +121,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -148,6 +149,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -228,7 +230,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/eap_md5/Makefile.in strongswan-4.4.1/src/libcharon/plugins/eap_md5/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/eap_md5/Makefile.in 2010-07-29 20:11:12.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/eap_md5/Makefile.in 2010-07-31 21:12:41.540499299 +0200 -@@ -119,6 +119,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -146,6 +147,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -226,7 +228,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/eap_mschapv2/Makefile.in strongswan-4.4.1/src/libcharon/plugins/eap_mschapv2/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/eap_mschapv2/Makefile.in 2010-07-29 20:11:12.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/eap_mschapv2/Makefile.in 2010-07-31 21:12:41.728502003 +0200 -@@ -121,6 +121,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -148,6 +149,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -228,7 +230,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/eap_radius/Makefile.in strongswan-4.4.1/src/libcharon/plugins/eap_radius/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/eap_radius/Makefile.in 2010-07-29 20:11:12.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/eap_radius/Makefile.in 2010-07-31 21:12:41.960500283 +0200 -@@ -122,6 +122,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -149,6 +150,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -229,7 +231,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/eap_sim/Makefile.in strongswan-4.4.1/src/libcharon/plugins/eap_sim/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/eap_sim/Makefile.in 2010-07-29 20:11:12.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/eap_sim/Makefile.in 2010-07-31 21:12:42.212502758 +0200 -@@ -121,6 +121,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -148,6 +149,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -228,7 +230,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/eap_simaka_pseudonym/Makefile.in strongswan-4.4.1/src/libcharon/plugins/eap_simaka_pseudonym/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/eap_simaka_pseudonym/Makefile.in 2010-07-29 20:11:12.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/eap_simaka_pseudonym/Makefile.in 2010-07-31 21:12:42.688501100 +0200 -@@ -123,6 +123,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -150,6 +151,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -230,7 +232,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/eap_simaka_reauth/Makefile.in strongswan-4.4.1/src/libcharon/plugins/eap_simaka_reauth/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/eap_simaka_reauth/Makefile.in 2010-07-29 20:11:12.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/eap_simaka_reauth/Makefile.in 2010-07-31 21:12:42.900499902 +0200 -@@ -122,6 +122,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -149,6 +150,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -229,7 +231,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/eap_simaka_sql/Makefile.in strongswan-4.4.1/src/libcharon/plugins/eap_simaka_sql/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/eap_simaka_sql/Makefile.in 2010-07-29 20:11:12.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/eap_simaka_sql/Makefile.in 2010-07-31 21:12:43.116501713 +0200 -@@ -121,6 +121,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -148,6 +149,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -228,7 +230,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/eap_sim_file/Makefile.in strongswan-4.4.1/src/libcharon/plugins/eap_sim_file/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/eap_sim_file/Makefile.in 2010-07-29 20:11:12.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/eap_sim_file/Makefile.in 2010-07-31 21:12:42.448500151 +0200 -@@ -122,6 +122,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -149,6 +150,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -229,7 +231,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/farp/Makefile.in strongswan-4.4.1/src/libcharon/plugins/farp/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/farp/Makefile.in 2010-07-29 20:11:12.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/farp/Makefile.in 2010-07-31 21:12:43.600513644 +0200 -@@ -118,6 +118,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -145,6 +146,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -225,7 +227,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/ha/Makefile.in strongswan-4.4.1/src/libcharon/plugins/ha/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/ha/Makefile.in 2010-07-29 20:11:12.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/ha/Makefile.in 2010-07-31 21:12:43.784499924 +0200 -@@ -120,6 +120,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -147,6 +148,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -227,7 +229,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/kernel_klips/Makefile.in strongswan-4.4.1/src/libcharon/plugins/kernel_klips/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/kernel_klips/Makefile.in 2010-07-29 20:11:12.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/kernel_klips/Makefile.in 2010-07-31 21:12:44.110776392 +0200 -@@ -121,6 +121,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -148,6 +149,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -228,7 +230,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/kernel_netlink/Makefile.in strongswan-4.4.1/src/libcharon/plugins/kernel_netlink/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/kernel_netlink/Makefile.in 2010-07-29 20:11:13.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/kernel_netlink/Makefile.in 2010-07-31 21:12:44.284499918 +0200 -@@ -122,6 +122,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -149,6 +150,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -229,7 +231,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/kernel_pfkey/Makefile.in strongswan-4.4.1/src/libcharon/plugins/kernel_pfkey/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/kernel_pfkey/Makefile.in 2010-07-29 20:11:13.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/kernel_pfkey/Makefile.in 2010-07-31 21:12:44.456499769 +0200 -@@ -121,6 +121,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -148,6 +149,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -228,7 +230,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/kernel_pfroute/Makefile.in strongswan-4.4.1/src/libcharon/plugins/kernel_pfroute/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/kernel_pfroute/Makefile.in 2010-07-29 20:11:13.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/kernel_pfroute/Makefile.in 2010-07-31 21:12:44.628500443 +0200 -@@ -121,6 +121,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -148,6 +149,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -228,7 +230,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/load_tester/Makefile.in strongswan-4.4.1/src/libcharon/plugins/load_tester/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/load_tester/Makefile.in 2010-07-29 20:11:13.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/load_tester/Makefile.in 2010-07-31 21:12:44.800499446 +0200 -@@ -123,6 +123,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -150,6 +151,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -230,7 +232,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/medcli/Makefile.in strongswan-4.4.1/src/libcharon/plugins/medcli/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/medcli/Makefile.in 2010-07-29 20:11:13.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/medcli/Makefile.in 2010-07-31 21:12:45.000500627 +0200 -@@ -120,6 +120,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -147,6 +148,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -227,7 +229,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/medsrv/Makefile.in strongswan-4.4.1/src/libcharon/plugins/medsrv/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/medsrv/Makefile.in 2010-07-29 20:11:13.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/medsrv/Makefile.in 2010-07-31 21:12:45.326366147 +0200 -@@ -120,6 +120,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -147,6 +148,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -227,7 +229,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/nm/Makefile.in strongswan-4.4.1/src/libcharon/plugins/nm/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/nm/Makefile.in 2010-07-29 20:11:13.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/nm/Makefile.in 2010-07-31 21:12:45.536499063 +0200 -@@ -119,6 +119,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -146,6 +147,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -226,7 +228,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/smp/Makefile.in strongswan-4.4.1/src/libcharon/plugins/smp/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/smp/Makefile.in 2010-07-29 20:11:13.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/smp/Makefile.in 2010-07-31 21:12:45.740499619 +0200 -@@ -118,6 +118,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -145,6 +146,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -225,7 +227,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/socket_default/Makefile.in strongswan-4.4.1/src/libcharon/plugins/socket_default/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/socket_default/Makefile.in 2010-07-29 20:11:13.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/socket_default/Makefile.in 2010-07-31 21:12:46.084499865 +0200 -@@ -121,6 +121,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -148,6 +149,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -228,7 +230,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/socket_dynamic/Makefile.in strongswan-4.4.1/src/libcharon/plugins/socket_dynamic/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/socket_dynamic/Makefile.in 2010-07-29 20:11:13.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/socket_dynamic/Makefile.in 2010-07-31 21:12:46.527245082 +0200 -@@ -121,6 +121,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -148,6 +149,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -228,7 +230,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/socket_raw/Makefile.in strongswan-4.4.1/src/libcharon/plugins/socket_raw/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/socket_raw/Makefile.in 2010-07-29 20:11:13.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/socket_raw/Makefile.in 2010-07-31 21:12:46.720499855 +0200 -@@ -121,6 +121,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -148,6 +149,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -228,7 +230,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/sql/Makefile.in strongswan-4.4.1/src/libcharon/plugins/sql/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/sql/Makefile.in 2010-07-29 20:11:13.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/sql/Makefile.in 2010-07-31 21:12:46.920501044 +0200 -@@ -118,6 +118,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -145,6 +146,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -225,7 +227,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/stroke/Makefile.in strongswan-4.4.1/src/libcharon/plugins/stroke/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/stroke/Makefile.in 2010-07-29 20:11:13.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/stroke/Makefile.in 2010-07-31 21:12:47.120501656 +0200 -@@ -121,6 +121,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -148,6 +149,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -228,7 +230,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/uci/Makefile.in strongswan-4.4.1/src/libcharon/plugins/uci/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/uci/Makefile.in 2010-07-29 20:11:13.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/uci/Makefile.in 2010-07-31 21:12:47.308506611 +0200 -@@ -118,6 +118,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -145,6 +146,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -225,7 +227,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/unit_tester/Makefile.in strongswan-4.4.1/src/libcharon/plugins/unit_tester/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/unit_tester/Makefile.in 2010-07-29 20:11:14.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/unit_tester/Makefile.in 2010-07-31 21:12:47.592502286 +0200 -@@ -124,6 +124,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -151,6 +152,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -231,7 +233,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libcharon/plugins/updown/Makefile.in strongswan-4.4.1/src/libcharon/plugins/updown/Makefile.in ---- strongswan-4.4.1.orig/src/libcharon/plugins/updown/Makefile.in 2010-07-29 20:11:14.000000000 +0200 -+++ strongswan-4.4.1/src/libcharon/plugins/updown/Makefile.in 2010-07-31 21:12:47.776501418 +0200 -@@ -120,6 +120,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -147,6 +148,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -227,7 +229,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libfast/Makefile.in strongswan-4.4.1/src/libfast/Makefile.in ---- strongswan-4.4.1.orig/src/libfast/Makefile.in 2010-07-29 20:11:14.000000000 +0200 -+++ strongswan-4.4.1/src/libfast/Makefile.in 2010-07-31 21:12:47.956499494 +0200 -@@ -115,6 +115,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -142,6 +143,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -222,7 +224,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libfreeswan/Makefile.in strongswan-4.4.1/src/libfreeswan/Makefile.in ---- strongswan-4.4.1.orig/src/libfreeswan/Makefile.in 2010-07-29 20:11:14.000000000 +0200 -+++ strongswan-4.4.1/src/libfreeswan/Makefile.in 2010-07-31 21:12:48.180503993 +0200 -@@ -132,6 +132,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -159,6 +160,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -239,7 +241,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libhydra/Makefile.in strongswan-4.4.1/src/libhydra/Makefile.in ---- strongswan-4.4.1.orig/src/libhydra/Makefile.in 2010-07-29 20:11:14.000000000 +0200 -+++ strongswan-4.4.1/src/libhydra/Makefile.in 2010-07-31 21:12:48.400502695 +0200 -@@ -158,6 +158,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -185,6 +186,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -265,7 +267,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libhydra/plugins/attr/Makefile.in strongswan-4.4.1/src/libhydra/plugins/attr/Makefile.in ---- strongswan-4.4.1.orig/src/libhydra/plugins/attr/Makefile.in 2010-07-29 20:11:14.000000000 +0200 -+++ strongswan-4.4.1/src/libhydra/plugins/attr/Makefile.in 2010-07-31 21:12:48.572500859 +0200 -@@ -117,6 +117,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -144,6 +145,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -224,7 +226,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libhydra/plugins/attr_sql/Makefile.in strongswan-4.4.1/src/libhydra/plugins/attr_sql/Makefile.in ---- strongswan-4.4.1.orig/src/libhydra/plugins/attr_sql/Makefile.in 2010-07-29 20:11:14.000000000 +0200 -+++ strongswan-4.4.1/src/libhydra/plugins/attr_sql/Makefile.in 2010-07-31 21:12:48.760499657 +0200 -@@ -130,6 +130,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -157,6 +158,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -237,7 +239,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libhydra/plugins/resolve/Makefile.in strongswan-4.4.1/src/libhydra/plugins/resolve/Makefile.in ---- strongswan-4.4.1.orig/src/libhydra/plugins/resolve/Makefile.in 2010-07-29 20:11:14.000000000 +0200 -+++ strongswan-4.4.1/src/libhydra/plugins/resolve/Makefile.in 2010-07-31 21:12:48.960499724 +0200 -@@ -120,6 +120,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -147,6 +148,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -227,7 +229,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libsimaka/Makefile.in strongswan-4.4.1/src/libsimaka/Makefile.in ---- strongswan-4.4.1.orig/src/libsimaka/Makefile.in 2010-07-29 20:11:14.000000000 +0200 -+++ strongswan-4.4.1/src/libsimaka/Makefile.in 2010-07-31 21:12:49.144499410 +0200 -@@ -90,6 +90,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -117,6 +118,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -197,7 +199,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libstrongswan/Makefile.in strongswan-4.4.1/src/libstrongswan/Makefile.in ---- strongswan-4.4.1.orig/src/libstrongswan/Makefile.in 2010-07-29 20:11:15.000000000 +0200 -+++ strongswan-4.4.1/src/libstrongswan/Makefile.in 2010-07-31 21:12:49.848505008 +0200 -@@ -311,6 +311,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -338,6 +339,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -418,7 +420,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libstrongswan/plugins/aes/Makefile.in strongswan-4.4.1/src/libstrongswan/plugins/aes/Makefile.in ---- strongswan-4.4.1.orig/src/libstrongswan/plugins/aes/Makefile.in 2010-07-29 20:11:15.000000000 +0200 -+++ strongswan-4.4.1/src/libstrongswan/plugins/aes/Makefile.in 2010-07-31 21:12:50.060502962 +0200 -@@ -117,6 +117,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -144,6 +145,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -224,7 +226,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libstrongswan/plugins/agent/Makefile.in strongswan-4.4.1/src/libstrongswan/plugins/agent/Makefile.in ---- strongswan-4.4.1.orig/src/libstrongswan/plugins/agent/Makefile.in 2010-07-29 20:11:15.000000000 +0200 -+++ strongswan-4.4.1/src/libstrongswan/plugins/agent/Makefile.in 2010-07-31 21:12:50.264500726 +0200 -@@ -119,6 +119,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -146,6 +147,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -226,7 +228,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libstrongswan/plugins/blowfish/Makefile.in strongswan-4.4.1/src/libstrongswan/plugins/blowfish/Makefile.in ---- strongswan-4.4.1.orig/src/libstrongswan/plugins/blowfish/Makefile.in 2010-07-29 20:11:15.000000000 +0200 -+++ strongswan-4.4.1/src/libstrongswan/plugins/blowfish/Makefile.in 2010-07-31 21:12:50.456499773 +0200 -@@ -121,6 +121,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -148,6 +149,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -228,7 +230,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libstrongswan/plugins/curl/Makefile.in strongswan-4.4.1/src/libstrongswan/plugins/curl/Makefile.in ---- strongswan-4.4.1.orig/src/libstrongswan/plugins/curl/Makefile.in 2010-07-29 20:11:15.000000000 +0200 -+++ strongswan-4.4.1/src/libstrongswan/plugins/curl/Makefile.in 2010-07-31 21:12:50.692500212 +0200 -@@ -117,6 +117,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -144,6 +145,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -224,7 +226,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libstrongswan/plugins/des/Makefile.in strongswan-4.4.1/src/libstrongswan/plugins/des/Makefile.in ---- strongswan-4.4.1.orig/src/libstrongswan/plugins/des/Makefile.in 2010-07-29 20:11:15.000000000 +0200 -+++ strongswan-4.4.1/src/libstrongswan/plugins/des/Makefile.in 2010-07-31 21:12:50.924499887 +0200 -@@ -117,6 +117,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -144,6 +145,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -224,7 +226,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libstrongswan/plugins/dnskey/Makefile.in strongswan-4.4.1/src/libstrongswan/plugins/dnskey/Makefile.in ---- strongswan-4.4.1.orig/src/libstrongswan/plugins/dnskey/Makefile.in 2010-07-29 20:11:15.000000000 +0200 -+++ strongswan-4.4.1/src/libstrongswan/plugins/dnskey/Makefile.in 2010-07-31 21:12:51.144502483 +0200 -@@ -120,6 +120,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -147,6 +148,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -227,7 +229,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libstrongswan/plugins/fips_prf/Makefile.in strongswan-4.4.1/src/libstrongswan/plugins/fips_prf/Makefile.in ---- strongswan-4.4.1.orig/src/libstrongswan/plugins/fips_prf/Makefile.in 2010-07-29 20:11:15.000000000 +0200 -+++ strongswan-4.4.1/src/libstrongswan/plugins/fips_prf/Makefile.in 2010-07-31 21:12:51.316499533 +0200 -@@ -120,6 +120,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -147,6 +148,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -227,7 +229,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libstrongswan/plugins/gcrypt/Makefile.in strongswan-4.4.1/src/libstrongswan/plugins/gcrypt/Makefile.in ---- strongswan-4.4.1.orig/src/libstrongswan/plugins/gcrypt/Makefile.in 2010-07-29 20:11:15.000000000 +0200 -+++ strongswan-4.4.1/src/libstrongswan/plugins/gcrypt/Makefile.in 2010-07-31 21:12:51.512499923 +0200 -@@ -121,6 +121,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -148,6 +149,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -228,7 +230,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libstrongswan/plugins/gmp/Makefile.in strongswan-4.4.1/src/libstrongswan/plugins/gmp/Makefile.in ---- strongswan-4.4.1.orig/src/libstrongswan/plugins/gmp/Makefile.in 2010-07-29 20:11:15.000000000 +0200 -+++ strongswan-4.4.1/src/libstrongswan/plugins/gmp/Makefile.in 2010-07-31 21:12:51.736499949 +0200 -@@ -118,6 +118,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -145,6 +146,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -225,7 +227,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libstrongswan/plugins/hmac/Makefile.in strongswan-4.4.1/src/libstrongswan/plugins/hmac/Makefile.in ---- strongswan-4.4.1.orig/src/libstrongswan/plugins/hmac/Makefile.in 2010-07-29 20:11:15.000000000 +0200 -+++ strongswan-4.4.1/src/libstrongswan/plugins/hmac/Makefile.in 2010-07-31 21:12:51.992503241 +0200 -@@ -118,6 +118,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -145,6 +146,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -225,7 +227,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libstrongswan/plugins/ldap/Makefile.in strongswan-4.4.1/src/libstrongswan/plugins/ldap/Makefile.in ---- strongswan-4.4.1.orig/src/libstrongswan/plugins/ldap/Makefile.in 2010-07-29 20:11:15.000000000 +0200 -+++ strongswan-4.4.1/src/libstrongswan/plugins/ldap/Makefile.in 2010-07-31 21:12:52.208500572 +0200 -@@ -117,6 +117,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -144,6 +145,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -224,7 +226,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libstrongswan/plugins/md4/Makefile.in strongswan-4.4.1/src/libstrongswan/plugins/md4/Makefile.in ---- strongswan-4.4.1.orig/src/libstrongswan/plugins/md4/Makefile.in 2010-07-29 20:11:15.000000000 +0200 -+++ strongswan-4.4.1/src/libstrongswan/plugins/md4/Makefile.in 2010-07-31 21:12:52.424499887 +0200 -@@ -117,6 +117,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -144,6 +145,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -224,7 +226,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libstrongswan/plugins/md5/Makefile.in strongswan-4.4.1/src/libstrongswan/plugins/md5/Makefile.in ---- strongswan-4.4.1.orig/src/libstrongswan/plugins/md5/Makefile.in 2010-07-29 20:11:15.000000000 +0200 -+++ strongswan-4.4.1/src/libstrongswan/plugins/md5/Makefile.in 2010-07-31 21:12:52.624503289 +0200 -@@ -117,6 +117,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -144,6 +145,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -224,7 +226,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libstrongswan/plugins/mysql/Makefile.in strongswan-4.4.1/src/libstrongswan/plugins/mysql/Makefile.in ---- strongswan-4.4.1.orig/src/libstrongswan/plugins/mysql/Makefile.in 2010-07-29 20:11:16.000000000 +0200 -+++ strongswan-4.4.1/src/libstrongswan/plugins/mysql/Makefile.in 2010-07-31 21:12:52.820500881 +0200 -@@ -119,6 +119,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -146,6 +147,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -226,7 +228,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libstrongswan/plugins/openssl/Makefile.in strongswan-4.4.1/src/libstrongswan/plugins/openssl/Makefile.in ---- strongswan-4.4.1.orig/src/libstrongswan/plugins/openssl/Makefile.in 2010-07-29 20:11:16.000000000 +0200 -+++ strongswan-4.4.1/src/libstrongswan/plugins/openssl/Makefile.in 2010-07-31 21:12:53.032499955 +0200 -@@ -124,6 +124,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -151,6 +152,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -231,7 +233,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libstrongswan/plugins/padlock/Makefile.in strongswan-4.4.1/src/libstrongswan/plugins/padlock/Makefile.in ---- strongswan-4.4.1.orig/src/libstrongswan/plugins/padlock/Makefile.in 2010-07-29 20:11:16.000000000 +0200 -+++ strongswan-4.4.1/src/libstrongswan/plugins/padlock/Makefile.in 2010-07-31 21:12:53.264500167 +0200 -@@ -120,6 +120,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -147,6 +148,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -227,7 +229,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libstrongswan/plugins/pem/Makefile.in strongswan-4.4.1/src/libstrongswan/plugins/pem/Makefile.in ---- strongswan-4.4.1.orig/src/libstrongswan/plugins/pem/Makefile.in 2010-07-29 20:11:16.000000000 +0200 -+++ strongswan-4.4.1/src/libstrongswan/plugins/pem/Makefile.in 2010-07-31 21:12:53.475691043 +0200 -@@ -118,6 +118,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -145,6 +146,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -225,7 +227,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libstrongswan/plugins/pgp/Makefile.in strongswan-4.4.1/src/libstrongswan/plugins/pgp/Makefile.in ---- strongswan-4.4.1.orig/src/libstrongswan/plugins/pgp/Makefile.in 2010-07-29 20:11:16.000000000 +0200 -+++ strongswan-4.4.1/src/libstrongswan/plugins/pgp/Makefile.in 2010-07-31 21:12:53.716501870 +0200 -@@ -118,6 +118,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -145,6 +146,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -225,7 +227,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libstrongswan/plugins/pkcs1/Makefile.in strongswan-4.4.1/src/libstrongswan/plugins/pkcs1/Makefile.in ---- strongswan-4.4.1.orig/src/libstrongswan/plugins/pkcs1/Makefile.in 2010-07-29 20:11:16.000000000 +0200 -+++ strongswan-4.4.1/src/libstrongswan/plugins/pkcs1/Makefile.in 2010-07-31 21:12:54.024498928 +0200 -@@ -119,6 +119,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -146,6 +147,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -226,7 +228,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libstrongswan/plugins/pubkey/Makefile.in strongswan-4.4.1/src/libstrongswan/plugins/pubkey/Makefile.in ---- strongswan-4.4.1.orig/src/libstrongswan/plugins/pubkey/Makefile.in 2010-07-29 20:11:16.000000000 +0200 -+++ strongswan-4.4.1/src/libstrongswan/plugins/pubkey/Makefile.in 2010-07-31 21:12:54.240499897 +0200 -@@ -119,6 +119,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -146,6 +147,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -226,7 +228,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libstrongswan/plugins/random/Makefile.in strongswan-4.4.1/src/libstrongswan/plugins/random/Makefile.in ---- strongswan-4.4.1.orig/src/libstrongswan/plugins/random/Makefile.in 2010-07-29 20:11:16.000000000 +0200 -+++ strongswan-4.4.1/src/libstrongswan/plugins/random/Makefile.in 2010-07-31 21:12:54.472499574 +0200 -@@ -119,6 +119,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -146,6 +147,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -226,7 +228,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libstrongswan/plugins/revocation/Makefile.in strongswan-4.4.1/src/libstrongswan/plugins/revocation/Makefile.in ---- strongswan-4.4.1.orig/src/libstrongswan/plugins/revocation/Makefile.in 2010-07-29 20:11:16.000000000 +0200 -+++ strongswan-4.4.1/src/libstrongswan/plugins/revocation/Makefile.in 2010-07-31 21:12:54.688500819 +0200 -@@ -121,6 +121,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -148,6 +149,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -228,7 +230,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libstrongswan/plugins/sha1/Makefile.in strongswan-4.4.1/src/libstrongswan/plugins/sha1/Makefile.in ---- strongswan-4.4.1.orig/src/libstrongswan/plugins/sha1/Makefile.in 2010-07-29 20:11:16.000000000 +0200 -+++ strongswan-4.4.1/src/libstrongswan/plugins/sha1/Makefile.in 2010-07-31 21:12:54.868499735 +0200 -@@ -118,6 +118,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -145,6 +146,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -225,7 +227,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libstrongswan/plugins/sha2/Makefile.in strongswan-4.4.1/src/libstrongswan/plugins/sha2/Makefile.in ---- strongswan-4.4.1.orig/src/libstrongswan/plugins/sha2/Makefile.in 2010-07-29 20:11:16.000000000 +0200 -+++ strongswan-4.4.1/src/libstrongswan/plugins/sha2/Makefile.in 2010-07-31 21:12:55.100502189 +0200 -@@ -117,6 +117,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -144,6 +145,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -224,7 +226,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libstrongswan/plugins/sqlite/Makefile.in strongswan-4.4.1/src/libstrongswan/plugins/sqlite/Makefile.in ---- strongswan-4.4.1.orig/src/libstrongswan/plugins/sqlite/Makefile.in 2010-07-29 20:11:16.000000000 +0200 -+++ strongswan-4.4.1/src/libstrongswan/plugins/sqlite/Makefile.in 2010-07-31 21:12:55.272499790 +0200 -@@ -120,6 +120,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -147,6 +148,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -227,7 +229,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libstrongswan/plugins/test_vectors/Makefile.in strongswan-4.4.1/src/libstrongswan/plugins/test_vectors/Makefile.in ---- strongswan-4.4.1.orig/src/libstrongswan/plugins/test_vectors/Makefile.in 2010-07-29 20:11:17.000000000 +0200 -+++ strongswan-4.4.1/src/libstrongswan/plugins/test_vectors/Makefile.in 2010-07-31 21:12:55.700499833 +0200 -@@ -124,6 +124,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -151,6 +152,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -231,7 +233,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libstrongswan/plugins/x509/Makefile.in strongswan-4.4.1/src/libstrongswan/plugins/x509/Makefile.in ---- strongswan-4.4.1.orig/src/libstrongswan/plugins/x509/Makefile.in 2010-07-29 20:11:17.000000000 +0200 -+++ strongswan-4.4.1/src/libstrongswan/plugins/x509/Makefile.in 2010-07-31 21:12:55.944500479 +0200 -@@ -119,6 +119,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -146,6 +147,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -226,7 +228,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/libstrongswan/plugins/xcbc/Makefile.in strongswan-4.4.1/src/libstrongswan/plugins/xcbc/Makefile.in ---- strongswan-4.4.1.orig/src/libstrongswan/plugins/xcbc/Makefile.in 2010-07-29 20:11:17.000000000 +0200 -+++ strongswan-4.4.1/src/libstrongswan/plugins/xcbc/Makefile.in 2010-07-31 21:12:56.124499378 +0200 -@@ -118,6 +118,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -145,6 +146,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -225,7 +227,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/Makefile.in strongswan-4.4.1/src/Makefile.in ---- strongswan-4.4.1.orig/src/Makefile.in 2010-07-29 20:11:10.000000000 +0200 -+++ strongswan-4.4.1/src/Makefile.in 2010-07-31 21:12:37.492499331 +0200 -@@ -127,6 +127,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -154,6 +155,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -234,7 +236,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/manager/Makefile.in strongswan-4.4.1/src/manager/Makefile.in ---- strongswan-4.4.1.orig/src/manager/Makefile.in 2010-07-29 20:11:17.000000000 +0200 -+++ strongswan-4.4.1/src/manager/Makefile.in 2010-07-31 21:12:56.436499460 +0200 -@@ -134,6 +134,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -161,6 +162,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -241,7 +243,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/medsrv/Makefile.in strongswan-4.4.1/src/medsrv/Makefile.in ---- strongswan-4.4.1.orig/src/medsrv/Makefile.in 2010-07-29 20:11:17.000000000 +0200 -+++ strongswan-4.4.1/src/medsrv/Makefile.in 2010-07-31 21:12:56.680499523 +0200 -@@ -124,6 +124,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -151,6 +152,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -231,7 +233,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/openac/Makefile.in strongswan-4.4.1/src/openac/Makefile.in ---- strongswan-4.4.1.orig/src/openac/Makefile.in 2010-07-29 20:11:17.000000000 +0200 -+++ strongswan-4.4.1/src/openac/Makefile.in 2010-07-31 21:12:56.900500181 +0200 -@@ -118,6 +118,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -145,6 +146,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -225,7 +227,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/pki/Makefile.in strongswan-4.4.1/src/pki/Makefile.in ---- strongswan-4.4.1.orig/src/pki/Makefile.in 2010-07-29 20:11:17.000000000 +0200 -+++ strongswan-4.4.1/src/pki/Makefile.in 2010-07-31 21:12:57.224502610 +0200 -@@ -95,6 +95,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -122,6 +123,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -202,7 +204,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/pluto/Makefile.in strongswan-4.4.1/src/pluto/Makefile.in ---- strongswan-4.4.1.orig/src/pluto/Makefile.in 2010-07-29 20:11:17.000000000 +0200 -+++ strongswan-4.4.1/src/pluto/Makefile.in 2010-07-31 21:12:57.460501959 +0200 -@@ -204,6 +204,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -231,6 +232,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -311,7 +313,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/pluto/plugins/xauth/Makefile.in strongswan-4.4.1/src/pluto/plugins/xauth/Makefile.in ---- strongswan-4.4.1.orig/src/pluto/plugins/xauth/Makefile.in 2010-07-29 20:11:17.000000000 +0200 -+++ strongswan-4.4.1/src/pluto/plugins/xauth/Makefile.in 2010-07-31 21:12:57.692502727 +0200 -@@ -116,6 +116,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -143,6 +144,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -223,7 +225,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/scepclient/Makefile.in strongswan-4.4.1/src/scepclient/Makefile.in ---- strongswan-4.4.1.orig/src/scepclient/Makefile.in 2010-07-29 20:11:17.000000000 +0200 -+++ strongswan-4.4.1/src/scepclient/Makefile.in 2010-07-31 21:12:57.888500328 +0200 -@@ -126,6 +126,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -153,6 +154,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -233,7 +235,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/starter/Makefile.in strongswan-4.4.1/src/starter/Makefile.in ---- strongswan-4.4.1.orig/src/starter/Makefile.in 2010-07-29 20:11:17.000000000 +0200 -+++ strongswan-4.4.1/src/starter/Makefile.in 2010-07-31 21:12:58.088502617 +0200 -@@ -131,6 +131,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -158,6 +159,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -238,7 +240,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/stroke/Makefile.in strongswan-4.4.1/src/stroke/Makefile.in ---- strongswan-4.4.1.orig/src/stroke/Makefile.in 2010-07-29 20:11:17.000000000 +0200 -+++ strongswan-4.4.1/src/stroke/Makefile.in 2010-07-31 21:12:58.332502689 +0200 -@@ -95,6 +95,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -122,6 +123,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -202,7 +204,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/_updown/Makefile.in strongswan-4.4.1/src/_updown/Makefile.in ---- strongswan-4.4.1.orig/src/_updown/Makefile.in 2010-07-29 20:11:10.000000000 +0200 -+++ strongswan-4.4.1/src/_updown/Makefile.in 2010-07-31 21:12:37.828499387 +0200 -@@ -98,6 +98,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -125,6 +126,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -205,7 +207,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/_updown_espmark/Makefile.in strongswan-4.4.1/src/_updown_espmark/Makefile.in ---- strongswan-4.4.1.orig/src/_updown_espmark/Makefile.in 2010-07-29 20:11:10.000000000 +0200 -+++ strongswan-4.4.1/src/_updown_espmark/Makefile.in 2010-07-31 21:12:37.988502453 +0200 -@@ -98,6 +98,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -125,6 +126,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -205,7 +207,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/src/whack/Makefile.in strongswan-4.4.1/src/whack/Makefile.in ---- strongswan-4.4.1.orig/src/whack/Makefile.in 2010-07-29 20:11:17.000000000 +0200 -+++ strongswan-4.4.1/src/whack/Makefile.in 2010-07-31 21:12:58.512500202 +0200 -@@ -94,6 +94,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -121,6 +122,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -201,7 +203,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ -diff -Nur strongswan-4.4.1.orig/testing/Makefile.in strongswan-4.4.1/testing/Makefile.in ---- strongswan-4.4.1.orig/testing/Makefile.in 2010-07-29 20:11:18.000000000 +0200 -+++ strongswan-4.4.1/testing/Makefile.in 2010-07-31 21:12:58.660500888 +0200 -@@ -73,6 +73,7 @@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ - DLLIB = @DLLIB@ -+DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ -@@ -100,6 +101,7 @@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ - MYSQLCFLAG = @MYSQLCFLAG@ - MYSQLCONFIG = @MYSQLCONFIG@ -@@ -180,7 +182,6 @@ - linux_headers = @linux_headers@ - localedir = @localedir@ - localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - nm_CFLAGS = @nm_CFLAGS@ diff --git a/package/strongswan/patches/patch-src_pluto_adns_c b/package/strongswan/patches/patch-src_pluto_adns_c new file mode 100644 index 000000000..49043fb1b --- /dev/null +++ b/package/strongswan/patches/patch-src_pluto_adns_c @@ -0,0 +1,20 @@ +--- strongswan-4.5.0.orig/src/pluto/adns.c 2010-01-24 02:49:37.000000000 +0100 ++++ strongswan-4.5.0/src/pluto/adns.c 2010-12-30 20:25:54.000000000 +0100 +@@ -179,7 +179,8 @@ write_pipe(int fd, const unsigned char * + res_query(dname, class, type, answer, anslen) + # define res_nclose(statp) res_close() + +-static struct __res_state *statp = &_res; ++static struct __res_state *statp; ++//static struct __res_state *statp = &_res; + + #else /* !OLD_RESOLVER */ + +@@ -590,6 +591,7 @@ int + main(int argc UNUSED, char **argv) + { + int i = 1; ++ statp = &_res; + + name = argv[0]; + diff --git a/package/strongswan/patches/patch-src_pluto_alg_info_c b/package/strongswan/patches/patch-src_pluto_alg_info_c deleted file mode 100644 index 8c65188c2..000000000 --- a/package/strongswan/patches/patch-src_pluto_alg_info_c +++ /dev/null @@ -1,11 +0,0 @@ ---- strongswan-4.4.0.orig/src/pluto/alg_info.c 2010-03-15 21:52:51.000000000 +0100 -+++ strongswan-4.4.0/src/pluto/alg_info.c 2010-07-13 22:49:11.775081075 +0200 -@@ -414,7 +414,7 @@ struct alg_info_esp *alg_info_esp_create - alg_info_esp = malloc_thing (struct alg_info_esp); - zero(alg_info_esp); - -- pfs_name=index (alg_str, ';'); -+ pfs_name=strchr (alg_str, ';'); - if (pfs_name) - { - memcpy(esp_buf, alg_str, pfs_name-alg_str); diff --git a/package/strongswan/patches/patch-src_starter_interfaces_c b/package/strongswan/patches/patch-src_starter_interfaces_c deleted file mode 100644 index 80d774a2e..000000000 --- a/package/strongswan/patches/patch-src_starter_interfaces_c +++ /dev/null @@ -1,20 +0,0 @@ ---- strongswan-4.4.0.orig/src/starter/interfaces.c 2010-03-15 21:52:51.000000000 +0100 -+++ strongswan-4.4.0/src/starter/interfaces.c 2010-07-14 17:36:33.959074540 +0200 -@@ -56,7 +56,7 @@ get_defaultroute(defaultroute_t *default - ssize_t msglen; - int fd; - -- bzero(&rtu, sizeof(rtu)); -+ memset(&rtu, 0, sizeof(rtu)); - rtu.m.nh.nlmsg_len = NLMSG_LENGTH(sizeof(rtu.m.rt)); - rtu.m.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP; - rtu.m.nh.nlmsg_type = RTM_GETROUTE; -@@ -142,7 +142,7 @@ get_defaultroute(defaultroute_t *default - plog("could not open AF_INET socket"); - break; - } -- bzero(&req, sizeof(req)); -+ memset(&req, 0, sizeof(req)); - req.ifr_ifindex = iface_idx; - if (ioctl(fd, SIOCGIFNAME, &req) < 0 || - ioctl(fd, SIOCGIFADDR, &req) < 0) diff --git a/package/strongswan/patches/patch-src_starter_netkey_c b/package/strongswan/patches/patch-src_starter_netkey_c deleted file mode 100644 index eae417f7b..000000000 --- a/package/strongswan/patches/patch-src_starter_netkey_c +++ /dev/null @@ -1,19 +0,0 @@ ---- strongswan-4.4.0.orig/src/starter/netkey.c 2010-03-15 21:52:51.000000000 +0100 -+++ strongswan-4.4.0/src/starter/netkey.c 2010-07-14 19:05:06.911085736 +0200 -@@ -48,6 +48,8 @@ starter_netkey_init(void) - } - - /* make sure that all required IPsec modules are loaded */ -+ /* OpenADK loads all kernel modules already */ -+#if 0 - if (stat(PROC_MODULES, &stb) == 0) - { - ignore_result(system("modprobe -qv ah4")); -@@ -60,6 +62,7 @@ starter_netkey_init(void) - DBG(DBG_CONTROL, - DBG_log("Found netkey IPsec stack") - ) -+#endif - return TRUE; - } - diff --git a/package/subversion/Makefile b/package/subversion/Makefile index e255d4e95..7d1cb3cb1 100644 --- a/package/subversion/Makefile +++ b/package/subversion/Makefile @@ -18,8 +18,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,SUBVERSION,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ARGS+= --with-apr=${STAGING_DIR}/usr/bin/apr-1-config -CONFIGURE_ARGS+= --with-apr-util=${STAGING_DIR}/usr/bin/apr-1-config +CONFIGURE_ARGS+= --with-apr=${STAGING_TARGET_DIR}/usr/bin/apr-1-config +CONFIGURE_ARGS+= --with-apr-util=${STAGING_TARGET_DIR}/usr/bin/apr-1-config CONFIGURE_ARGS+= --disable-mod-activation CONFIGURE_ARGS+= --disable-keychain CONFIGURE_ARGS+= --without-apxs diff --git a/package/syslog-ng/Makefile b/package/syslog-ng/Makefile index 3aae8652f..bdc808e48 100644 --- a/package/syslog-ng/Makefile +++ b/package/syslog-ng/Makefile @@ -20,7 +20,7 @@ $(eval $(call PKG_template,SYSLOG_NG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},$ CONFIGURE_ARGS+= --enable-full-dynamic \ --enable-tcp-wrapper -CONFIGURE_ENV+= ac_cv_path_libol_config=${STAGING_DIR}/usr/bin +CONFIGURE_ENV+= ac_cv_path_libol_config=${STAGING_TARGET_DIR}/usr/bin CONFIGURE_ENV+= ac_cv_lib_nsl_gethostbyname=no post-install: diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile index 2eed511aa..5a25597b3 100644 --- a/package/tcpdump/Makefile +++ b/package/tcpdump/Makefile @@ -31,7 +31,7 @@ else CONFIGURE_ARGS+= --disable-ipv6 endif XAKE_FLAGS+= CCOPT="${TARGET_CFLAGS}" \ - INCLS="-I. -I${STAGING_DIR}/usr/include" + INCLS="-I. -I${STAGING_TARGET_DIR}/usr/include" post-install: ${INSTALL_DIR} ${IDIR_TCPDUMP}/usr/sbin diff --git a/package/tinc/Makefile b/package/tinc/Makefile index 3825cadcc..cad495fbe 100644 --- a/package/tinc/Makefile +++ b/package/tinc/Makefile @@ -19,8 +19,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,TINC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ARGS+= --with-kernel=${LINUX_DIR} \ - --with-zlib=${STAGING_DIR}/usr/ \ - --with-lzo-include=${STAGING_DIR}/usr/include/lzo + --with-zlib=${STAGING_TARGET_DIR}/usr/ \ + --with-lzo-include=${STAGING_TARGET_DIR}/usr/include/lzo post-install: ${INSTALL_DIR} ${IDIR_TINC}/usr/sbin diff --git a/package/tmsnc/Makefile b/package/tmsnc/Makefile index 1f46c4c67..decd64ef8 100644 --- a/package/tmsnc/Makefile +++ b/package/tmsnc/Makefile @@ -16,9 +16,9 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,TMSNC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ARGS+= --with-libiconv-prefix=${STAGING_DIR}/usr \ - --with-openssl=${STAGING_DIR}/usr \ - --with-ncurses=${STAGING_DIR} +CONFIGURE_ARGS+= --with-libiconv-prefix=${STAGING_TARGET_DIR}/usr \ + --with-openssl=${STAGING_TARGET_DIR}/usr \ + --with-ncurses=${STAGING_TARGET_DIR} post-install: ${INSTALL_DIR} ${IDIR_TMSNC}/usr/bin diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile index 1e9d844e3..5abe6456b 100644 --- a/package/tntnet/Makefile +++ b/package/tntnet/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --without-epoll \ --without-ssl CONFIGURE_ENV+= CXXFLAGS='${TCXXFLAGS}' \ - ac_cv_path_cxxtools_config=${STAGING_DIR}/usr/bin + ac_cv_path_cxxtools_config=${STAGING_TARGET_DIR}/usr/bin TLDFLAGS+= -ldl diff --git a/package/tor/Makefile b/package/tor/Makefile index 9e6b6f045..8bbdad072 100644 --- a/package/tor/Makefile +++ b/package/tor/Makefile @@ -20,8 +20,8 @@ $(eval $(call PKG_template,TOR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_D CONFIGURE_ENV+= ac_cv_libevent_normal=yes \ ac_cv_libevent_linker_option="" \ - ac_cv_libevent_dir="${STAGING_DIR}/usr" \ - ac_cv_openssldir="${STAGING_DIR}/usr" \ + ac_cv_libevent_dir="${STAGING_TARGET_DIR}/usr" \ + ac_cv_openssldir="${STAGING_TARGET_DIR}/usr" \ ac_cv_openssl_linker_option="" \ tor_cv_time_t_signed=yes \ tor_cv_null_is_zero=yes \ diff --git a/package/twm/Makefile b/package/twm/Makefile index 9412aeb5d..5883f1c8b 100644 --- a/package/twm/Makefile +++ b/package/twm/Makefile @@ -14,7 +14,7 @@ PKG_BUILDDEP:= xorg-server PKG_URL:= http://xorg.freedesktop.org/ PKG_SITES:= http://xorg.freedesktop.org/archive/individual/app/ -PKG_TARGET_DEPENDS:= !foxboard +PKG_ARCH_DEPENDS:= !cris include $(TOPDIR)/mk/package.mk diff --git a/package/uclibc++/Config.in.manual b/package/uclibc++/Config.in.manual index dbe311e13..50729fcaa 100644 --- a/package/uclibc++/Config.in.manual +++ b/package/uclibc++/Config.in.manual @@ -1,5 +1,5 @@ config ADK_PACKAGE_UCLIBCXX - prompt "uClibc++..................... C++ library for embedded systems" + prompt "uClibc++............... C++ library for embedded systems" tristate depends on ADK_TARGET_LIB_UCLIBC default n diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile index ad9739f8c..5538cdfbd 100644 --- a/package/uclibc/Makefile +++ b/package/uclibc/Makefile @@ -28,28 +28,27 @@ SUB_INSTALLS-m:= SUB_INSTALLS-${ADK_PACKAGE_UCLIBC_DEV}+= uclibc-dev-install # do nothing, uClibc is already build in toolchain directory -do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +do-install: $(STAGING_TARGET_DIR)/lib/libc.so ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} ${INSTALL_DIR} $(IDIR_UCLIBC)/lib $(IDIR_UCLIBC)/etc # create timezone file test -z $(ADK_RUNTIME_TIMEZONE) || \ grep $(ADK_RUNTIME_TIMEZONE) ./files/tz.lst | \ cut -f 2 > $(IDIR_UCLIBC)/etc/TZ - $(CP) $(STAGING_DIR)/lib/libgcc_s.so* $(IDIR_UCLIBC)/lib/ - $(CP) $(STAGING_DIR)/lib/libc.so* $(IDIR_UCLIBC)/lib/ - $(CP) $(STAGING_DIR)/lib/libuClibc-$(PKG_VERSION).so \ + $(CP) $(STAGING_TARGET_DIR)/lib/libc.so* $(IDIR_UCLIBC)/lib/ + $(CP) $(STAGING_TARGET_DIR)/lib/libuClibc-$(PKG_VERSION).so \ $(IDIR_UCLIBC)/lib/ - $(CP) $(STAGING_DIR)/lib/ld*-uClibc-$(PKG_VERSION).so \ + $(CP) $(STAGING_TARGET_DIR)/lib/ld*-uClibc-$(PKG_VERSION).so \ $(IDIR_UCLIBC)/lib/ - $(CP) $(STAGING_DIR)/lib/ld*-uClibc.so.* $(IDIR_UCLIBC)/lib/ + $(CP) $(STAGING_TARGET_DIR)/lib/ld*-uClibc.so.* $(IDIR_UCLIBC)/lib/ -for file in libcrypt libdl libm libnsl libresolv librt libutil; do \ - $(CP) $(STAGING_DIR)/lib/$$file.so* $(IDIR_UCLIBC)/lib/; \ - $(CP) $(STAGING_DIR)/lib/$$file-$(PKG_VERSION).so \ + $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_UCLIBC)/lib/; \ + $(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so \ $(IDIR_UCLIBC)/lib/; \ done uclibc-dev-install: ${INSTALL_DIR} ${IDIR_UCLIBC_DEV}/usr/lib - ${CP} ${STAGING_DIR}/lib/crt* ${IDIR_UCLIBC_DEV}/usr/lib + ${CP} ${STAGING_TARGET_DIR}/usr/lib/crt* ${IDIR_UCLIBC_DEV}/usr/lib $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \ INSTALL_HDR_PATH=$(IDIR_UCLIBC_DEV)/usr \ headers_install diff --git a/package/ulogd/Makefile b/package/ulogd/Makefile index 4b716f919..e1f4d0dc5 100644 --- a/package/ulogd/Makefile +++ b/package/ulogd/Makefile @@ -44,15 +44,15 @@ SUB_INSTALLS-${ADK_PACKAGE_ULOGD_MOD_EXTRA}+= ulogd-mod-extra-install TCFLAGS+= -fPIC ifneq (${ADK_PACKAGE_ULOGD_MOD_MYSQL},) -CONFIGURE_ARGS+= --with-mysql=${STAGING_DIR}/usr +CONFIGURE_ARGS+= --with-mysql=${STAGING_TARGET_DIR}/usr endif ifneq (${ADK_PACKAGE_ULOGD_MOD_PGSQL},) -CONFIGURE_ARGS+= --with-pgsql=${STAGING_DIR}/usr +CONFIGURE_ARGS+= --with-pgsql=${STAGING_TARGET_DIR}/usr endif ifneq (${ADK_PACKAGE_ULOGD_MOD_SQLITE},) -CONFIGURE_ARGS+= --with-sqlite3=${STAGING_DIR}/usr +CONFIGURE_ARGS+= --with-sqlite3=${STAGING_TARGET_DIR}/usr endif post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile index 44f9b0177..eb320ce05 100644 --- a/package/util-linux-ng/Makefile +++ b/package/util-linux-ng/Makefile @@ -4,14 +4,14 @@ include ${TOPDIR}/rules.mk PKG_NAME:= util-linux-ng -PKG_VERSION:= 2.17.2 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 4c810430e86d53b6ea5e7ae279b39186 +PKG_VERSION:= 2.18 +PKG_RELEASE:= 1 +PKG_MD5SUM:= aff22adfff1bf39cd3f13371b95a3d3a PKG_DESCR:= Linux utilities PKG_SECTION:= fs PKG_BUILDDEP:= e2fsprogs ncurses PKG_URL:= http://userweb.kernel.org/~kzak/util-linux-ng -PKG_SITES:= ${MASTER_SITE_KERNEL:=utils/util-linux-ng/v2.17/} +PKG_SITES:= ${MASTER_SITE_KERNEL:=utils/util-linux-ng/v$(PKG_VERSION)/} PKG_SUBPKGS:= FDISK SFDISK SWAP_UTILS LOSETUP MCOOKIE PKGSD_FDISK:= Partition table manipulation utility @@ -34,8 +34,10 @@ $(eval $(call PKG_template,MCOOKIE,mcookie,${PKG_VERSION}-${PKG_RELEASE},${PKG_D CONFIGURE_ARGS+= --disable-use-tty-group \ --disable-schedutils \ --disable-cramfs \ - --disable-libblkid \ - --disable-libuuid + --enable-libblkid \ + --enable-libmount \ + --enable-mount \ + --enable-libuuid MAKE_FLAGS+= OPT="${TCFLAGS}" ARCH="${ARCH}" FAKE_FLAGS+= INSTALLSUID="install -m 4755" TCFLAGS+= -DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile index 9d43be1d2..abf6f5a47 100644 --- a/package/valgrind/Makefile +++ b/package/valgrind/Makefile @@ -12,7 +12,7 @@ PKG_SECTION:= debug PKG_URL:= http://valgrind.org/ PKG_SITES:= http://valgrind.org/downloads/ -PKG_TARGET_DEPENDS:= x86 x86_64 +PKG_ARCH_DEPENDS:= x86 x86_64 PKG_HOST_DEPENDS:= !darwin DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/vtun/Makefile b/package/vtun/Makefile index 8c437aec4..9b4cd0883 100644 --- a/package/vtun/Makefile +++ b/package/vtun/Makefile @@ -21,7 +21,7 @@ $(eval $(call PKG_template,VTUN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_ INSTALL_STYLE:= manual -CONFIGURE_ARGS+= --with-ssl-headers=$(STAGING_DIR)/usr/include/openssl \ +CONFIGURE_ARGS+= --with-ssl-headers=$(STAGING_TARGET_DIR)/usr/include/openssl \ --disable-lzo ALL_TARGET:= vtund diff --git a/package/weechat/Makefile b/package/weechat/Makefile index ff95435f3..90baa2342 100644 --- a/package/weechat/Makefile +++ b/package/weechat/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --with-debug=0 \ --disable-lua \ --disable-gnutls \ --disable-ruby \ - --with-libiconv-prefix='${STAGING_DIR}/usr' + --with-libiconv-prefix='${STAGING_TARGET_DIR}/usr' post-install: ${INSTALL_DIR} ${IDIR_WEECHAT}/usr/bin diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile index 78277a05e..7b8be1a0c 100644 --- a/package/wpa_supplicant/Makefile +++ b/package/wpa_supplicant/Makefile @@ -13,7 +13,7 @@ PKG_DEPENDS:= libnl PKG_BUILDDEP:= libnl PKG_SITES:= http://hostap.epitest.fi/releases/ -PKG_DFLT_WPA_SUPPLICANT:= y if ADK_HARDWARE_IBM_X40 +PKG_DFLT_WPA_SUPPLICANT:= y if ADK_TARGET_SYSTEM_IBM_X40 WRKSRC= ${WRKDIST}/${PKG_NAME} diff --git a/package/x11-headers/Makefile b/package/x11-headers/Makefile index 3b5327c35..afba71098 100644 --- a/package/x11-headers/Makefile +++ b/package/x11-headers/Makefile @@ -23,6 +23,6 @@ INSTALL_STYLE:= manual do-install: ${INSTALL_DIR} ${IDIR_X11_HEADERS}/usr/include - ${CP} ${STAGING_DIR}/usr/include/X11 ${IDIR_X11_HEADERS}/usr/include + ${CP} ${STAGING_TARGET_DIR}/usr/include/X11 ${IDIR_X11_HEADERS}/usr/include include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xinit/Makefile b/package/xinit/Makefile index 0497fa287..968631952 100644 --- a/package/xinit/Makefile +++ b/package/xinit/Makefile @@ -14,7 +14,7 @@ PKG_BUILDDEP:= xorg-server PKG_URL:= http://xorg.freedesktop.org/ PKG_SITES:= http://xorg.freedesktop.org/archive/individual/app/ -PKG_TARGET_DEPENDS:= !foxboard +PKG_ARCH_DEPENDS:= !cris include $(TOPDIR)/mk/package.mk diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 503a59988..9aa7eaba9 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -20,7 +20,6 @@ PKG_BUILDDEP+= libpciaccess openssl xf86dgaproto PKG_URL:= http://www.x.org/ PKG_SITES:= http://xorg.freedesktop.org/archive/individual/xserver/ -PKG_TARGET_DEPENDS:= !foxboard PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA PKG_FLAVOURS:= WITH_DRI @@ -66,7 +65,7 @@ else CONFIGURE_ARGS+= --disable-dri --disable-dri2 --disable-glx endif -ifeq (${ADK_HARDWARE_LEMOTE_YEELONG},y) +ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y) CONFIGURE_ARGS+= --with-int10=stub endif diff --git a/package/xproto/Makefile b/package/xproto/Makefile index 5aa23ad20..d191c2108 100644 --- a/package/xproto/Makefile +++ b/package/xproto/Makefile @@ -14,7 +14,7 @@ include $(TOPDIR)/mk/package.mk # workaround for makekeys compile on non-Linux systems post-install: - ${INSTALL_DIR} ${STAGING_DIR}/usr/include/xproto - ${CP} ${WRKINST}/usr/include/X11 ${STAGING_DIR}/usr/include/xproto + ${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/include/xproto + ${CP} ${WRKINST}/usr/include/X11 ${STAGING_TARGET_DIR}/usr/include/xproto include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xterm/Makefile b/package/xterm/Makefile index 35a302662..f46431c45 100644 --- a/package/xterm/Makefile +++ b/package/xterm/Makefile @@ -13,8 +13,6 @@ PKG_DEPENDS:= xorg-server libxaw PKG_URL:= http://invisible-island.net/xterm/xterm.html PKG_SITES:= ftp://invisible-island.net/xterm/ -PKG_TARGET_DEPENDS:= !foxboard !foxg20 !ag241 - DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz include $(TOPDIR)/mk/package.mk diff --git a/package/xvinfo/Makefile b/package/xvinfo/Makefile index 18b21d9f3..002ccdf39 100644 --- a/package/xvinfo/Makefile +++ b/package/xvinfo/Makefile @@ -14,7 +14,7 @@ PKG_BUILDDEP:= xorg-server PKG_URL:= http://xorg.freedesktop.org/ PKG_SITES:= http://xorg.freedesktop.org/archive/individual/app/ -PKG_TARGET_DEPENDS:= !foxboard +PKG_ARCH_DEPENDS:= !cris include $(TOPDIR)/mk/package.mk diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 8360fea86..0bf048448 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -46,8 +46,8 @@ do-configure: (cd $(WRKBUILD); $(COPTS) \ uname="Linux" \ CFLAGS="$(TARGET_CFLAGS) -fPIC" \ - CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ + CPPFLAGS="-I$(STAGING_TARGET_DIR)/usr/include" \ + LDFLAGS="-L$(STAGING_TARGET_DIR)/usr/lib" \ ./configure \ --prefix=/usr \ $(CONFIGURE_OPTS) \ |