From 38a94e6cb8f772f29ebf8e25e1fe5cb34711d324 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 7 Feb 2007 10:04:04 +0000 Subject: gpephone: add recipes from http://linuxtogo.org/~florian/gpepe/ * They still need to be run through oe-stylize.py * things like linphone need to get merged with their original counterparts in OE --- packages/gpephone/.mtn2git_empty | 0 packages/gpephone/addressbook_0.1.bb | 12 + packages/gpephone/audioplayer_0.1.bb | 12 + packages/gpephone/calendar_0.1.bb | 12 + packages/gpephone/cms92init_0.1.bb | 21 + packages/gpephone/connect_0.1.bb | 22 + packages/gpephone/gloox_0.8.1.bb | 15 + packages/gpephone/gpe-applauncher_0.6.bb | 14 + packages/gpephone/gpe-phonepanel_0.6.bb | 12 + .../gpe-session-scripts-phone/.mtn2git_empty | 0 .../disable-composite.xsettings | 1 + .../gpe-session-scripts-phone/matchbox-session | 7 + .../gpe-session-scripts-phone/matchbox-session.vm | 15 + .../gpe-session-scripts-phone/phonesession | 52 + .../gpephone/gpe-session-scripts-phone_0.67.bb | 65 + packages/gpephone/gpephone-image-vm.bb | 39 + packages/gpephone/gpephone-image.bb | 38 + packages/gpephone/gsmmux/.mtn2git_empty | 0 packages/gpephone/gsmmux/gsmmux-makefile.patch | 28 + packages/gpephone/gsmmux_alpha-2.bb | 12 + packages/gpephone/iksemel_1.2.bb | 14 + packages/gpephone/libabenabler_0.1.bb | 16 + packages/gpephone/libcalenabler_0.1.bb | 16 + packages/gpephone/libchenabler_0.1.bb | 16 + packages/gpephone/libgemwidget_0.1.bb | 13 + packages/gpephone/libgpephone_0.3.bb | 13 + packages/gpephone/libiac_0.1.bb | 13 + packages/gpephone/libidn_0.5.19.bb | 20 + packages/gpephone/libim_0.1.bb | 21 + packages/gpephone/liblipsevent_0.1.bb | 16 + packages/gpephone/libmsgenabler_0.1.bb | 14 + packages/gpephone/librecord_0.1.bb | 15 + packages/gpephone/libvocenabler_0.1.bb | 14 + packages/gpephone/linphone-1.5.0/.mtn2git_empty | 0 .../gpephone/linphone-1.5.0/linphone-1.5.0.patch | 115730 ++++++++++++++++++ .../linphone-1.5.0/linphone-pkgconfig.patch | 41 + packages/gpephone/linphone_1.5.0.bb | 47 + packages/gpephone/meta-gpephone.bb | 15 + packages/gpephone/phoneserver_0.1.bb | 11 + packages/gpephone/sms_0.1.bb | 13 + packages/gpephone/soundserver_0.1.bb | 17 + packages/gpephone/task-gpephone.bb | 93 + packages/gpephone/videoplayer_0.1.bb | 12 + packages/gpephone/voicecall_0.4.bb | 9 + .../gpephone/xoo-theme-gpephone/.mtn2git_empty | 0 packages/gpephone/xoo-theme-gpephone/gpephone.png | Bin 0 -> 38390 bytes packages/gpephone/xoo-theme-gpephone/gpephone.xml | 59 + packages/gpephone/xoo-theme-gpephone_1.0.bb | 17 + packages/gpephone/xoo-vm/.mtn2git_empty | 0 packages/gpephone/xoo-vm/gpephone-vm.patch | 84 + packages/gpephone/xoo-vm_0.7-20070204.bb | 16 + 51 files changed, 116742 insertions(+) create mode 100644 packages/gpephone/.mtn2git_empty create mode 100644 packages/gpephone/addressbook_0.1.bb create mode 100644 packages/gpephone/audioplayer_0.1.bb create mode 100644 packages/gpephone/calendar_0.1.bb create mode 100644 packages/gpephone/cms92init_0.1.bb create mode 100644 packages/gpephone/connect_0.1.bb create mode 100644 packages/gpephone/gloox_0.8.1.bb create mode 100644 packages/gpephone/gpe-applauncher_0.6.bb create mode 100644 packages/gpephone/gpe-phonepanel_0.6.bb create mode 100644 packages/gpephone/gpe-session-scripts-phone/.mtn2git_empty create mode 100644 packages/gpephone/gpe-session-scripts-phone/disable-composite.xsettings create mode 100644 packages/gpephone/gpe-session-scripts-phone/matchbox-session create mode 100644 packages/gpephone/gpe-session-scripts-phone/matchbox-session.vm create mode 100755 packages/gpephone/gpe-session-scripts-phone/phonesession create mode 100644 packages/gpephone/gpe-session-scripts-phone_0.67.bb create mode 100644 packages/gpephone/gpephone-image-vm.bb create mode 100644 packages/gpephone/gpephone-image.bb create mode 100644 packages/gpephone/gsmmux/.mtn2git_empty create mode 100644 packages/gpephone/gsmmux/gsmmux-makefile.patch create mode 100644 packages/gpephone/gsmmux_alpha-2.bb create mode 100644 packages/gpephone/iksemel_1.2.bb create mode 100644 packages/gpephone/libabenabler_0.1.bb create mode 100644 packages/gpephone/libcalenabler_0.1.bb create mode 100644 packages/gpephone/libchenabler_0.1.bb create mode 100644 packages/gpephone/libgemwidget_0.1.bb create mode 100644 packages/gpephone/libgpephone_0.3.bb create mode 100644 packages/gpephone/libiac_0.1.bb create mode 100644 packages/gpephone/libidn_0.5.19.bb create mode 100644 packages/gpephone/libim_0.1.bb create mode 100644 packages/gpephone/liblipsevent_0.1.bb create mode 100644 packages/gpephone/libmsgenabler_0.1.bb create mode 100644 packages/gpephone/librecord_0.1.bb create mode 100644 packages/gpephone/libvocenabler_0.1.bb create mode 100644 packages/gpephone/linphone-1.5.0/.mtn2git_empty create mode 100644 packages/gpephone/linphone-1.5.0/linphone-1.5.0.patch create mode 100644 packages/gpephone/linphone-1.5.0/linphone-pkgconfig.patch create mode 100644 packages/gpephone/linphone_1.5.0.bb create mode 100644 packages/gpephone/meta-gpephone.bb create mode 100644 packages/gpephone/phoneserver_0.1.bb create mode 100644 packages/gpephone/sms_0.1.bb create mode 100644 packages/gpephone/soundserver_0.1.bb create mode 100644 packages/gpephone/task-gpephone.bb create mode 100644 packages/gpephone/videoplayer_0.1.bb create mode 100644 packages/gpephone/voicecall_0.4.bb create mode 100644 packages/gpephone/xoo-theme-gpephone/.mtn2git_empty create mode 100644 packages/gpephone/xoo-theme-gpephone/gpephone.png create mode 100644 packages/gpephone/xoo-theme-gpephone/gpephone.xml create mode 100644 packages/gpephone/xoo-theme-gpephone_1.0.bb create mode 100644 packages/gpephone/xoo-vm/.mtn2git_empty create mode 100644 packages/gpephone/xoo-vm/gpephone-vm.patch create mode 100644 packages/gpephone/xoo-vm_0.7-20070204.bb (limited to 'packages') diff --git a/packages/gpephone/.mtn2git_empty b/packages/gpephone/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpephone/addressbook_0.1.bb b/packages/gpephone/addressbook_0.1.bb new file mode 100644 index 0000000000..71764de6ca --- /dev/null +++ b/packages/gpephone/addressbook_0.1.bb @@ -0,0 +1,12 @@ +LICENSE = "LiPS" +DESCRIPTION = "LiPS address book" +SECTION = "gpe" +PRIORITY = "optional" +PR = "r0" + +DEPENDS = "gtk+ libgpewidget libgpephone dbus-glib libabenabler libiac libim" + +GPE_TARBALL_SUFFIX= "bz2" +inherit gpephone autotools + +FILES_${PN} += "${datadir}/database" diff --git a/packages/gpephone/audioplayer_0.1.bb b/packages/gpephone/audioplayer_0.1.bb new file mode 100644 index 0000000000..e79b294e81 --- /dev/null +++ b/packages/gpephone/audioplayer_0.1.bb @@ -0,0 +1,12 @@ +LICENSE = "LiPS" +DESCRIPTION = "An audio player for GPE phone edition." +SECTION = "gpe" +PRIORITY = "optional" +PR = "r0" + +DEPENDS = "gtk+ libgpewidget libgpephone dbus-glib libabenabler libiac gstreamer libgemwidget" + +GPE_TARBALL_SUFFIX= "bz2" +inherit gpephone autotools + +FILES_${PN} += "${datadir}/themes" diff --git a/packages/gpephone/calendar_0.1.bb b/packages/gpephone/calendar_0.1.bb new file mode 100644 index 0000000000..9aed3e56d9 --- /dev/null +++ b/packages/gpephone/calendar_0.1.bb @@ -0,0 +1,12 @@ +LICENSE = "LiPS" +DESCRIPTION = "Calendar application for GPE Phone Edition" +SECTION = "gpe" +PRIORITY = "optional" +PR = "r0" + +DEPENDS = "gtk+ libgpewidget libgpephone libgemwidget dbus-glib libcalenabler libiac" + +GPE_TARBALL_SUFFIX= "bz2" +inherit gpephone autotools + +FILES_${PN} += "${datadir}/database ${datadir}/res" diff --git a/packages/gpephone/cms92init_0.1.bb b/packages/gpephone/cms92init_0.1.bb new file mode 100644 index 0000000000..aaa079966d --- /dev/null +++ b/packages/gpephone/cms92init_0.1.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "GSM/GPRS mux initializer" +LICENSE = "GPL" +SECTION = "gpe" +PRIORITY = "optional" +DEPENDS = "glibc" +PR = "r0" + +inherit gpephone + +SRC_URI = "${GPEPHONE_MIRROR}/GPRS/GPRS-${PV}.tar.bz2" + + +S = ${WORKDIR}/GPRS/cms92init-simple + +do_compile() { + oe_runmake PREFIX=${prefix} +} + +do_install() { + oe_runmake PREFIX=${prefix} DESTDIR=${D} install +} diff --git a/packages/gpephone/connect_0.1.bb b/packages/gpephone/connect_0.1.bb new file mode 100644 index 0000000000..3e14f78fcf --- /dev/null +++ b/packages/gpephone/connect_0.1.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "GSM/GPRS mux tools" +LICENSE = "GPL" +SECTION = "gpe" +PRIORITY = "optional" +DEPENDS = "glibc" +PR = "r0" + +inherit gpephone + +SRC_URI = "${GPEPHONE_MIRROR}/GPRS/GPRS-${PV}.tar.bz2" + +S = ${WORKDIR}/GPRS/connect + +do_compile() { + oe_runmake PREFIX=${prefix} +} + +do_install() { + install -d ${D}/${prefix}/bin + install -m755 connect ${D}/${prefix}/bin + install -m755 disconnect ${D}/${prefix}/bin +} diff --git a/packages/gpephone/gloox_0.8.1.bb b/packages/gpephone/gloox_0.8.1.bb new file mode 100644 index 0000000000..e6d6e509c7 --- /dev/null +++ b/packages/gpephone/gloox_0.8.1.bb @@ -0,0 +1,15 @@ +LICENSE = "GPL" +DESCRIPTION = "full-featured Jabber/XMPP client library." +SECTION = "networking" +PRIORITY = "optional" +PR = "r0" + +DEPENDS = "iksemel libidn gnutls" + +inherit autotools pkgconfig + +SRC_URI = "http://camaya.net/download/${P}.tar.bz2" + +do_stage () { + autotools_stage_all +} diff --git a/packages/gpephone/gpe-applauncher_0.6.bb b/packages/gpephone/gpe-applauncher_0.6.bb new file mode 100644 index 0000000000..5fd81291f8 --- /dev/null +++ b/packages/gpephone/gpe-applauncher_0.6.bb @@ -0,0 +1,14 @@ +LICENSE = "GPL" +DESCRIPTION = "A cellphone application launcher." +SECTION = "gpe" +PRIORITY = "optional" +PR = "r0" + +DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libxsettings-client" + +GPE_TARBALL_SUFFIX= "bz2" +inherit gpephone autotools + +#EXTRA_OECONF = "--enable-gridlayout" + +FILES_${PN} += '${datadir}/themes' diff --git a/packages/gpephone/gpe-phonepanel_0.6.bb b/packages/gpephone/gpe-phonepanel_0.6.bb new file mode 100644 index 0000000000..0fad51f019 --- /dev/null +++ b/packages/gpephone/gpe-phonepanel_0.6.bb @@ -0,0 +1,12 @@ +LICENSE = "GPL" +DESCRIPTION = "A cellphone status panel to be used with gpe-applauncher." +SECTION = "gpe" +PRIORITY = "optional" +PR = "r0" + +DEPENDS = "gtk+ libgpephone dbus-glib" + +GPE_TARBALL_SUFFIX= "bz2" +inherit gpephone autotools + +FILES_${PN} += "${datadir}/themes" diff --git a/packages/gpephone/gpe-session-scripts-phone/.mtn2git_empty b/packages/gpephone/gpe-session-scripts-phone/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpephone/gpe-session-scripts-phone/disable-composite.xsettings b/packages/gpephone/gpe-session-scripts-phone/disable-composite.xsettings new file mode 100644 index 0000000000..a8ad54cf8d --- /dev/null +++ b/packages/gpephone/gpe-session-scripts-phone/disable-composite.xsettings @@ -0,0 +1 @@ +MATCHBOX/COMPOSITE:S:off diff --git a/packages/gpephone/gpe-session-scripts-phone/matchbox-session b/packages/gpephone/gpe-session-scripts-phone/matchbox-session new file mode 100644 index 0000000000..bc8166e70e --- /dev/null +++ b/packages/gpephone/gpe-session-scripts-phone/matchbox-session @@ -0,0 +1,7 @@ +#!/bin/sh + +# host session applications +#. /etc/X11/Xsession +if [ -x /etc/X11/phonesession ]; then + . /etc/X11/phonesession +fi diff --git a/packages/gpephone/gpe-session-scripts-phone/matchbox-session.vm b/packages/gpephone/gpe-session-scripts-phone/matchbox-session.vm new file mode 100644 index 0000000000..24f80078f9 --- /dev/null +++ b/packages/gpephone/gpe-session-scripts-phone/matchbox-session.vm @@ -0,0 +1,15 @@ +#!/bin/sh + +# host session applications +xoo -xd :1 -xn /usr/bin/Xephyr --device gpephone --title GPEPhone & + +# start nested session + +export DISPLAY=:1 +#. /etc/X11/Xsession +if [ -x /etc/X11/phonesession ]; then + . /etc/X11/phonesession +fi + + +DISPLAY=:0 exec matchbox-window-manager -use_titlebar yes $@ diff --git a/packages/gpephone/gpe-session-scripts-phone/phonesession b/packages/gpephone/gpe-session-scripts-phone/phonesession new file mode 100755 index 0000000000..b08aa74dbc --- /dev/null +++ b/packages/gpephone/gpe-session-scripts-phone/phonesession @@ -0,0 +1,52 @@ +#!/bin/sh +export V_ROOT=/ +export APP_PATH=/usr + +# For GEM enivronment +export GEM_PATH=/usr + +# For Volume Configuration +export VOLCOF_RES_PATH=/usr/share/volconf + +# For Voc History +export VOC_DATA_PATH=$V_ROOT/usr/share/vochistory + +# For AddressBook +export PIM_DATA_PATH=$APP_PATH/share +export ABOOK_DATA_PATH=$APP_PATH/share + +# For Voicecall +export VOC_IMAGE_PATH=$APP_PATH/share/pixmaps + +# For SMS +export SMS_CONF_PATH=$APP_PATH/share/conf +export SMS_GRAPHIC_PATH=$APP_PATH/share/graphic +export SMS_RING_TONE_PATH=$APP_PATH/share/chocolate.mp3 + +# For E-mail +export EMAIL_GRAPHIC_PATH=$APP_PATH/share/email-graphic +export TINYMAIL_CACHE_DIR=$APP_PATH/share/tinymail.cache + +# For Calendar +export CAL_RES_PATH=$APP_PATH/share/res + +# Start GPE Phone Edition apps through matchbox session +gpe-applauncher& +sleep 2 +gpe-phonepanel& +matchbox-window-manager -use_titlebar no& + +# Start E-Sound Server +esd -nobeeps -as 2& +esdplay /mnt/sd/sounds/startup.wav + +# Start SoundServer +soundserver & + +# Run GSM support stuff + +cms92init & +gsmMux -d -p /dev/ttyS0 -m cms92 -f 128 -b 115200 -c /dev/ptmx /dev/ptmx & + +# Start PhoneServer +phoneserver & diff --git a/packages/gpephone/gpe-session-scripts-phone_0.67.bb b/packages/gpephone/gpe-session-scripts-phone_0.67.bb new file mode 100644 index 0000000000..331e8fdc72 --- /dev/null +++ b/packages/gpephone/gpe-session-scripts-phone_0.67.bb @@ -0,0 +1,65 @@ +inherit gpe + +DESCRIPTION = "GPE session startup scripts hack for GPE Phone Edition" +LICENSE = "GPL" +SECTION = "gpe" +PRIORITY = "optional" +RDEPENDS_${PN} = "gpe-applauncher gpe-phonepanel gpe-session-starter gpe-bluetooth gpe-question xmodmap xdpyinfo xserver-common" +DEPENDS = "matchbox-wm gpe-applauncher gpe-phonepanel gpe-bluetooth gpe-question xmodmap xdpyinfo xserver-common" + +SRC_URI = "${GPE_MIRROR}/gpe-session-scripts-${PV}.tar.gz \ + file://matchbox-session \ + file://matchbox-session.vm \ + file://phonesession \ + file://disable-composite.xsettings" + +PR = "r1" + +S = "${WORKDIR}/gpe-session-scripts-${PV}" + + +# We assume that x86 means we are building an emulation image +do_install_append() { + install -d ${D}${sysconfdir}/gpe/xsettings-default.d + if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then + echo "Gtk/ToolbarStyle:S:icons" > ${D}${sysconfdir}/gpe/xsettings-default.d/toolbar + fi + install -d ${D}${sysconfdir}/matchbox + install ${WORKDIR}/matchbox-session ${D}${sysconfdir}/matchbox/session + + install -d ${D}${sysconfdir}/gpe/xsettings-default.d + install -m 0644 ${WORKDIR}/disable-composite.xsettings ${D}${sysconfdir}/gpe/xsettings-default.d/disable-composite + + mv ${D}/usr/bin/gpe-logout ${D}/usr/bin/gpe-logout.matchbox + + install -d ${D}${sysconfdir}/X11 + install -m755 ${WORKDIR}/phonesession ${D}${sysconfdir}/X11/phonesession +} + +do_install_append_x86() { + install -d ${D}${sysconfdir}/gpe/xsettings-default.d + if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then + echo "Gtk/ToolbarStyle:S:icons" > ${D}${sysconfdir}/gpe/xsettings-default.d/toolbar + fi + install -d ${D}${sysconfdir}/matchbox + install ${WORKDIR}/matchbox-session.vm ${D}${sysconfdir}/matchbox/session + + install -d ${D}${sysconfdir}/gpe/xsettings-default.d + install -m 0644 ${WORKDIR}/disable-composite.xsettings ${D}${sysconfdir}/gpe/xsettings-default.d/disable-composite + + mv ${D}/usr/bin/gpe-logout ${D}/usr/bin/gpe-logout.matchbox + + install -d ${D}${sysconfdir}/X11 + install -m755 ${WORKDIR}/phonesession ${D}${sysconfdir}/X11/phonesession +} + +pkg_postinst_${PN}() { + update-alternatives --install /usr/bin/gpe-logout gpe-logout /usr/bin/gpe-logout.matchbox 10 +} + +pkg_postrm_${PN}() { + update-alternatives --remove gpe-logout /usr/bin/gpe-logout.matchbox +} + +# This makes use of GUI_MACHINE_CLASS, so set PACKAGE_ARCH appropriately +PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/gpephone/gpephone-image-vm.bb b/packages/gpephone/gpephone-image-vm.bb new file mode 100644 index 0000000000..472577be8b --- /dev/null +++ b/packages/gpephone/gpephone-image-vm.bb @@ -0,0 +1,39 @@ +PR = "r0" + +export IMAGE_BASENAME = "gpephone-image-vm" + +GPE_EXTRA_THEMES = "" + +GPE_EXTRA_INSTALL_none = "" +GPE_EXTRA_INSTALL_x86 = "grub xserver-kdrive-xephyr xoo-vm xoo-theme-gpephone" +GPE_EXTRA_INSTALL_bigscreen = "${GPE_EXTRA_THEMES}" +GPE_EXTRA_INSTALL_smallscreen = "${GPE_EXTRA_THEMES}" + +GUI_MACHINE_CLASS ?= "none" +GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}" + +#ship more stuff with devices with >16MB of flash +GPE_BIGFLASH_INSTALL := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\ +",d)}' + +GPE_EXTRA_INSTALL += "${GPE_BIGFLASH_INSTALL}" + +XSERVER ?= "xserver-kdrive-fbdev" + +DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpephone" +RDEPENDS = "${PACKAGE_INSTALL}" + +export PACKAGE_INSTALL = "\ + ${MACHINE_TASK_PROVIDER} \ + gpephone-task-base \ + gpephone-task-pim \ + gpephone-task-settings \ + gpephone-task-development \ + gpephone-task-apps \ + gpephone-task-connectivity \ + ${XSERVER} \ + ${GPE_EXTRA_INSTALL}" + +inherit image + +LICENSE = "MIT" diff --git a/packages/gpephone/gpephone-image.bb b/packages/gpephone/gpephone-image.bb new file mode 100644 index 0000000000..2fe9e3b3fc --- /dev/null +++ b/packages/gpephone/gpephone-image.bb @@ -0,0 +1,38 @@ +PR = "r0" + +export IMAGE_BASENAME = "gpephone-image" + +GPE_EXTRA_THEMES = "" + +GPE_EXTRA_INSTALL_none = "" +GPE_EXTRA_INSTALL_x86 = "grub" +GPE_EXTRA_INSTALL_bigscreen = "${GPE_EXTRA_THEMES}" +GPE_EXTRA_INSTALL_smallscreen = "${GPE_EXTRA_THEMES}" + +GUI_MACHINE_CLASS ?= "none" +GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}" + +#ship more stuff with devices with >16MB of flash +GPE_BIGFLASH_INSTALL := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\ +",d)}' + +GPE_EXTRA_INSTALL += "${GPE_BIGFLASH_INSTALL}" + +XSERVER ?= "xserver-kdrive-fbdev" + +DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpephone" +RDEPENDS = "${PACKAGE_INSTALL}" + +export PACKAGE_INSTALL = "\ + ${MACHINE_TASK_PROVIDER} \ + gpephone-task-base \ + gpephone-task-pim \ + gpephone-task-settings \ + gpephone-task-development \ + gpephone-task-apps \ + gpephone-task-connectivity \ + ${XSERVER} \ + ${GPE_EXTRA_INSTALL}" + +inherit image +LICENSE = "MIT" diff --git a/packages/gpephone/gsmmux/.mtn2git_empty b/packages/gpephone/gsmmux/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpephone/gsmmux/gsmmux-makefile.patch b/packages/gpephone/gsmmux/gsmmux-makefile.patch new file mode 100644 index 0000000000..66ac085f1d --- /dev/null +++ b/packages/gpephone/gsmmux/gsmmux-makefile.patch @@ -0,0 +1,28 @@ +--- Makefile.orig 2007-02-04 15:34:43.000000000 +0100 ++++ Makefile 2007-02-04 15:36:58.000000000 +0100 +@@ -5,9 +5,7 @@ + SRC = gsm0710.c buffer.c + OBJS = gsm0710.o buffer.o + +-CC = gcc +-LD = gcc +-CFLAGS = -Wall ++PACKAGE_CFLAGS = -Wall + LDLIBS = -lm + + ifeq ($(DEBUG),y) +@@ -21,9 +19,13 @@ + rm -f $(OBJS) $(TARGET) + + %.o: %.c +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS) $(PACKAGE_CFLAGS) -c -o $@ $< + + $(TARGET): $(OBJS) + $(LD) $(LDLIBS) -o $@ $(OBJS) + ++install: $(TARGET) ++ install -d $(DESTDIR)/$(PREFIX)/bin ++ install -m 755 $(TARGET) $(DESTDIR)/$(PREFIX)/bin ++ + .PHONY: all clean diff --git a/packages/gpephone/gsmmux_alpha-2.bb b/packages/gpephone/gsmmux_alpha-2.bb new file mode 100644 index 0000000000..3354acdafb --- /dev/null +++ b/packages/gpephone/gsmmux_alpha-2.bb @@ -0,0 +1,12 @@ +LICENSE = "GPL" +DESCRIPTION = "A GSM (De-)Multiplexer." +SECTION = "gsm" +PRIORITY = "optional" +PR = "r0" + +DEPENDS = "glibc" + +inherit gpe + +SRC_URI = "http://download2.berlios.de/gsmmux/${P}.tar.gz \ + file://gsmmux-makefile.patch;patch=1;pnum=0" diff --git a/packages/gpephone/iksemel_1.2.bb b/packages/gpephone/iksemel_1.2.bb new file mode 100644 index 0000000000..69cc98ec0d --- /dev/null +++ b/packages/gpephone/iksemel_1.2.bb @@ -0,0 +1,14 @@ +LICENSE = "LGPL" +DESCRIPTION = "A simple, powerful XML-parsing library written in C." +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "glibc" +PR = "r0" + +inherit pkgconfig autotools + +SRC_URI = "http://files.jabberstudio.org/iksemel/${P}.tar.gz" + +do_stage () { + autotools_stage_all +} diff --git a/packages/gpephone/libabenabler_0.1.bb b/packages/gpephone/libabenabler_0.1.bb new file mode 100644 index 0000000000..84afecb83b --- /dev/null +++ b/packages/gpephone/libabenabler_0.1.bb @@ -0,0 +1,16 @@ +LICENSE = "LGPL" +DESCRIPTION = "LiPS event model library." +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "glib-2.0 librecord liblipsevent libim sqlite3" +PR = "r1" + +GPE_TARBALL_SUFFIX = "bz2" + +inherit gpephone pkgconfig autotools + +LDFLAGS += " -L${STAGING_LIBDIR}" + +do_stage () { + autotools_stage_all +} diff --git a/packages/gpephone/libcalenabler_0.1.bb b/packages/gpephone/libcalenabler_0.1.bb new file mode 100644 index 0000000000..e5375a8f86 --- /dev/null +++ b/packages/gpephone/libcalenabler_0.1.bb @@ -0,0 +1,16 @@ +LICENSE = "LiPS" +DESCRIPTION = "LiPS event model library." +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "glib-2.0 e2fsprogs-libs sqlite3" +PR = "r1" + +GPE_TARBALL_SUFFIX = "bz2" + +inherit gpe pkgconfig autotools + +LDFLAGS += " -L${STAGING_LIBDIR}" + +do_stage () { + autotools_stage_all +} diff --git a/packages/gpephone/libchenabler_0.1.bb b/packages/gpephone/libchenabler_0.1.bb new file mode 100644 index 0000000000..86a6397b07 --- /dev/null +++ b/packages/gpephone/libchenabler_0.1.bb @@ -0,0 +1,16 @@ +LICENSE = "LiPS" +DESCRIPTION = "LiPS voice call library." +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "glib-2.0 sqlite3 librecord" +PR = "r0" + +GPE_TARBALL_SUFFIX = "bz2" + +inherit gpe pkgconfig autotools + +FILES_${PN} += " ${datadir}/vochistory" + +do_stage () { + autotools_stage_all +} diff --git a/packages/gpephone/libgemwidget_0.1.bb b/packages/gpephone/libgemwidget_0.1.bb new file mode 100644 index 0000000000..88a7e6292c --- /dev/null +++ b/packages/gpephone/libgemwidget_0.1.bb @@ -0,0 +1,13 @@ +LICENSE = "LiPS" +DESCRIPTION = "Extended widget library for GPE phone environment." +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "gtk+ libiac" +PR = "r1" + +GPE_TARBALL_SUFFIX = "bz2" +inherit gpephone pkgconfig autotools + +do_stage () { + autotools_stage_all +} diff --git a/packages/gpephone/libgpephone_0.3.bb b/packages/gpephone/libgpephone_0.3.bb new file mode 100644 index 0000000000..48a5148143 --- /dev/null +++ b/packages/gpephone/libgpephone_0.3.bb @@ -0,0 +1,13 @@ +LICENSE = "LGPL" +DESCRIPTION = "Base library for GPE phone environment." +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "gtk+ gtk-doc dbus-glib" +PR = "r1" + +GPE_TARBALL_SUFFIX = "bz2" +inherit gpephone pkgconfig autotools + +do_stage () { + autotools_stage_all +} diff --git a/packages/gpephone/libiac_0.1.bb b/packages/gpephone/libiac_0.1.bb new file mode 100644 index 0000000000..42e9fc77bc --- /dev/null +++ b/packages/gpephone/libiac_0.1.bb @@ -0,0 +1,13 @@ +LICENSE = "LiPS" +DESCRIPTION = "LiPS IPC library." +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "gtk+ gtk-doc" +PR = "r1" + +GPE_TARBALL_SUFFIX = "bz2" +inherit gpephone pkgconfig autotools + +do_stage () { + autotools_stage_all +} diff --git a/packages/gpephone/libidn_0.5.19.bb b/packages/gpephone/libidn_0.5.19.bb new file mode 100644 index 0000000000..9c37e015a9 --- /dev/null +++ b/packages/gpephone/libidn_0.5.19.bb @@ -0,0 +1,20 @@ +LICENSE = "LGPL" +DESCRIPTION = "Implementation of the Stringprep, Punycode and IDNA specifications defined by the IETF Internationalized Domain Names (IDN) working group." +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "glibc" +PR = "r0" + +inherit pkgconfig autotools + +SRC_URI = "http://josefsson.org/libidn/releases/${P}.tar.gz" + +EXTRA_OECONF = " --disable-tld" + +do_configure_prepend () { + autoreconf -f -i -s +} + +do_stage () { + autotools_stage_all +} diff --git a/packages/gpephone/libim_0.1.bb b/packages/gpephone/libim_0.1.bb new file mode 100644 index 0000000000..6d8f2b45f5 --- /dev/null +++ b/packages/gpephone/libim_0.1.bb @@ -0,0 +1,21 @@ +LICENSE = "LGPL" +DESCRIPTION = "LiPS event model library." +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "glib-2.0 libgpg-error libgcrypt gnutls libidn iksemel gloox dbus-glib liblipsevent" +PR = "r0" + +inherit gpephone pkgconfig autotools + +SRC_URI = "file://source/lips_im-${PV}.tar.gz" + +EXTRA_OECONF = "--with-session-bus-services-dir=${datadir}/dbus-1/services" + +S = ${WORKDIR}/lips_im-${PV} + +FILES_${PN} += " ${datadir}/dbus-1" + +do_stage () { + autotools_stage_all +} +< diff --git a/packages/gpephone/liblipsevent_0.1.bb b/packages/gpephone/liblipsevent_0.1.bb new file mode 100644 index 0000000000..ada0d2ab81 --- /dev/null +++ b/packages/gpephone/liblipsevent_0.1.bb @@ -0,0 +1,16 @@ +LICENSE = "LiPS" +DESCRIPTION = "LiPS event model library." +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "glib-2.0" +PR = "r0" + +inherit gpephone pkgconfig autotools + +SRC_URI = "file://source/lips_event-${PV}.tar.gz" + +S = ${WORKDIR}/lips_event-${PV} + +do_stage () { + autotools_stage_all +} diff --git a/packages/gpephone/libmsgenabler_0.1.bb b/packages/gpephone/libmsgenabler_0.1.bb new file mode 100644 index 0000000000..84c3b7971c --- /dev/null +++ b/packages/gpephone/libmsgenabler_0.1.bb @@ -0,0 +1,14 @@ +LICENSE = "LiPS" +DESCRIPTION = "LiPS event model library." +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "glib-2.0 dbus-glib librecord sqlite3" +PR = "r0" + +GPE_TARBALL_SUFFIX = "bz2" + +inherit gpephone pkgconfig autotools + +do_stage () { + autotools_stage_all +} diff --git a/packages/gpephone/librecord_0.1.bb b/packages/gpephone/librecord_0.1.bb new file mode 100644 index 0000000000..ecad1bb1bb --- /dev/null +++ b/packages/gpephone/librecord_0.1.bb @@ -0,0 +1,15 @@ +LICENSE = "LiPS" +DESCRIPTION = "LiPS database API." +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "glib-2.0 e2fsprogs-libs sqlite3 e2fsprogs-libs" +PR = "r0" + +GPE_TARBALL_SUFFIX = "bz2" +inherit gpephone pkgconfig autotools + +LDFLAGS += " -L${STAGING_LIBDIR}" + +do_stage () { + autotools_stage_all +} diff --git a/packages/gpephone/libvocenabler_0.1.bb b/packages/gpephone/libvocenabler_0.1.bb new file mode 100644 index 0000000000..208b83f584 --- /dev/null +++ b/packages/gpephone/libvocenabler_0.1.bb @@ -0,0 +1,14 @@ +LICENSE = "LiPS" +DESCRIPTION = "LiPS voice call library." +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "glib-2.0 dbus-glib linphone" +PR = "r0" + +GPE_TARBALL_SUFFIX = "bz2" + +inherit gpephone pkgconfig autotools + +do_stage () { + autotools_stage_all +} diff --git a/packages/gpephone/linphone-1.5.0/.mtn2git_empty b/packages/gpephone/linphone-1.5.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpephone/linphone-1.5.0/linphone-1.5.0.patch b/packages/gpephone/linphone-1.5.0/linphone-1.5.0.patch new file mode 100644 index 0000000000..c6d65e0238 --- /dev/null +++ b/packages/gpephone/linphone-1.5.0/linphone-1.5.0.patch @@ -0,0 +1,115730 @@ +diff -ur linphone-1.5.0/aclocal.m4 linphone-1.5.0-after/aclocal.m4 +--- linphone-1.5.0/aclocal.m4 2006-10-11 03:26:16.000000000 +0800 ++++ linphone-1.5.0-after/aclocal.m4 2007-01-19 16:04:59.000000000 +0800 +@@ -1,7 +1,7 @@ +-# generated automatically by aclocal 1.9.6 -*- Autoconf -*- ++# generated automatically by aclocal 1.9.2 -*- Autoconf -*- + +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005 Free Software Foundation, Inc. ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 ++# Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -11,30 +11,28 @@ + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A + # PARTICULAR PURPOSE. + ++ll## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*- + +-dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) +-# serial 35 IT_PROG_INTLTOOL +-AC_DEFUN([IT_PROG_INTLTOOL], +-[AC_PREREQ([2.50])dnl +- +-case "$am__api_version" in +- 1.[01234]) +- AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) +- ;; +- *) +- ;; +-esac ++dnl AC_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) ++# serial 1 AC_PROG_INTLTOOL ++AC_DEFUN([AC_PROG_INTLTOOL], ++[ + + if test -n "$1"; then + AC_MSG_CHECKING(for intltool >= $1) + +- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` +- [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in` +- ] +- AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) +- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || +- AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) ++ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ printf "%d", $[1] * 100 + $[2]; }'` ++ INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { printf $[2]; }' < ${ac_aux_dir}/intltool-update.in` ++ changequote({{,}}) ++ INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split(${{2}}, VERSION, "."); printf "%d\n", VERSION[1] * 100 + VERSION[2];}' < ${ac_aux_dir}/intltool-update.in` ++ changequote([,]) ++ ++ if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT"; then ++ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) ++ else ++ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found. Your intltool is too old. You need intltool $1 or later.]) ++ exit 1 ++ fi + fi + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +@@ -48,13 +46,11 @@ + INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + + AC_SUBST(INTLTOOL_DESKTOP_RULE) + AC_SUBST(INTLTOOL_DIRECTORY_RULE) +@@ -69,16 +65,19 @@ + AC_SUBST(INTLTOOL_XAM_RULE) + AC_SUBST(INTLTOOL_KBD_RULE) + AC_SUBST(INTLTOOL_XML_RULE) +-AC_SUBST(INTLTOOL_XML_NOMERGE_RULE) + AC_SUBST(INTLTOOL_CAVES_RULE) + AC_SUBST(INTLTOOL_SCHEMAS_RULE) + AC_SUBST(INTLTOOL_THEME_RULE) +-AC_SUBST(INTLTOOL_SERVICE_RULE) + + # Use the tools built into the package, not the ones that are installed. +-AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') +-AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge') +-AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update') ++ ++INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract' ++INTLTOOL_MERGE='$(top_builddir)/intltool-merge' ++INTLTOOL_UPDATE='$(top_builddir)/intltool-update' ++ ++AC_SUBST(INTLTOOL_EXTRACT) ++AC_SUBST(INTLTOOL_MERGE) ++AC_SUBST(INTLTOOL_UPDATE) + + AC_PATH_PROG(INTLTOOL_PERL, perl) + if test -z "$INTLTOOL_PERL"; then +@@ -96,106 +95,67 @@ + fi + fi + +-AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv) +-AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt) +-AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge) +-AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext) +- +-# Substitute ALL_LINGUAS so we can use it in po/Makefile +-AC_SUBST(ALL_LINGUAS) +- +-IT_PO_SUBDIR([po]) +- +-dnl The following is very similar to +-dnl +-dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update]) +-dnl +-dnl with the following slight differences: +-dnl - the *.in files are in ac_aux_dir, +-dnl - if the file haven't changed upon reconfigure, it's not touched, +-dnl - the evaluation of the third parameter enables a hack which computes +-dnl the actual value of $libdir, +-dnl - the user sees "executing intltool commands", instead of +-dnl "creating intltool-extract" and such. +-dnl +-dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were +-dnl a reason for it. +- +-AC_CONFIG_COMMANDS([intltool], [ ++# Remove file type tags (using []) from po/POTFILES. + +-for file in intltool-extract intltool-merge intltool-update; do +- sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ +- -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ +- -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \ +- -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \ +- -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \ +- -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \ +- -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ +- < ${ac_aux_dir}/${file}.in > ${file}.out +- if cmp -s ${file} ${file}.out 2>/dev/null; then +- rm -f ${file}.out +- else +- mv -f ${file}.out ${file} +- fi +- chmod ugo+x ${file} +- chmod u+w ${file} +-done ++ifdef([AC_DIVERSION_ICMDS],[ ++ AC_DIVERT_PUSH(AC_DIVERSION_ICMDS) ++ changequote(,) ++ mv -f po/POTFILES po/POTFILES.tmp ++ sed -e '/\[encoding.*\]/d' -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES ++ rm -f po/POTFILES.tmp ++ changequote([,]) ++ AC_DIVERT_POP() ++],[ ++ ifdef([AC_CONFIG_COMMANDS_PRE],[ ++ AC_CONFIG_COMMANDS_PRE([ ++ changequote(,) ++ mv -f po/POTFILES po/POTFILES.tmp ++ sed -e '/\[encoding.*\]/d' -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES ++ rm -f po/POTFILES.tmp ++ changequote([,]) ++ ]) ++ ]) ++]) + +-], +-[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' +-prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" +-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}' +-INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}' +-INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}']) ++# Manually sed perl in so people don't have to put the intltool scripts in AC_OUTPUT. + +-]) ++AC_OUTPUT_COMMANDS([ + ++sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${ac_aux_dir}/intltool-extract.in > intltool-extract.out ++if cmp -s intltool-extract intltool-extract.out 2>/dev/null; then ++ rm -f intltool-extract.out ++else ++ mv -f intltool-extract.out intltool-extract ++fi ++chmod ugo+x intltool-extract ++chmod u+w intltool-extract + +-# IT_PO_SUBDIR(DIRNAME) +-# --------------------- +-# All po subdirs have to be declared with this macro; the subdir "po" is +-# declared by IT_PROG_INTLTOOL. +-# +-AC_DEFUN([IT_PO_SUBDIR], +-[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. +-dnl +-dnl The following CONFIG_COMMANDS should be exetuted at the very end +-dnl of config.status. +-AC_CONFIG_COMMANDS_PRE([ +- AC_CONFIG_COMMANDS([$1/stamp-it], [ +- rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" +- >"$1/stamp-it.tmp" +- [sed '/^#/d +- s/^[[].*] *// +- /^[ ]*$/d +- '"s|^| $ac_top_srcdir/|" \ +- "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" +- ] +- if test ! -f "$1/Makefile"; then +- AC_MSG_ERROR([$1/Makefile is not ready.]) +- fi +- mv "$1/Makefile" "$1/Makefile.tmp" +- [sed '/^POTFILES =/,/[^\\]$/ { +- /^POTFILES =/!d +- r $1/POTFILES +- } +- ' "$1/Makefile.tmp" >"$1/Makefile"] +- rm -f "$1/Makefile.tmp" +- mv "$1/stamp-it.tmp" "$1/stamp-it" +- ]) +-])dnl +-]) ++sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" \ ++ < ${ac_aux_dir}/intltool-merge.in > intltool-merge.out ++if cmp -s intltool-merge intltool-merge.out 2>/dev/null; then ++ rm -f intltool-merge.out ++else ++ mv -f intltool-merge.out intltool-merge ++fi ++chmod ugo+x intltool-merge ++chmod u+w intltool-merge + ++sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${ac_aux_dir}/intltool-update.in > intltool-update.out ++if cmp -s intltool-update intltool-update.out 2>/dev/null; then ++ rm -f intltool-update.out ++else ++ mv -f intltool-update.out intltool-update ++fi ++chmod ugo+x intltool-update ++chmod u+w intltool-update + +-# deprecated macros +-AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) +-# A hint is needed for aclocal from Automake <= 1.9.4: +-# AC_DEFUN([AC_PROG_INTLTOOL], ...) ++], INTLTOOL_PERL=${INTLTOOL_PERL} ac_aux_dir=${ac_aux_dir}) + ++]) + + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + +-# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL ++# serial 47 AC_PROG_LIBTOOL + + + # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +@@ -305,7 +265,7 @@ + + # Sed substitution that helps us do robust quoting. It backslashifies + # metacharacters that are still active within double-quoted strings. +-Xsed='sed -e 1s/^X//' ++Xsed='sed -e s/^X//' + [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] + + # Same as above, but do not quote variable references. +@@ -325,7 +285,7 @@ + default_ofile=libtool + can_build_shared=yes + +-# All known linkers require a `.a' archive for static linking (except MSVC, ++# All known linkers require a `.a' archive for static linking (except M$VC, + # which needs '.lib'). + libext=a + ltmain="$ac_aux_dir/ltmain.sh" +@@ -345,7 +305,6 @@ + test -z "$AS" && AS=as + test -z "$CC" && CC=cc + test -z "$LTCC" && LTCC=$CC +-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS + test -z "$DLLTOOL" && DLLTOOL=dlltool + test -z "$LD" && LD=ld + test -z "$LN_S" && LN_S="ln -s" +@@ -365,17 +324,15 @@ + if test -n "$RANLIB"; then + case $host_os in + openbsd*) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ++ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" + ;; + *) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ++ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + fi + +-_LT_CC_BASENAME([$compiler]) +- + # Only perform the check for file, if the check method requires it + case $deplibs_check_method in + file_magic*) +@@ -416,56 +373,11 @@ + # If no C compiler was specified, use CC. + LTCC=${LTCC-"$CC"} + +-# If no C compiler flags were specified, use CFLAGS. +-LTCFLAGS=${LTCFLAGS-"$CFLAGS"} +- + # Allow CC to be a program name with arguments. + compiler=$CC + ])# _LT_AC_SYS_COMPILER + + +-# _LT_CC_BASENAME(CC) +-# ------------------- +-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +-AC_DEFUN([_LT_CC_BASENAME], +-[for cc_temp in $1""; do +- case $cc_temp in +- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; +- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; +- \-*) ;; +- *) break;; +- esac +-done +-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +-]) +- +- +-# _LT_COMPILER_BOILERPLATE +-# ------------------------ +-# Check for compiler boilerplate output or warnings with +-# the simple compiler test code. +-AC_DEFUN([_LT_COMPILER_BOILERPLATE], +-[ac_outfile=conftest.$ac_objext +-printf "$lt_simple_compile_test_code" >conftest.$ac_ext +-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +-_lt_compiler_boilerplate=`cat conftest.err` +-$rm conftest* +-])# _LT_COMPILER_BOILERPLATE +- +- +-# _LT_LINKER_BOILERPLATE +-# ---------------------- +-# Check for linker boilerplate output or warnings with +-# the simple link test code. +-AC_DEFUN([_LT_LINKER_BOILERPLATE], +-[ac_outfile=conftest.$ac_objext +-printf "$lt_simple_link_test_code" >conftest.$ac_ext +-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +-_lt_linker_boilerplate=`cat conftest.err` +-$rm conftest* +-])# _LT_LINKER_BOILERPLATE +- +- + # _LT_AC_SYS_LIBPATH_AIX + # ---------------------- + # Links a minimal program and checks the executable +@@ -538,15 +450,15 @@ + + # 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 "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi + + if test -z "$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 && +- echo_test_string=`eval $cmd` && ++ if (echo_test_string="`eval $cmd`") 2>/dev/null && ++ echo_test_string="`eval $cmd`" && + (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null + then + break +@@ -715,7 +627,7 @@ + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then +- case `/usr/bin/file conftest.o` in ++ case "`/usr/bin/file conftest.o`" in + *32-bit*) + case $host in + x86_64-*linux*) +@@ -766,22 +678,6 @@ + CFLAGS="$SAVE_CFLAGS" + fi + ;; +-sparc*-*solaris*) +- # Find out which ABI we are using. +- echo 'int i;' > conftest.$ac_ext +- if AC_TRY_EVAL(ac_compile); then +- case `/usr/bin/file conftest.o` in +- *64-bit*) +- case $lt_cv_prog_gnu_ld in +- yes*) LD="${LD-ld} -m elf64_sparc" ;; +- *) LD="${LD-ld} -64" ;; +- esac +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- + AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], + [*-*-cygwin* | *-*-mingw* | *-*-pw32*) + AC_CHECK_TOOL(DLLTOOL, dlltool, false) +@@ -813,7 +709,7 @@ + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ +- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's:.*FLAGS}? :&$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) +@@ -823,10 +719,8 @@ + echo "$as_me:__oline__: \$? = $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 +- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 +- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++ # So say no if there are warnings ++ if test ! -s conftest.err; then + $2=yes + fi + fi +@@ -852,16 +746,11 @@ + LDFLAGS="$LDFLAGS $3" + printf "$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 ++ # The compiler 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>&AS_MESSAGE_LOG_FD +- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp +- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 +- if diff conftest.exp conftest.er2 >/dev/null; then +- $2=yes +- fi + else + $2=yes + fi +@@ -920,55 +809,11 @@ + lt_cv_sys_max_cmd_len=8192; + ;; + +- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) +- # This has been around since 386BSD, at least. Likely further. +- if test -x /sbin/sysctl; then +- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` +- elif test -x /usr/sbin/sysctl; then +- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` +- else +- lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs +- fi +- # And add a safety zone +- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` +- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` +- ;; +- +- interix*) +- # We know the value 262144 and hardcode it with a safety zone (like BSD) +- lt_cv_sys_max_cmd_len=196608 +- ;; +- +- osf*) +- # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure +- # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not +- # nice to cause kernel panics so lets avoid the loop below. +- # First set a reasonable default. +- lt_cv_sys_max_cmd_len=16384 +- # +- if test -x /sbin/sysconfig; then +- case `/sbin/sysconfig -q proc exec_disable_arg_limit` in +- *1*) lt_cv_sys_max_cmd_len=-1 ;; +- esac +- fi +- ;; +- sco3.2v5*) +- lt_cv_sys_max_cmd_len=102400 +- ;; +- sysv5* | sco5v6* | sysv4.2uw2*) +- kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` +- if test -n "$kargmax"; then +- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` +- else +- lt_cv_sys_max_cmd_len=32768 +- fi +- ;; +- *) ++ *) + # 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. +- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} +- while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ ++ while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ + = "XX$teststring") >/dev/null 2>&1 && + new_result=`expr "X$teststring" : ".*" 2>&1` && + lt_cv_sys_max_cmd_len=$new_result && +@@ -994,7 +839,7 @@ + + + # _LT_AC_CHECK_DLFCN +-# ------------------ ++# -------------------- + AC_DEFUN([_LT_AC_CHECK_DLFCN], + [AC_CHECK_HEADERS(dlfcn.h)dnl + ])# _LT_AC_CHECK_DLFCN +@@ -1002,7 +847,7 @@ + + # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, + # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) +-# --------------------------------------------------------------------- ++# ------------------------------------------------------------------ + AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], + [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl + if test "$cross_compiling" = yes; then : +@@ -1068,19 +913,17 @@ + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } +- else +- puts (dlerror ()); + + exit (status); + }] + EOF + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then +- (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null ++ (./conftest; exit; ) 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) $1 ;; + x$lt_dlneed_uscore) $2 ;; +- x$lt_dlunknown|x*) $3 ;; ++ x$lt_unknown|x*) $3 ;; + esac + else : + # compilation failed +@@ -1092,7 +935,7 @@ + + + # AC_LIBTOOL_DLOPEN_SELF +-# ---------------------- ++# ------------------- + AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], + [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl + if test "x$enable_dlopen" != xyes; then +@@ -1163,7 +1006,7 @@ + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" +- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" ++ eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" +@@ -1176,7 +1019,7 @@ + ]) + + if test "x$lt_cv_dlopen_self" = xyes; then +- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" ++ LDFLAGS="$LDFLAGS $link_static_flag" + AC_CACHE_CHECK([whether a statically linked program can dlopen itself], + lt_cv_dlopen_self_static, [dnl + _LT_AC_TRY_DLOPEN_SELF( +@@ -1224,7 +1067,7 @@ + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ +- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's:.*FLAGS}? :&$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) +@@ -1236,13 +1079,11 @@ + 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 +- $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 ++ if test ! -s out/conftest.err; then + _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + fi + fi +- chmod u+w . 2>&AS_MESSAGE_LOG_FD ++ chmod u+w . + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation +@@ -1306,8 +1147,8 @@ + [AC_MSG_CHECKING([how to hardcode library paths into programs]) + _LT_AC_TAGVAR(hardcode_action, $1)= + if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ +- test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ +- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then ++ test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \ ++ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then + + # We can hardcode non-existant directories. + if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && +@@ -1474,7 +1315,7 @@ + shlibpath_var=LIBRARY_PATH + ;; + +-bsdi[[45]]*) ++bsdi4*) + version_type=linux + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +@@ -1502,8 +1343,7 @@ + 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~ +- chmod a+x \$dldir/$dlname' ++ $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $rm \$dlpath' +@@ -1533,7 +1373,7 @@ + ;; + 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}' ++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + esac + ;; +@@ -1556,7 +1396,7 @@ + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH +- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' ++ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' + # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. + if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +@@ -1579,17 +1419,20 @@ + dynamic_linker=no + ;; + +-freebsd* | dragonfly*) +- # DragonFly does not have aout. When/if they implement a new +- # versioning mechanism, adjust this. +- if test -x /usr/bin/objformat; then +- objformat=`/usr/bin/objformat` +- else +- case $host_os in +- freebsd[[123]]*) objformat=aout ;; +- *) objformat=elf ;; +- esac +- fi ++kfreebsd*-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='GNU ld.so' ++ ;; ++ ++freebsd*) ++ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +@@ -1607,19 +1450,14 @@ + freebsd2*) + shlibpath_overrides_runpath=yes + ;; +- freebsd3.[[01]]* | freebsdelf3.[[01]]*) ++ freebsd3.[01]* | freebsdelf3.[01]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; +- freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ +- freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) ++ *) # from 3.2 on + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; +- freebsd*) # from 4.6 on +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; + esac + ;; + +@@ -1639,7 +1477,7 @@ + version_type=sunos + need_lib_prefix=no + need_version=no +- case $host_cpu in ++ case "$host_cpu" in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes +@@ -1679,18 +1517,6 @@ + postinstall_cmds='chmod 555 $lib' + ;; + +-interix3*) +- 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' +- dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- ;; +- + irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; +@@ -1734,7 +1560,7 @@ + ;; + + # This must be Linux ELF. +-linux* | k*bsd*-gnu) ++linux*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -1748,10 +1574,27 @@ + # before this can be enabled. + hardcode_into_libs=yes + ++ # find out which ABI we are using ++ libsuff= ++ case "$host_cpu" in ++ x86_64*|s390x*|powerpc64*) ++ echo '[#]line __oline__ "configure"' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *64-bit*) ++ libsuff=64 ++ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++ esac ++ + # 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)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -1763,7 +1606,7 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + +-netbsdelf*-gnu) ++knetbsd*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -1772,7 +1615,7 @@ + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes +- dynamic_linker='NetBSD ld.elf_so' ++ dynamic_linker='GNU ld.so' + ;; + + netbsd*) +@@ -1812,13 +1655,8 @@ + + openbsd*) + version_type=sunos +- sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no +- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. +- case $host_os in +- openbsd3.3 | openbsd3.3.*) need_version=yes ;; +- *) need_version=no ;; +- esac ++ need_version=yes + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH +@@ -1856,6 +1694,13 @@ + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + ++sco3.2v5*) ++ version_type=osf ++ soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; ++ + solaris*) + version_type=linux + need_lib_prefix=no +@@ -1881,7 +1726,7 @@ + need_version=yes + ;; + +-sysv4 | sysv4.3*) ++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' +@@ -1914,29 +1759,6 @@ + fi + ;; + +-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +- version_type=freebsd-elf +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- hardcode_into_libs=yes +- if test "$with_gnu_ld" = yes; then +- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' +- shlibpath_overrides_runpath=no +- else +- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' +- shlibpath_overrides_runpath=yes +- case $host_os in +- sco3.2v5*) +- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" +- ;; +- esac +- fi +- sys_lib_dlsearch_path_spec='/usr/lib' +- ;; +- + uts4*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +@@ -1950,11 +1772,6 @@ + esac + AC_MSG_RESULT([$dynamic_linker]) + test "$dynamic_linker" = no && can_build_shared=no +- +-variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +-if test "$GCC" = yes; then +- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +-fi + ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER + + +@@ -1979,9 +1796,6 @@ + AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) + fi + fi +- if test -z "$LTCFLAGS"; then +- eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" +- fi + + # Extract list of available tagged configurations in $ofile. + # Note that this assumes the entire list is on one line. +@@ -2008,9 +1822,7 @@ + + case $tagname in + CXX) +- if test -n "$CXX" && ( test "X$CXX" != "Xno" && +- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || +- (test "X$CXX" != "Xg++"))) ; then ++ if test -n "$CXX" && test "X$CXX" != "Xno"; then + AC_LIBTOOL_LANG_CXX_CONFIG + else + tagname="" +@@ -2072,7 +1884,7 @@ + + # AC_LIBTOOL_WIN32_DLL + # -------------------- +-# declare package support for building win32 DLLs ++# declare package support for building win32 dll's + AC_DEFUN([AC_LIBTOOL_WIN32_DLL], + [AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) + ])# AC_LIBTOOL_WIN32_DLL +@@ -2110,7 +1922,7 @@ + + # AC_DISABLE_SHARED + # ----------------- +-# set the default shared flag to --disable-shared ++#- set the default shared flag to --disable-shared + AC_DEFUN([AC_DISABLE_SHARED], + [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl + AC_ENABLE_SHARED(no) +@@ -2246,7 +2058,7 @@ + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) +- file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` ++ file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then +@@ -2356,7 +2168,7 @@ + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, +- # but apparently some variants of GNU ld only accept -v. ++ # but apparently some GNU ld's only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. +- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged