From 1cd31f169fab4ab0ce45617c161da3fec9f7359d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 31 May 2009 17:53:55 +0200 Subject: fix regressions from ipkg rework - remove old glib1 lib - rename glib2 -> glib - rename libgdbm -> gdbm - remove obsoleted wireless-tools, use iw - remove upstream unmaintained slurm make allmodconfig runs through on Debian/lenny amd64 for alix1c target --- mk/pkg-bottom.mk | 2 +- package/Config.in | 6 +- package/Depends.mk | 21 +- package/Makefile | 8 +- package/apr/Makefile | 3 - package/avahi/Config.in | 1 + package/avahi/Makefile | 6 +- package/bind/Makefile | 3 +- package/bitlbee/Config.in | 2 +- package/bitlbee/Makefile | 2 +- package/chillispot/Makefile | 2 +- package/dhcp-forwarder/Makefile | 3 +- package/elinks/Makefile | 4 +- package/exmap/Config.in | 6 +- package/exmap/Makefile | 2 +- package/file/patches/patch-magic_Magdir_audio | 11 + package/file/patches/patch-magic_Magdir_compress | 15 + package/file/patches/patch-magic_Magdir_images | 11 + package/file/patches/patch-magic_Magdir_jpeg | 15 + package/file/patches/patch-magic_Magdir_macintosh | 27 + .../file/patches/patch-magic_Magdir_macintosh.orig | 21 + package/file/patches/patch-magic_Magdir_printer | 34 + package/frickin/Makefile | 2 +- package/gcc/Makefile | 1 + package/gdbm/Config.in | 9 + package/gdbm/Makefile | 32 + package/gkrellmd/Config.in | 2 +- package/gkrellmd/Makefile | 2 +- package/glib/Config.in | 18 +- package/glib/Makefile | 59 +- package/glib/patches/01-debian-9.patch | 18988 ------------------- package/glib/patches/02-cross-compile-fix.patch | 210 - .../glib/patches/03-use-glibconfig-sysdefs.patch | 31 - package/glib/patches/04-gcc3.4-fix.patch | 22 - package/glib2/Config.in | 7 - package/glib2/Makefile | 45 - package/irssi/Config.in | 2 +- package/irssi/Makefile | 2 +- package/libdaemon/Makefile | 7 +- package/libelf/Makefile | 4 +- package/libgdbm/Config.in | 9 - package/libgdbm/Makefile | 35 - package/libnids/Makefile | 12 +- package/libnids/patches/configure.patch | 73 - package/libnids/patches/patch-src_killtcp_c | 6 +- package/libsigc++/Config.in | 19 +- package/libsigc++/Makefile | 20 +- package/libtirpc/patches/patch-INSTALL | 255 - package/libtirpc/patches/patch-Makefile_in | 101 +- package/libtirpc/patches/patch-aclocal_m4 | 10921 +---------- package/libtirpc/patches/patch-config_guess | 208 - package/libtirpc/patches/patch-config_sub | 181 - package/libtirpc/patches/patch-configure | 17637 ----------------- package/libtirpc/patches/patch-doc_Makefile_in | 94 +- package/libtirpc/patches/patch-ltmain_sh | 10637 ----------- package/libtirpc/patches/patch-man_Makefile_in | 116 +- package/libtirpc/patches/patch-src_Makefile_in | 184 +- package/libtirpc/patches/patch-src_rpc_soc_c | 41 + package/libtorrent/Config.in | 20 +- package/libtorrent/Makefile | 21 +- package/libusb-compat/Config.in | 9 + package/libusb-compat/Makefile | 31 + package/libusb/Config.in | 1 + package/mc/Config.in | 2 +- package/mc/Makefile | 2 +- package/mpd/Config.in | 2 +- package/mpd/Makefile | 2 +- package/nfs-utils/Makefile | 1 + package/ntpclient/Makefile | 2 +- package/nut/patches/patch-include_nut_version_h | 8 + package/nut/patches/patch-server_Makefile_in | 23 + package/nut/patches/patch-server_Makefile_in.orig | 14 + package/rp-pppoe/Makefile | 2 +- package/rtorrent/Config.in | 25 +- package/rtorrent/Makefile | 6 + package/serdisplib/Makefile | 3 + .../patch-include_serdisplib_serdisp_control_h | 12 + .../serdisplib/patches/patch-src_serdisp_connect_c | 21 + .../patches/patch-src_serdisp_connect_usb_c | 39 + .../serdisplib/patches/patch-src_serdisp_tools_c | 30 + package/sipsak/Makefile | 2 +- package/sipsak/patches/patch-acinclude_m4 | 12 + package/sipsak/patches/patch-configure | 9007 +++++++++ package/slurm/Config.in | 15 - package/slurm/Makefile | 32 - package/slurm/patches/no_host_ncurses.patch | 67 - package/wdfs/Config.in | 2 +- package/wdfs/Makefile | 3 +- package/wireless-tools/Config.in | 6 - package/wireless-tools/Makefile | 38 - package/wireless-tools/patches/debian-2.patch | 35 - target/Makefile | 24 +- 92 files changed, 9884 insertions(+), 59832 deletions(-) create mode 100644 package/file/patches/patch-magic_Magdir_audio create mode 100644 package/file/patches/patch-magic_Magdir_compress create mode 100644 package/file/patches/patch-magic_Magdir_images create mode 100644 package/file/patches/patch-magic_Magdir_jpeg create mode 100644 package/file/patches/patch-magic_Magdir_macintosh create mode 100644 package/file/patches/patch-magic_Magdir_macintosh.orig create mode 100644 package/file/patches/patch-magic_Magdir_printer create mode 100644 package/gdbm/Config.in create mode 100644 package/gdbm/Makefile delete mode 100644 package/glib/patches/01-debian-9.patch delete mode 100644 package/glib/patches/02-cross-compile-fix.patch delete mode 100644 package/glib/patches/03-use-glibconfig-sysdefs.patch delete mode 100644 package/glib/patches/04-gcc3.4-fix.patch delete mode 100644 package/glib2/Config.in delete mode 100644 package/glib2/Makefile delete mode 100644 package/libgdbm/Config.in delete mode 100644 package/libgdbm/Makefile delete mode 100644 package/libnids/patches/configure.patch delete mode 100644 package/libtirpc/patches/patch-INSTALL delete mode 100644 package/libtirpc/patches/patch-config_guess delete mode 100644 package/libtirpc/patches/patch-config_sub delete mode 100644 package/libtirpc/patches/patch-configure delete mode 100644 package/libtirpc/patches/patch-ltmain_sh create mode 100644 package/libtirpc/patches/patch-src_rpc_soc_c create mode 100644 package/libusb-compat/Config.in create mode 100644 package/libusb-compat/Makefile create mode 100644 package/nut/patches/patch-include_nut_version_h create mode 100644 package/nut/patches/patch-server_Makefile_in create mode 100644 package/nut/patches/patch-server_Makefile_in.orig create mode 100644 package/serdisplib/patches/patch-include_serdisplib_serdisp_control_h create mode 100644 package/serdisplib/patches/patch-src_serdisp_connect_c create mode 100644 package/serdisplib/patches/patch-src_serdisp_connect_usb_c create mode 100644 package/serdisplib/patches/patch-src_serdisp_tools_c create mode 100644 package/sipsak/patches/patch-acinclude_m4 create mode 100644 package/sipsak/patches/patch-configure delete mode 100644 package/slurm/Config.in delete mode 100644 package/slurm/Makefile delete mode 100644 package/slurm/patches/no_host_ncurses.patch delete mode 100644 package/wireless-tools/Config.in delete mode 100644 package/wireless-tools/Makefile delete mode 100644 package/wireless-tools/patches/debian-2.patch diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index caae6b853..5eac3e0c0 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -116,7 +116,7 @@ else @exit 1 endif #ifneq ($(filter confprog,${INSTALL_STYLE}),) - for a in ${WRKINST}/usr/{bin/*-config,lib/pkgconfig/*.pc}; do \ + @for a in ${WRKINST}/usr/{bin/*-config,lib/pkgconfig/*.pc}; do \ [[ -e $$a ]] || continue; \ $(SED) "s,^prefix=.*,prefix=${STAGING_DIR}/usr," $$a; \ done diff --git a/package/Config.in b/package/Config.in index 3db9a7631..84b8e4e68 100644 --- a/package/Config.in +++ b/package/Config.in @@ -175,7 +175,6 @@ source "package/mtr/Config.in" source "package/netperf/Config.in" source "package/nmap/Config.in" source "package/sipsak/Config.in" -source "package/slurm/Config.in" source "package/tcpdump/Config.in" #source "package/trafshow/Config.in" source "package/ttcp/Config.in" @@ -343,7 +342,6 @@ source "package/olsrd/Config.in" source "package/snort-wireless/Config.in" source "package/wifidog/Config.in" source "package/wireless-firmware/Config.in" -source "package/wireless-tools/Config.in" source "package/wpa_supplicant/Config.in" endmenu @@ -375,7 +373,6 @@ source "package/cgilib/Config.in" source "package/dbus/Config.in" source "package/gettext/Config.in" source "package/glib/Config.in" -source "package/glib2/Config.in" source "package/id3lib/Config.in" source "package/libao/Config.in" source "package/libaudiofile/Config.in" @@ -393,7 +390,7 @@ source "package/flac/Config.in" # libflac source "package/freetype/Config.in" # libfreetype source "package/libgcrypt/Config.in" source "package/libgd/Config.in" -source "package/libgdbm/Config.in" +source "package/gdbm/Config.in" source "package/libgssglue/Config.in" source "package/gmp/Config.in" # libgmp source "package/gnutls/Config.in" ## libgnutls @@ -443,6 +440,7 @@ source "package/libtirpc/Config.in" source "package/libtorrent/Config.in" source "package/libupnp/Config.in" source "package/libusb/Config.in" +source "package/libusb-compat/Config.in" source "package/libvorbis/Config.in" source "package/libvorbisidec/Config.in" source "package/tcp_wrappers/Config.in" diff --git a/package/Depends.mk b/package/Depends.mk index a606e3756..81a31af4d 100644 --- a/package/Depends.mk +++ b/package/Depends.mk @@ -8,9 +8,9 @@ apr-util-compile: expat-compile apr-compile arpd-compile: libpcap-compile libdnet-compile libevent-compile arpwatch-compile: libpcap-compile atftp-compile: readline-compile ncurses-compile -avahi-compile: libdaemon-compile expat-compile libgdbm-compile +avahi-compile: libdaemon-compile expat-compile gdbm-compile glib-compile bind-compile: openssl-compile -bitlbee-compile: libiconv-compile openssl-compile glib2-compile +bitlbee-compile: libiconv-compile openssl-compile glib-compile bluez-compile: libusb-compile dbus-compile bogofilter-compile: libiconv-compile libdb-compile ifeq (${ADK_COMPILE_CBTT_WITH_UCLIBCXX},y) @@ -38,11 +38,11 @@ dbus-compile: expat-compile deco-compile: ncurses-compile dhcpv6-compile: libnl-compile ncurses-compile digitemp-compile: libusb-compile -dsniff-compile: libnids-compile openssl-compile libgdbm-compile +dsniff-compile: libnids-compile openssl-compile gdbm-compile elinks-compile: openssl-compile esound-compile: libaudiofile-compile ettercap-compile: pcap-compile libnet-compile -exmap-compile: glib2-compile readline-compile +exmap-compile: glib-compile readline-compile fprobe-compile: libpcap-compile freetype-compile: zlib-compile gatling-compile: libowfat-compile libiconv-compile @@ -50,7 +50,7 @@ gcc-compile: gmp-compile mpfr-compile gdb-compile: ncurses-compile readline-compile gettext-compile: libiconv-compile libpthread-compile gkrellmd-compile: glib-compile -glib2-compile: gettext-compile libiconv-compile +glib-compile: gettext-compile libiconv-compile gmediaserver-compile: id3lib-compile libupnp-compile gnutls-compile: libgcrypt-compile liblzo-compile libtasn1-compile opencdk-compile zlib-compile ifeq (${ADK_COMPILE_GPSD_WITH_UCLIBCXX},y) @@ -77,7 +77,7 @@ iperf-compile: uclibc++-compile endif ipsec-tools-compile: openssl-compile iptraf-compile: ncurses-compile -irssi-compile: glib2-compile ncurses-compile +irssi-compile: glib-compile ncurses-compile iw-compile: libnl-compile jamvm-compile: libffi-compile zlib-compile ifeq (${ADK_COMPILE_KISMET_WITH_UCLIBCXX},y) @@ -92,10 +92,11 @@ libgcrypt-compile: libgpg-error-compile libgd-compile: libpng-compile jpeg-compile libid3tag-compile: zlib-compile libnet-compile: libpcap-compile -libnids-compile: libnet-compile +libnids-compile: libnet-compile libpcap-compile libp11-compile: openssl-compile libtool-compile libpng-compile: zlib-compile libshout-compile: libvorbis-compile +libusb-compile: libusb-compat-compile libtorrent-compile: openssl-compile libsigc++-compile libvorbis-compile: libogg-compile libfontenc-compile: xproto-compile zlib-compile @@ -130,7 +131,7 @@ monit-compile: openssl-compile ifeq (${ADK_COMPILE_MRD6_WITH_UCLIBCXX},y) mrd6-compile: uclibc++-compile endif -mt-daapd-compile: libgdbm-compile libid3tag-compile +mt-daapd-compile: gdbm-compile libid3tag-compile mtr-compile: ncurses-compile mutt-compile: ncurses-compile openssl-compile mysql-compile: ncurses-compile zlib-compile readline-compile @@ -219,7 +220,7 @@ vim-compile: ncurses-compile vnc-reflector-compile: jpeg-compile zlib-compile vpnc-compile: libgcrypt-compile libgpg-error-compile vtun-compile: zlib-compile openssl-compile liblzo-compile -wdfs-compile: openssl-compile fuse-compile neon-compile glib2-compile +wdfs-compile: openssl-compile fuse-compile neon-compile glib-compile weechat-compile: ncurses-compile gnutls-compile lua-compile libiconv-compile wknock-compile: libpcap-compile ifeq (${ADK_COMPILE_WPA_SUPPLICANT_WITH_OPENSSL},y) @@ -280,7 +281,7 @@ endif mplayer-compile: alsa-lib-compile libmad-compile libvorbis-compile faad2-compile ncurses-compile zlib-compile -mpd-compile: alsa-lib-compile glib2-compile curl-compile +mpd-compile: alsa-lib-compile glib-compile curl-compile ifneq ($(ADK_PACKAGE_MPD_MP3),) mpd-compile: libid3tag-compile libmad-compile endif diff --git a/package/Makefile b/package/Makefile index 079405854..2b107a79a 100644 --- a/package/Makefile +++ b/package/Makefile @@ -106,8 +106,7 @@ package-$(ADK_PACKAGE_GDB) += gdb package-$(ADK_PACKAGE_GDBSERVER) += gdbserver package-$(ADK_PACKAGE_GETTEXT) += gettext package-$(ADK_PACKAGE_GKRELLMD) += gkrellmd -package-$(ADK_COMPILE_GLIB) += glib -package-$(ADK_PACKAGE_GLIB2) += glib2 +package-$(ADK_PACKAGE_GLIB) += glib ifeq (${ADK_TARGET_LIB_GLIBC},y) package-$(ADK_PACKAGE_GLIBC) += glibc endif @@ -165,7 +164,7 @@ package-$(ADK_PACKAGE_LIBFFI) += libffi package-$(ADK_PACKAGE_LIBFONTENC) += libfontenc package-$(ADK_PACKAGE_LIBGCRYPT) += libgcrypt package-$(ADK_PACKAGE_LIBGD) += libgd -package-$(ADK_PACKAGE_LIBGDBM) += libgdbm +package-$(ADK_PACKAGE_LIBGDBM) += gdbm package-$(ADK_PACKAGE_LIBGPG_ERROR) += libgpg-error package-$(ADK_PACKAGE_LIBGSSGLUE) += libgssglue package-$(ADK_PACKAGE_LIBICONV) += libiconv @@ -198,6 +197,7 @@ package-$(ADK_PACKAGE_LIBTORRENT) += libtorrent package-$(ADK_COMPILE_LIBTOOL) += libtool package-$(ADK_PACKAGE_LIBUPNP) += libupnp package-$(ADK_PACKAGE_LIBUSB) += libusb +package-$(ADK_PACKAGE_LIBUSB_COMPAT) += libusb-compat package-$(ADK_PACKAGE_LIBVORBIS) += libvorbis package-$(ADK_PACKAGE_LIBVORBISIDEC) += libvorbisidec package-$(ADK_PACKAGE_LIBICE) += libICE @@ -332,7 +332,6 @@ package-${ADK_PACKAGE_SHOREWALL_SHELL} += shorewall-shell package-$(ADK_PACKAGE_SIPROXD) += siproxd package-$(ADK_PACKAGE_SIPSAK) += sipsak package-$(ADK_PACKAGE_SISPMCTL) += sispmctl -package-$(ADK_PACKAGE_SLURM) += slurm package-$(ADK_COMPILE_SNORT) += snort package-$(ADK_COMPILE_SNORT_WIRELESS) += snort-wireless package-$(ADK_PACKAGE_SOCAT) += socat @@ -390,7 +389,6 @@ package-$(ADK_PACKAGE_WDFS) += wdfs package-$(ADK_PACKAGE_WEECHAT) += weechat package-$(ADK_PACKAGE_WIFIDOG) += wifidog package-$(ADK_DOWNLOAD_WIRELESS_FIRMWARE) += wireless-firmware -package-$(ADK_PACKAGE_WIRELESS_TOOLS) += wireless-tools package-$(ADK_PACKAGE_WOL) += wol package-$(ADK_PACKAGE_WONDERSHAPER) += wondershaper package-$(ADK_PACKAGE_WPA_SUPPLICANT) += wpa_supplicant diff --git a/package/apr/Makefile b/package/apr/Makefile index bfe4f5b8f..6917bb2bd 100644 --- a/package/apr/Makefile +++ b/package/apr/Makefile @@ -46,9 +46,6 @@ post-install: ${CP} ${WRKINST}/usr/share/build/* ${STAGING_DIR}/usr/share/build/ # we need to patch paths to get apr-util compiling $(SED) "s,\(^installbuilddir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config - $(SED) "s,\(^libdir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config $(SED) "s,\(^datadir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config - $(SED) "s,\(^includedir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config - $(SED) "s,\(^bindir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/avahi/Config.in b/package/avahi/Config.in index b64b0e33d..260096bb6 100644 --- a/package/avahi/Config.in +++ b/package/avahi/Config.in @@ -10,6 +10,7 @@ config ADK_PACKAGE_AVAHI_DAEMON select ADK_COMPILE_AVAHI select ADK_PACKAGE_LIBAVAHI select ADK_PACKAGE_LIBDAEMON + select ADK_PACKAGE_GLIB help Avahi is a system which facilitates service discovery on a local network -- this means that you can plug your laptop or computer into a network and diff --git a/package/avahi/Makefile b/package/avahi/Makefile index 83834b872..513b52963 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -21,17 +21,17 @@ PKG_SECTION_2:= libs include ${TOPDIR}/mk/package.mk +TLDFLAGS+= -lintl $(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION})) $(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_2},${PKG_SECTION_2})) CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= --disable-glib \ +CONFIGURE_ARGS+= --enable-glib \ --disable-qt3 \ --disable-qt4 \ --disable-gtk \ --disable-dbus \ - --enable-expat \ --enable-libdaemon \ --disable-python \ --disable-pygtk \ @@ -76,7 +76,5 @@ post-install: ${INSTALL_DIR} ${IDIR_LIBAVAHI}/usr/lib ${CP} ${WRKINST}/usr/lib/libavahi-common.so.* ${IDIR_LIBAVAHI}/usr/lib/ ${CP} ${WRKINST}/usr/lib/libavahi-core.so.* ${IDIR_LIBAVAHI}/usr/lib/ - ${SED} 's,-I$$(includedir),,g' ${WRKINST}/usr/lib/pkgconfig/avahi-core.pc - ${SED} 's,-L$$(libdir),,g' ${WRKINST}/usr/lib/pkgconfig/avahi-core.pc include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/bind/Makefile b/package/bind/Makefile index b527e13b1..748328cf4 100644 --- a/package/bind/Makefile +++ b/package/bind/Makefile @@ -54,10 +54,9 @@ pre-build: post-install: # bind server - ${INSTALL_DIR} ${IDIR_BIND_SERVER}/usr/sbin + ${INSTALL_DIR} ${IDIR_BIND_SERVER}/usr/sbin ${IDIR_BIND_SERVER}/etc ${INSTALL_BIN} ${WRKINST}/usr/sbin/named ${IDIR_BIND_SERVER}/usr/sbin/ ${CP} ./files/bind ${IDIR_BIND_SERVER}/etc - find ${IDIR_BIND_SERVER}/etc/bind -name ".svn" | xargs rm -rf # nsupdate ${INSTALL_DIR} ${IDIR_BIND_CLIENT}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/nsupdate ${IDIR_BIND_CLIENT}/usr/bin/ diff --git a/package/bitlbee/Config.in b/package/bitlbee/Config.in index 086b6e800..a3c61c439 100644 --- a/package/bitlbee/Config.in +++ b/package/bitlbee/Config.in @@ -3,7 +3,7 @@ config ADK_PACKAGE_BITLBEE tristate default n select ADK_PACKAGE_LIBOPENSSL - select ADK_PACKAGE_GLIB2 + select ADK_PACKAGE_GLIB select ADK_PACKAGE_LIBICONV help diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile index ea158d197..02bde57af 100644 --- a/package/bitlbee/Makefile +++ b/package/bitlbee/Makefile @@ -11,7 +11,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 2b1674d98804970809de3da3edf0bed2 PKG_DESCR:= IRC gateway to IM chat networks PKG_SECTION:= net -PKG_DEPENDS:= glib2 libopenssl libiconv +PKG_DEPENDS:= glib libopenssl libiconv PKG_URL:= http://www.bitlbee.org PKG_SITES:= http://get.bitlbee.org/src/ \ http://get.bitlbee.be/src/ \ diff --git a/package/chillispot/Makefile b/package/chillispot/Makefile index 65db0067a..543b84f37 100644 --- a/package/chillispot/Makefile +++ b/package/chillispot/Makefile @@ -24,7 +24,7 @@ BUILD_STYLE= auto INSTALL_STYLE= auto post-install: - ${INSTALL_DIR} ${IDIR_CHILLISPOT}/usr/sbin + ${INSTALL_DIR} ${IDIR_CHILLISPOT}/usr/sbin ${IDIR_CHILLISPOT}/etc ${INSTALL_BIN} ./files/chilli.conf \ ${IDIR_CHILLISPOT}/etc/ ${INSTALL_BIN} ${WRKINST}/usr/sbin/chilli ${IDIR_CHILLISPOT}/usr/sbin/ diff --git a/package/dhcp-forwarder/Makefile b/package/dhcp-forwarder/Makefile index 02d6b2ca5..142e7e61d 100644 --- a/package/dhcp-forwarder/Makefile +++ b/package/dhcp-forwarder/Makefile @@ -12,7 +12,8 @@ PKG_MD5SUM:= fb3670dee9f71af1e55ac5dcd64e213e PKG_DESCR:= DHCP relay agent PKG_SECTION:= net PKG_URL:= http://www.nongnu.org/dhcp-fwd -PKG_SITES:= http://savannah.nongnu.org/download/dhcp-fwd/ +PKG_SITES:= http://savannah.nongnu.org/download/dhcp-fwd/ \ + http://ftp.cc.uoc.gr/mirrors/nongnu.org/dhcp-fwd/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/elinks/Makefile b/package/elinks/Makefile index 77f1b5e91..64468e331 100644 --- a/package/elinks/Makefile +++ b/package/elinks/Makefile @@ -6,9 +6,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= elinks -PKG_VERSION:= 0.11.3 +PKG_VERSION:= 0.11.6 PKG_RELEASE:= 1 -PKG_MD5SUM:= 11547e054d7afb1f5ac9e9f65728cc6a +PKG_MD5SUM:= fd85c1f38d4e2da8e59b60886a30a843 PKG_DESCR:= advanced text web browser PKG_SECTION:= text PKG_DEPENDS:= libopenssl diff --git a/package/exmap/Config.in b/package/exmap/Config.in index 18bd98582..bc7e23a92 100644 --- a/package/exmap/Config.in +++ b/package/exmap/Config.in @@ -6,7 +6,7 @@ config ADK_PACKAGE_EXMAP prompt "exmap............................. exmap-console utility" tristate select ADK_COMPILE_EXMAP - select ADK_PACKAGE_GLIB2 + select ADK_PACKAGE_GLIB select ADK_PACKAGE_LIBREADLINE select ADK_PACKAGE_KMOD_EXMAP default n @@ -17,7 +17,7 @@ config ADK_PACKAGE_EXMAPD prompt "exmapd............................ exmap daemon" tristate select ADK_COMPILE_EXMAP - select ADK_PACKAGE_GLIB2 + select ADK_PACKAGE_GLIB select ADK_PACKAGE_LIBREADLINE select ADK_PACKAGE_KMOD_EXMAP default n @@ -28,7 +28,7 @@ config ADK_PACKAGE_EXMAPSERVER prompt "exmapserver....................... exmap server" tristate select ADK_COMPILE_EXMAP - select ADK_PACKAGE_GLIB2 + select ADK_PACKAGE_GLIB select ADK_PACKAGE_LIBREADLINE select ADK_PACKAGE_KMOD_EXMAP default n diff --git a/package/exmap/Makefile b/package/exmap/Makefile index 8ce3c2bc6..f620df545 100644 --- a/package/exmap/Makefile +++ b/package/exmap/Makefile @@ -21,7 +21,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,EXMAP,exmap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,EXMAPD,exmapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,EXMAPSERVER,exmapserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,KMOD_EXMAP,kmod-exmap,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE}))) +$(eval $(call PKG_template,KMOD_EXMAP,kmod-exmap,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-doc diff --git a/package/file/patches/patch-magic_Magdir_audio b/package/file/patches/patch-magic_Magdir_audio new file mode 100644 index 000000000..e5e0c9849 --- /dev/null +++ b/package/file/patches/patch-magic_Magdir_audio @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- file-5.03.orig/magic/Magdir/audio 2008-11-07 16:44:13.000000000 +0100 ++++ file-5.03/magic/Magdir/audio 2009-05-31 03:53:54.000000000 +0200 +@@ -293,7 +293,6 @@ + >>5 byte &0x40 \b, extended header + >>5 byte &0x20 \b, experimental + >>5 byte &0x10 \b, footer present +->(6.I) indirect x \b, contains: + + # NSF (NES sound file) magic + 0 string NESM\x1a NES Sound File diff --git a/package/file/patches/patch-magic_Magdir_compress b/package/file/patches/patch-magic_Magdir_compress new file mode 100644 index 000000000..cee99739b --- /dev/null +++ b/package/file/patches/patch-magic_Magdir_compress @@ -0,0 +1,15 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- file-5.03.orig/magic/Magdir/compress 2009-04-22 15:07:35.000000000 +0200 ++++ file-5.03/magic/Magdir/compress 2009-05-31 04:09:09.000000000 +0200 +@@ -9,11 +9,6 @@ + # because it tries to uncompress it to figure out what's inside. + + # standard unix compress +-0 string \037\235 compress'd data +-!:mime application/x-compress +-!:apple LZIVZIVU +->2 byte&0x80 >0 block compressed +->2 byte&0x1f x %d bits + + # gzip (GNU zip, not to be confused with Info-ZIP or PKWARE zip archiver) + # Edited by Chris Chittleborough , March 2002 diff --git a/package/file/patches/patch-magic_Magdir_images b/package/file/patches/patch-magic_Magdir_images new file mode 100644 index 000000000..f0fe16223 --- /dev/null +++ b/package/file/patches/patch-magic_Magdir_images @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- file-5.03.orig/magic/Magdir/images 2009-02-02 16:55:49.000000000 +0100 ++++ file-5.03/magic/Magdir/images 2009-05-31 03:58:58.000000000 +0200 +@@ -110,7 +110,6 @@ + # GIF + 0 string GIF8 GIF image data + !:mime image/gif +-!:apple 8BIMGIFf + >4 string 7a \b, version 8%s, + >4 string 9a \b, version 8%s, + >6 leshort >0 %hd x diff --git a/package/file/patches/patch-magic_Magdir_jpeg b/package/file/patches/patch-magic_Magdir_jpeg new file mode 100644 index 000000000..6f5ae068d --- /dev/null +++ b/package/file/patches/patch-magic_Magdir_jpeg @@ -0,0 +1,15 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- file-5.03.orig/magic/Magdir/jpeg 2008-10-20 19:20:03.000000000 +0200 ++++ file-5.03/magic/Magdir/jpeg 2009-05-31 04:10:19.000000000 +0200 +@@ -8,11 +8,6 @@ + # + # both of which turn into "JPEG image data" here. + # +-0 beshort 0xffd8 JPEG image data +-!:mime image/jpeg +-!:apple 8BIMJPEG +-!:strength +1 +->6 string JFIF \b, JFIF standard + # The following added by Erik Rossen 1999-09-06 + # in a vain attempt to add image size reporting for JFIF. Note that these + # tests are not fool-proof since some perfectly valid JPEGs are currently diff --git a/package/file/patches/patch-magic_Magdir_macintosh b/package/file/patches/patch-magic_Magdir_macintosh new file mode 100644 index 000000000..9333a1643 --- /dev/null +++ b/package/file/patches/patch-magic_Magdir_macintosh @@ -0,0 +1,27 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- file-5.03.orig/magic/Magdir/macintosh 2008-10-20 19:20:23.000000000 +0200 ++++ file-5.03/magic/Magdir/macintosh 2009-05-31 04:08:05.000000000 +0200 +@@ -8,23 +8,6 @@ + !:mime application/mac-binhex40 + >41 string x \b, version %.3s + +-# Stuffit archives are the de facto standard of compression for Macintosh +-# files obtained from most archives. (franklsm@tuns.ca) +-0 string SIT! StuffIt Archive (data) +-!:mime application/x-stuffit +-!:apple SIT!SIT! +->2 string x : %s +-0 string SITD StuffIt Deluxe (data) +->2 string x : %s +-0 string Seg StuffIt Deluxe Segment (data) +->2 string x : %s +- +-# Newer StuffIt archives (grant@netbsd.org) +-0 string StuffIt StuffIt Archive +-!:mime application/x-stuffit +-!:apple SIT!SIT! +-#>162 string >0 : %s +- + # Macintosh Applications and Installation binaries (franklsm@tuns.ca) + # GRR: Too weak + #0 string APPL Macintosh Application (data) diff --git a/package/file/patches/patch-magic_Magdir_macintosh.orig b/package/file/patches/patch-magic_Magdir_macintosh.orig new file mode 100644 index 000000000..f85819da4 --- /dev/null +++ b/package/file/patches/patch-magic_Magdir_macintosh.orig @@ -0,0 +1,21 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- file-5.03.orig/magic/Magdir/macintosh 2008-10-20 19:20:23.000000000 +0200 ++++ file-5.03/magic/Magdir/macintosh 2009-05-31 04:07:12.000000000 +0200 +@@ -8,17 +8,6 @@ + !:mime application/mac-binhex40 + >41 string x \b, version %.3s + +-# Stuffit archives are the de facto standard of compression for Macintosh +-# files obtained from most archives. (franklsm@tuns.ca) +-0 string SIT! StuffIt Archive (data) +-!:mime application/x-stuffit +-!:apple SIT!SIT! +->2 string x : %s +-0 string SITD StuffIt Deluxe (data) +->2 string x : %s +-0 string Seg StuffIt Deluxe Segment (data) +->2 string x : %s +- + # Newer StuffIt archives (grant@netbsd.org) + 0 string StuffIt StuffIt Archive + !:mime application/x-stuffit diff --git a/package/file/patches/patch-magic_Magdir_printer b/package/file/patches/patch-magic_Magdir_printer new file mode 100644 index 000000000..a7db0e8e7 --- /dev/null +++ b/package/file/patches/patch-magic_Magdir_printer @@ -0,0 +1,34 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- file-5.03.orig/magic/Magdir/printer 2008-10-20 19:20:03.000000000 +0200 ++++ file-5.03/magic/Magdir/printer 2009-05-31 04:05:40.000000000 +0200 +@@ -3,30 +3,6 @@ + # printer: file(1) magic for printer-formatted files + # + +-# PostScript, updated by Daniel Quinlan (quinlan@yggdrasil.com) +-0 string %! PostScript document text +-!:mime application/postscript +-!:apple ASPSTEXT +->2 string PS-Adobe- conforming +->>11 string >\0 DSC level %.3s +->>>15 string EPS \b, type %s +->>>15 string Query \b, type %s +->>>15 string ExitServer \b, type %s +->>>15 search/1000 %%LanguageLevel:\ +->>>>&0 string >\0 \b, Level %s +-# Some PCs have the annoying habit of adding a ^D as a document separator +-0 string \004%! PostScript document text +-!:mime application/postscript +-!:apple ASPSTEXT +->3 string PS-Adobe- conforming +->>12 string >\0 DSC level %.3s +->>>16 string EPS \b, type %s +->>>16 string Query \b, type %s +->>>16 string ExitServer \b, type %s +->>>16 search/1000 %%LanguageLevel:\ +->>>>&0 string >\0 \b, Level %s +-0 string \033%-12345X%!PS PostScript document +- + # DOS EPS Binary File Header + # From: Ed Sznyter + 0 belong 0xC5D0D3C6 DOS EPS Binary File diff --git a/package/frickin/Makefile b/package/frickin/Makefile index 2e30b665b..770da6e86 100644 --- a/package/frickin/Makefile +++ b/package/frickin/Makefile @@ -10,7 +10,7 @@ PKG_VERSION:= 1.3 PKG_RELEASE:= 9 PKG_MD5SUM:= 5b2e98da2310c71c703d4617b88a173f PKG_DESCR:= PPTP proxy -PKG_SECTION: net +PKG_SECTION:= net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=frickin/} include ${TOPDIR}/mk/package.mk diff --git a/package/gcc/Makefile b/package/gcc/Makefile index d1252396f..3c9bc296c 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -20,6 +20,7 @@ CONFIGURE_STYLE= gnu ifeq ($(ADK_LINUX_MIPS64_LEMOTE),y) CONFIGURE_ARGS+= --with-abi=64 endif +CONFIGURE_ENV+= ac_cv_func_fputc_unlocked=no CONFIGURE_ARGS+= --enable-languages=c \ --libexecdir=/usr/lib \ --host=$(REAL_GNU_TARGET_NAME) \ diff --git a/package/gdbm/Config.in b/package/gdbm/Config.in new file mode 100644 index 000000000..f644ae473 --- /dev/null +++ b/package/gdbm/Config.in @@ -0,0 +1,9 @@ +config ADK_PACKAGE_LIBGDBM + prompt "libgdbm........................... The GNU database manager" + tristate + default n + help + disk file format database which stores key/data-pairs in single files. + + http://www.gnu.org + diff --git a/package/gdbm/Makefile b/package/gdbm/Makefile new file mode 100644 index 000000000..2209f0308 --- /dev/null +++ b/package/gdbm/Makefile @@ -0,0 +1,32 @@ +# $Id$ +#- +# 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:= gdbm +PKG_VERSION:= 1.8.3 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 1d1b1d5c0245b1c00aff92da751e9aa1 +PKG_DESCR:= disk file format database which stores key/data-pairs in single files +PKG_SECTION:= libs +PKG_URL:= http://www.gnu.org/software/gdbm +PKG_SITES:= ${MASTER_SITE_GNU:=gdbm/} + +include ${TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,LIBGDBM,libgdbm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE= gnu +BUILD_STYLE= auto +INSTALL_STYLE= auto +XAKE_FLAGS+= BINOWN=`id -u` \ + BINGRP=`id -g` \ + INSTALL_ROOT="${WRKINST}" + +post-install: + ${INSTALL_DIR} ${IDIR_LIBGDBM}/usr/lib + ${CP} ${WRKINST}/usr/lib/libgdbm.so.* ${IDIR_LIBGDBM}/usr/lib/ + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/gkrellmd/Config.in b/package/gkrellmd/Config.in index 0c649581f..8510be728 100644 --- a/package/gkrellmd/Config.in +++ b/package/gkrellmd/Config.in @@ -2,7 +2,7 @@ config ADK_PACKAGE_GKRELLMD prompt "gkrellmd.......................... The GNU Krell Monitors Server" tristate default n - select ADK_PACKAGE_GLIB2 + select ADK_PACKAGE_GLIB help Gkrellmd Listens for connections from gkrellm clients. When a gkrellm client connects to a gkrellmd server all builtin monitors collect diff --git a/package/gkrellmd/Makefile b/package/gkrellmd/Makefile index 5a7c5eabe..3dfc58c77 100644 --- a/package/gkrellmd/Makefile +++ b/package/gkrellmd/Makefile @@ -11,7 +11,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= db8a983a60577a6b4886db96d6def011 PKG_DESCR:= The GNU Krell Monitors Server PKG_SECTION:= net -PKG_DEPENDS:= glib2 libpthread +PKG_DEPENDS:= glib libpthread PKG_URL:= http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html PKG_SITES:= http://members.dslextreme.com/users/billw/gkrellm/ diff --git a/package/glib/Config.in b/package/glib/Config.in index 7710e5aa1..093e19649 100644 --- a/package/glib/Config.in +++ b/package/glib/Config.in @@ -1,17 +1,7 @@ -config ADK_COMPILE_GLIB - tristate - depends ADK_PACKAGE_GLIB1 - -config ADK_PACKAGE_GLIB1 - prompt "glib1............................. The GLib library of C routines (v1.2)" +config ADK_PACKAGE_GLIB + prompt "glib............................. low-level core library that forms the basis of GTK+" tristate default n - select ADK_COMPILE_GLIB select ADK_PACKAGE_LIBPTHREAD - help - GLib is a library containing many useful C routines for things such - as trees, hashes, and lists. - - http://www.gtk.org/ - - Depends: libpthread + select ADK_PACKAGE_LIBICONV + select ADK_PACKAGE_GETTEXT diff --git a/package/glib/Makefile b/package/glib/Makefile index bcfbcc801..fb97ec818 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -6,50 +6,37 @@ include ${TOPDIR}/rules.mk PKG_NAME:= glib -PKG_VERSION:= 1.2.10 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 6fe30dad87c77b91b632def29dd69ef9 -PKG_SITES:= ftp://ftp.gtk.org/pub/gtk/v1.2/ \ - http://ftp.gwdg.de/pub/misc/grafik/gimp/gtk/v1.2/ \ - http://ftp.esat.net/mirrors/ftp.gimp.org/pub/gtk/v1.2/ \ - http://www.mirrorservice.org/sites/ftp.gimp.org/pub/gtk/v1.2/ +PKG_VERSION:= 2.18.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= d53836f7fdd9970d03e255e9d712bd83 +PKG_DESCR:= low-level core library that forms the basis of GTK+ +PKG_SECTION:= libs +PKG_DEPENDS:= gettext libiconv libpthread +PKG_URL:= http://www.gtk.org/ +PKG_SITES:= ftp://ftp.gtk.org/pub/glib/2.18/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GLIB1,glib1,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,GLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TCPPFLAGS+= -I'${STAGING_DIR}/usr/include' CONFIGURE_STYLE= gnu -CONFIGURE_ENV+= glib_cv_sizeof_gmutex=24 \ - ac_cv_sizeof_char=1 \ - ac_cv_sizeof_short=2 \ - ac_cv_sizeof_int=4 \ - ac_cv_sizeof_long=4 \ - ac_cv_sizeof_long_long=8 \ - ac_cv_sizeof_void_p=4 \ - glib_cv_prog_cc_ansi_proto="no" \ - glib_cv_has__inline="yes" \ - glib_cv_has__inline__="yes" \ - glib_cv_hasinline="yes" \ - glib_cv_sane_realloc="yes" \ - glib_cv_va_copy="no" \ - glib_cv___va_copy="yes" \ - glib_cv_va_val_copy="yes" \ - glib_cv_rtldglobal_broken="no" \ - glib_cv_uscore="no" \ - ac_cv_func_getpwuid_r="yes" \ - glib_cv_func_pthread_mutex_trylock_posix="yes" \ - glib_cv_func_pthread_cond_timedwait_posix="yes" \ - glib_cv_sizeof_gmutex="24" \ - glib_cv_byte_contents_gmutex="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0" +CONFIGURE_ARGS+= --enable-debug=no \ + --disable-mem-pools \ + --disable-rebuilds \ + --with-libiconv=gnu \ + --with-threads=posix +CONFIGURE_ENV+= glib_cv_long_long_format=ll \ + glib_cv_stack_grows=no \ + glib_cv_have_strlcpy=no \ + glib_cv_uscore=no \ + ac_cv_func_posix_getpwuid_r=yes \ + ac_cv_func_posix_getgrgid_r=yes BUILD_STYLE= auto INSTALL_STYLE= auto confprog post-install: - ${INSTALL_DIR} ${IDIR_GLIB1}/usr/lib - ${CP} ${WRKINST}/usr/lib/libg{lib,module,thread}-1.2.so.* \ - ${IDIR_GLIB1}/usr/lib/ - # needed in staging_dir - ${INSTALL_DIR} ${WRKINST}/usr/include/glib-1.2 - ${CP} ${WRKBUILD}/glibconfig-sysdefs.h ${WRKINST}/usr/include/glib-1.2/ + ${INSTALL_DIR} ${IDIR_GLIB}/usr/lib + ${CP} ${WRKINST}/usr/lib/lib*.so.* ${IDIR_GLIB}/usr/lib include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/glib/patches/01-debian-9.patch b/package/glib/patches/01-debian-9.patch deleted file mode 100644 index 20608c0e8..000000000 --- a/package/glib/patches/01-debian-9.patch +++ /dev/null @@ -1,18988 +0,0 @@ ---- glib1.2-1.2.10.orig/Makefile.in -+++ glib1.2-1.2.10/Makefile.in -@@ -1,6 +1,6 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. - # This Makefile.in 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. -@@ -64,8 +64,10 @@ - AS = @AS@ - CC = @CC@ - DLLTOOL = @DLLTOOL@ -+ECHO = @ECHO@ - ENABLE_MEM_CHECK = @ENABLE_MEM_CHECK@ - ENABLE_MEM_PROFILE = @ENABLE_MEM_PROFILE@ -+EXEEXT = @EXEEXT@ - GLIB_BINARY_AGE = @GLIB_BINARY_AGE@ - GLIB_DEBUG_FLAGS = @GLIB_DEBUG_FLAGS@ - GLIB_INTERFACE_AGE = @GLIB_INTERFACE_AGE@ -@@ -90,8 +92,10 @@ - MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ - OBJDUMP = @OBJDUMP@ -+OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - RANLIB = @RANLIB@ -+STRIP = @STRIP@ - VERSION = @VERSION@ - - AUTOMAKE_OPTIONS = 1.4 -@@ -154,18 +158,20 @@ - gmain.lo gmem.lo gmessages.lo gmutex.lo gnode.lo gprimes.lo grel.lo \ - gscanner.lo gslist.lo gstrfuncs.lo gstring.lo gtimer.lo gtree.lo \ - gutils.lo -+noinst_PROGRAMS = testglib$(EXEEXT) testgdate$(EXEEXT) \ -+testgdateparser$(EXEEXT) - PROGRAMS = $(noinst_PROGRAMS) - - testglib_SOURCES = testglib.c --testglib_OBJECTS = testglib.o -+testglib_OBJECTS = testglib.$(OBJEXT) - testglib_DEPENDENCIES = libglib.la - testglib_LDFLAGS = - testgdate_SOURCES = testgdate.c --testgdate_OBJECTS = testgdate.o -+testgdate_OBJECTS = testgdate.$(OBJEXT) - testgdate_DEPENDENCIES = libglib.la - testgdate_LDFLAGS = - testgdateparser_SOURCES = testgdateparser.c --testgdateparser_OBJECTS = testgdateparser.o -+testgdateparser_OBJECTS = testgdateparser.$(OBJEXT) - testgdateparser_DEPENDENCIES = libglib.la - testgdateparser_LDFLAGS = - SCRIPTS = $(bin_SCRIPTS) -@@ -180,22 +186,22 @@ - HEADERS = $(glibinclude_HEADERS) - - DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \ --Makefile.am Makefile.in NEWS acconfig.h acinclude.m4 aclocal.m4 \ --config.guess config.h.in config.sub configure configure.in \ --glib-config.in glib.pc.in glib.spec.in gmodule.pc.in gthread.pc.in \ --install-sh ltconfig ltmain.sh missing mkinstalldirs -+Makefile.am Makefile.in NEWS acconfig.h aclocal.m4 config.guess \ -+config.h.in config.sub configure configure.in glib-config.in glib.pc.in \ -+glib.spec.in gmodule.pc.in gthread.pc.in install-sh ltmain.sh missing \ -+mkinstalldirs - - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar -+TAR = tar - GZIP_ENV = --best - SOURCES = $(libglib_la_SOURCES) testglib.c testgdate.c testgdateparser.c --OBJECTS = $(libglib_la_OBJECTS) testglib.o testgdate.o testgdateparser.o -+OBJECTS = $(libglib_la_OBJECTS) testglib.$(OBJEXT) testgdate.$(OBJEXT) testgdateparser.$(OBJEXT) - - all: all-redirect - .SUFFIXES: --.SUFFIXES: .S .c .lo .o .s -+.SUFFIXES: .S .c .lo .o .obj .s - $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile - -@@ -203,7 +209,7 @@ - cd $(top_builddir) \ - && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status - --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in - cd $(srcdir) && $(ACLOCAL) - - config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -@@ -277,6 +283,11 @@ - .c.o: - $(COMPILE) -c $< - -+# FIXME: We should only use cygpath when building on Windows, -+# and only if it is available. -+.c.obj: -+ $(COMPILE) -c `cygpath -w $<` -+ - .s.o: - $(COMPILE) -c $< - -@@ -285,6 +296,7 @@ - - mostlyclean-compile: - -rm -f *.o core *.core -+ -rm -f *.$(OBJEXT) - - clean-compile: - -@@ -324,16 +336,16 @@ - - maintainer-clean-noinstPROGRAMS: - --testglib: $(testglib_OBJECTS) $(testglib_DEPENDENCIES) -- @rm -f testglib -+testglib$(EXEEXT): $(testglib_OBJECTS) $(testglib_DEPENDENCIES) -+ @rm -f testglib$(EXEEXT) - $(LINK) $(testglib_LDFLAGS) $(testglib_OBJECTS) $(testglib_LDADD) $(LIBS) - --testgdate: $(testgdate_OBJECTS) $(testgdate_DEPENDENCIES) -- @rm -f testgdate -+testgdate$(EXEEXT): $(testgdate_OBJECTS) $(testgdate_DEPENDENCIES) -+ @rm -f testgdate$(EXEEXT) - $(LINK) $(testgdate_LDFLAGS) $(testgdate_OBJECTS) $(testgdate_LDADD) $(LIBS) - --testgdateparser: $(testgdateparser_OBJECTS) $(testgdateparser_DEPENDENCIES) -- @rm -f testgdateparser -+testgdateparser$(EXEEXT): $(testgdateparser_OBJECTS) $(testgdateparser_DEPENDENCIES) -+ @rm -f testgdateparser$(EXEEXT) - $(LINK) $(testgdateparser_LDFLAGS) $(testgdateparser_OBJECTS) $(testgdateparser_LDADD) $(LIBS) - - install-binSCRIPTS: $(bin_SCRIPTS) -@@ -463,7 +475,7 @@ - dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ -- test "$$subdir" = "." && dot_seen=yes; \ -+ test "$$subdir" != "." || dot_seen=yes; \ - done; \ - test "$$dot_seen" = "no" && rev=". $$rev"; \ - target=`echo $@ | sed s/-recursive//`; \ -@@ -505,7 +517,7 @@ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS) -+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)) - - mostlyclean-tags: - -@@ -575,35 +587,6 @@ - fi; \ - done - $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook --garray.lo garray.o : garray.c glib.h glibconfig.h --gcache.lo gcache.o : gcache.c glib.h glibconfig.h --gcompletion.lo gcompletion.o : gcompletion.c glib.h glibconfig.h --gdataset.lo gdataset.o : gdataset.c glib.h glibconfig.h --gdate.lo gdate.o : gdate.c config.h glib.h glibconfig.h --gerror.lo gerror.o : gerror.c config.h glib.h glibconfig.h --ghash.lo ghash.o : ghash.c glib.h glibconfig.h --ghook.lo ghook.o : ghook.c glib.h glibconfig.h --giochannel.lo giochannel.o : giochannel.c config.h glib.h glibconfig.h --giounix.lo giounix.o : giounix.c glib.h glibconfig.h --glist.lo glist.o : glist.c glib.h glibconfig.h --gmain.lo gmain.o : gmain.c config.h glib.h glibconfig.h --gmem.lo gmem.o : gmem.c config.h glib.h glibconfig.h --gmessages.lo gmessages.o : gmessages.c config.h glib.h glibconfig.h --gmutex.lo gmutex.o : gmutex.c glib.h glibconfig.h --gnode.lo gnode.o : gnode.c glib.h glibconfig.h --gprimes.lo gprimes.o : gprimes.c glib.h glibconfig.h --grel.lo grel.o : grel.c glib.h glibconfig.h --gscanner.lo gscanner.o : gscanner.c config.h glib.h glibconfig.h --gslist.lo gslist.o : gslist.c glib.h glibconfig.h --gstrfuncs.lo gstrfuncs.o : gstrfuncs.c config.h glib.h glibconfig.h --gstring.lo gstring.o : gstring.c glib.h glibconfig.h --gtimer.lo gtimer.o : gtimer.c config.h glib.h glibconfig.h --gtree.lo gtree.o : gtree.c glib.h glibconfig.h --gutils.lo gutils.o : gutils.c config.h glibconfig.h glib.h --testgdate.o: testgdate.c glib.h glibconfig.h --testgdateparser.o: testgdateparser.c glib.h glibconfig.h --testglib.o: testglib.c glib.h glibconfig.h -- - info-am: - info: info-recursive - dvi-am: ---- glib1.2-1.2.10.orig/aclocal.m4 -+++ glib1.2-1.2.10/aclocal.m4 -@@ -1,6 +1,6 @@ --dnl aclocal.m4 generated automatically by aclocal 1.4 -+dnl aclocal.m4 generated automatically by aclocal 1.4-p6 - --dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -@@ -10,135 +10,3114 @@ - dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A - dnl PARTICULAR PURPOSE. - -+# Do all the work for Automake. This macro actually does too much -- -+# some checks are only needed if your package does certain things. -+# But this isn't really a big deal. - --# serial 40 AC_PROG_LIBTOOL --AC_DEFUN(AC_PROG_LIBTOOL, --[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl -+# serial 1 -+ -+dnl Usage: -+dnl AM_INIT_AUTOMAKE(package,version, [no-define]) -+ -+AC_DEFUN([AM_INIT_AUTOMAKE], -+[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -+AC_REQUIRE([AC_PROG_INSTALL]) -+PACKAGE=[$1] -+AC_SUBST(PACKAGE) -+VERSION=[$2] -+AC_SUBST(VERSION) -+dnl test to see if srcdir already configured -+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then -+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -+fi -+ifelse([$3],, -+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])) -+AC_REQUIRE([AM_SANITY_CHECK]) -+AC_REQUIRE([AC_ARG_PROGRAM]) -+dnl FIXME This is truly gross. -+missing_dir=`cd $ac_aux_dir && pwd` -+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir) -+AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) -+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir) -+AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) -+AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) -+AC_REQUIRE([AC_PROG_MAKE_SET])]) -+ -+# Copyright 2002 Free Software Foundation, Inc. -+ -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2, or (at your option) -+# any later version. -+ -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+ -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -+ -+# AM_AUTOMAKE_VERSION(VERSION) -+# ---------------------------- -+# Automake X.Y traces this macro to ensure aclocal.m4 has been -+# generated from the m4 files accompanying Automake X.Y. -+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"]) -+ -+# AM_SET_CURRENT_AUTOMAKE_VERSION -+# ------------------------------- -+# Call AM_AUTOMAKE_VERSION so it can be traced. -+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. -+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -+ [AM_AUTOMAKE_VERSION([1.4-p6])]) -+ -+# -+# Check to make sure that the build environment is sane. -+# -+ -+AC_DEFUN([AM_SANITY_CHECK], -+[AC_MSG_CHECKING([whether build environment is sane]) -+# Just in case -+sleep 1 -+echo timestamp > conftestfile -+# Do `set' in a subshell so we don't clobber the current shell's -+# arguments. Must try -L first in case configure is actually a -+# symlink; some systems play weird games with the mod time of symlinks -+# (eg FreeBSD returns the mod time of the symlink's containing -+# directory). -+if ( -+ set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` -+ if test "[$]*" = "X"; then -+ # -L didn't work. -+ set X `ls -t $srcdir/configure conftestfile` -+ fi -+ if test "[$]*" != "X $srcdir/configure conftestfile" \ -+ && test "[$]*" != "X conftestfile $srcdir/configure"; then -+ -+ # If neither matched, then we have a broken ls. This can happen -+ # if, for instance, CONFIG_SHELL is bash and it inherits a -+ # broken ls alias from the environment. This has actually -+ # happened. Such a system could not be considered "sane". -+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -+alias in your environment]) -+ fi -+ -+ test "[$]2" = conftestfile -+ ) -+then -+ # Ok. -+ : -+else -+ AC_MSG_ERROR([newly created file is older than distributed files! -+Check your system clock]) -+fi -+rm -f conftest* -+AC_MSG_RESULT(yes)]) -+ -+dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) -+dnl The program must properly implement --version. -+AC_DEFUN([AM_MISSING_PROG], -+[AC_MSG_CHECKING(for working $2) -+# Run test in a subshell; some versions of sh will print an error if -+# an executable is not found, even if stderr is redirected. -+# Redirect stdin to placate older versions of autoconf. Sigh. -+if ($2 --version) < /dev/null > /dev/null 2>&1; then -+ $1=$2 -+ AC_MSG_RESULT(found) -+else -+ $1="$3/missing $2" -+ AC_MSG_RESULT(missing) -+fi -+AC_SUBST($1)]) -+ -+# Like AC_CONFIG_HEADER, but automatically create stamp file. -+ -+AC_DEFUN([AM_CONFIG_HEADER], -+[AC_PREREQ([2.12]) -+AC_CONFIG_HEADER([$1]) -+dnl When config.status generates a header, we must update the stamp-h file. -+dnl This file resides in the same directory as the config header -+dnl that is generated. We must strip everything past the first ":", -+dnl and everything past the last "/". -+AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl -+ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>, -+<>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>, -+<>; do -+ case " <<$>>CONFIG_HEADERS " in -+ *" <<$>>am_file "*<<)>> -+ echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx -+ ;; -+ esac -+ am_indx=`expr "<<$>>am_indx" + 1` -+done<<>>dnl>>) -+changequote([,]))]) - --# Save cache, so that ltconfig can load it --AC_CACHE_SAVE -+# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*- - --# Actually configure libtool. ac_aux_dir is where install-sh is found. --CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ --LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ --LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ --DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ --${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ --$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \ --|| AC_MSG_ERROR([libtool configure failed]) -+# serial 46 AC_PROG_LIBTOOL - --# Reload cache, that may have been modified by ltconfig --AC_CACHE_LOAD -+AC_DEFUN([AC_PROG_LIBTOOL], -+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl - - # This can be used to rebuild libtool when needed --LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" -+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' - AC_SUBST(LIBTOOL)dnl - --# Redirect the config.log output again, so that the ltconfig log is not --# clobbered by the next message. --exec 5>>./config.log -+# Prevent multiple expansion -+define([AC_PROG_LIBTOOL], []) - ]) - --AC_DEFUN(AC_LIBTOOL_SETUP, -+AC_DEFUN([AC_LIBTOOL_SETUP], - [AC_PREREQ(2.13)dnl - AC_REQUIRE([AC_ENABLE_SHARED])dnl - AC_REQUIRE([AC_ENABLE_STATIC])dnl - AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl - AC_REQUIRE([AC_CANONICAL_HOST])dnl - AC_REQUIRE([AC_CANONICAL_BUILD])dnl --AC_REQUIRE([AC_PROG_RANLIB])dnl - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_PROG_LD])dnl -+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl - AC_REQUIRE([AC_PROG_NM])dnl -+AC_REQUIRE([LT_AC_PROG_SED])dnl -+ - AC_REQUIRE([AC_PROG_LN_S])dnl -+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl -+AC_REQUIRE([AC_OBJEXT])dnl -+AC_REQUIRE([AC_EXEEXT])dnl - dnl - --case "$target" in --NONE) lt_target="$host" ;; --*) lt_target="$target" ;; -+_LT_AC_PROG_ECHO_BACKSLASH -+# Only perform the check for file, if the check method requires it -+case $deplibs_check_method in -+file_magic*) -+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then -+ AC_PATH_MAGIC -+ fi -+ ;; - esac - --# Check for any special flags to pass to ltconfig. --libtool_flags="--cache-file=$cache_file" --test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" --test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" --test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install" --test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc" --test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld" --ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], --[libtool_flags="$libtool_flags --enable-dlopen"]) -+AC_CHECK_TOOL(RANLIB, ranlib, :) -+AC_CHECK_TOOL(STRIP, strip, :) -+ -+ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) - ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], --[libtool_flags="$libtool_flags --enable-win32-dll"]) -+enable_win32_dll=yes, enable_win32_dll=no) -+ - AC_ARG_ENABLE(libtool-lock, - [ --disable-libtool-lock avoid locking (might break parallel builds)]) --test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock" --test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" -+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+ -+# Some flags need to be propagated to the compiler or linker for good -+# libtool support. -+case $host in -+*-*-irix6*) -+ # Find out which ABI we are using. -+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -32" -+ ;; -+ *N32*) -+ LD="${LD-ld} -n32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -64" -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ -+*-*-sco3.2v5*) -+ # On SCO OpenServer 5, we need -belf to get full-featured binaries. -+ SAVE_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -belf" -+ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, -+ [AC_LANG_SAVE -+ AC_LANG_C -+ AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) -+ AC_LANG_RESTORE]) -+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then -+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -+ CFLAGS="$SAVE_CFLAGS" -+ fi -+ ;; -+ -+ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], -+[*-*-cygwin* | *-*-mingw* | *-*-pw32*) -+ AC_CHECK_TOOL(DLLTOOL, dlltool, false) -+ AC_CHECK_TOOL(AS, as, false) -+ AC_CHECK_TOOL(OBJDUMP, objdump, false) -+ -+ # recent cygwin and mingw systems supply a stub DllMain which the user -+ # can override, but on older systems we have to supply one -+ AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain, -+ [AC_TRY_LINK([], -+ [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); -+ DllMain (0, 0, 0);], -+ [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])]) -+ -+ case $host/$CC in -+ *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*) -+ # old mingw systems require "-dll" to link a DLL, while more recent ones -+ # require "-mdll" -+ SAVE_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -mdll" -+ AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch, -+ [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])]) -+ CFLAGS="$SAVE_CFLAGS" ;; -+ *-*-cygwin* | *-*-pw32*) -+ # cygwin systems need to pass --dll to the linker, and not link -+ # crt.o which will require a WinMain@16 definition. -+ lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;; -+ esac -+ ;; -+ ]) -+esac -+ -+_LT_AC_LTCONFIG_HACK -+ -+]) -+ -+# AC_LIBTOOL_HEADER_ASSERT -+# ------------------------ -+AC_DEFUN([AC_LIBTOOL_HEADER_ASSERT], -+[AC_CACHE_CHECK([whether $CC supports assert without backlinking], -+ [lt_cv_func_assert_works], -+ [case $host in -+ *-*-solaris*) -+ if test "$GCC" = yes && test "$with_gnu_ld" != yes; then -+ case `$CC --version 2>/dev/null` in -+ [[12]].*) lt_cv_func_assert_works=no ;; -+ *) lt_cv_func_assert_works=yes ;; -+ esac -+ fi -+ ;; -+ esac]) -+ -+if test "x$lt_cv_func_assert_works" = xyes; then -+ AC_CHECK_HEADERS(assert.h) -+fi -+])# AC_LIBTOOL_HEADER_ASSERT -+ -+# _LT_AC_CHECK_DLFCN -+# -------------------- -+AC_DEFUN([_LT_AC_CHECK_DLFCN], -+[AC_CHECK_HEADERS(dlfcn.h) -+])# _LT_AC_CHECK_DLFCN -+ -+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -+# --------------------------------- -+AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], -+[AC_REQUIRE([AC_CANONICAL_HOST]) -+AC_REQUIRE([AC_PROG_NM]) -+AC_REQUIRE([AC_OBJEXT]) -+# Check for command to grab the raw symbol name followed by C symbol from nm. -+AC_MSG_CHECKING([command to parse $NM output]) -+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl -+ -+# These are sane defaults that work on at least a few old systems. -+# [They come from Ultrix. What could be older than Ultrix?!! ;)] -+ -+# Character class describing NM global symbol codes. -+symcode='[[BCDEGRST]]' -+ -+# Regexp to match symbols that can be accessed directly from C. -+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' -+ -+# Transform the above into a raw symbol and a C symbol. -+symxfrm='\1 \2\3 \3' -+ -+# Transform an extracted symbol line into a proper C declaration -+lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'" -+ -+# Transform an extracted symbol line into symbol name and symbol address -+lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -+ -+# Define system-specific variables. -+case $host_os in -+aix*) -+ symcode='[[BCDT]]' -+ ;; -+cygwin* | mingw* | pw32*) -+ symcode='[[ABCDGISTW]]' -+ ;; -+hpux*) # Its linker distinguishes data from code symbols -+ lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -+ lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -+ ;; -+irix* | nonstopux*) -+ symcode='[[BCDEGRST]]' -+ ;; -+osf*) -+ symcode='[[BCDEGQRST]]' -+ ;; -+solaris* | sysv5*) -+ symcode='[[BDT]]' -+ ;; -+sysv4) -+ symcode='[[DFNSTU]]' -+ ;; -+esac -+ -+# Handle CRLF in mingw tool chain -+opt_cr= -+case $host_os in -+mingw*) -+ opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp -+ ;; -+esac -+ -+# If we're using GNU nm, then use its standard symbol codes. -+if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then -+ symcode='[[ABCDGISTW]]' -+fi -+ -+# Try without a prefix undercore, then with it. -+for ac_symprfx in "" "_"; do -+ -+ # Write the raw and C identifiers. -+lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" -+ -+ # Check to see that the pipe works correctly. -+ pipe_works=no -+ rm -f conftest* -+ cat > conftest.$ac_ext < $nlist) && test -s "$nlist"; then -+ # Try sorting and uniquifying the output. -+ if sort "$nlist" | uniq > "$nlist"T; then -+ mv -f "$nlist"T "$nlist" -+ else -+ rm -f "$nlist"T -+ fi -+ -+ # Make sure that we snagged all the symbols we need. -+ if egrep ' nm_test_var$' "$nlist" >/dev/null; then -+ if egrep ' nm_test_func$' "$nlist" >/dev/null; then -+ cat < conftest.$ac_ext -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+EOF -+ # Now generate the symbol file. -+ eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext' -+ -+ cat <> conftest.$ac_ext -+#if defined (__STDC__) && __STDC__ -+# define lt_ptr void * -+#else -+# define lt_ptr char * -+# define const -+#endif -+ -+/* The mapping between symbol names and symbols. */ -+const struct { -+ const char *name; -+ lt_ptr address; -+} -+lt_preloaded_symbols[[]] = -+{ -+EOF -+ sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext -+ cat <<\EOF >> conftest.$ac_ext -+ {0, (lt_ptr) 0} -+}; -+ -+#ifdef __cplusplus -+} -+#endif -+EOF -+ # Now try linking the two files. -+ mv conftest.$ac_objext conftstm.$ac_objext -+ save_LIBS="$LIBS" -+ save_CFLAGS="$CFLAGS" -+ LIBS="conftstm.$ac_objext" -+ CFLAGS="$CFLAGS$no_builtin_flag" -+ if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then -+ pipe_works=yes -+ fi -+ LIBS="$save_LIBS" -+ CFLAGS="$save_CFLAGS" -+ else -+ echo "cannot find nm_test_func in $nlist" >&AC_FD_CC -+ fi -+ else -+ echo "cannot find nm_test_var in $nlist" >&AC_FD_CC -+ fi -+ else -+ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC -+ fi -+ else -+ echo "$progname: failed program was:" >&AC_FD_CC -+ cat conftest.$ac_ext >&5 -+ fi -+ rm -f conftest* conftst* -+ -+ # Do not use the global_symbol_pipe unless it works. -+ if test "$pipe_works" = yes; then -+ break -+ else -+ lt_cv_sys_global_symbol_pipe= -+ fi -+done -+]) -+global_symbol_pipe="$lt_cv_sys_global_symbol_pipe" -+if test -z "$lt_cv_sys_global_symbol_pipe"; then -+ global_symbol_to_cdecl= -+ global_symbol_to_c_name_address= -+else -+ global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl" -+ global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address" -+fi -+if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address"; -+then -+ AC_MSG_RESULT(failed) -+else -+ AC_MSG_RESULT(ok) -+fi -+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -+ -+# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR -+# --------------------------------- -+AC_DEFUN([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR], -+[# Find the correct PATH separator. Usually this is `:', but -+# DJGPP uses `;' like DOS. -+if test "X${PATH_SEPARATOR+set}" != Xset; then -+ UNAME=${UNAME-`uname 2>/dev/null`} -+ case X$UNAME in -+ *-DOS) lt_cv_sys_path_separator=';' ;; -+ *) lt_cv_sys_path_separator=':' ;; -+ esac -+ PATH_SEPARATOR=$lt_cv_sys_path_separator -+fi -+])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR -+ -+# _LT_AC_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. -+AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], -+[ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], -+ [AC_DIVERT_PUSH(NOTICE)]) -+_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR -+ -+# Check that we are running under the correct shell. -+SHELL=${CONFIG_SHELL-/bin/sh} -+ -+case X$EC