diff options
| author | Thomas Zimmermann <ml@vdm-design.de> | 2010-03-16 09:52:03 +0100 |
|---|---|---|
| committer | Thomas Zimmermann <ml@vdm-design.de> | 2010-03-16 09:52:03 +0100 |
| commit | 9633163da82970520883b3ec8a14cd9aa41034b6 (patch) | |
| tree | 9aef8ed6170ee5c1b3b53aabff3eb37a461ec063 /recipes | |
| parent | e19f00968b9d865088ef3a45a85825c5fc17edc5 (diff) | |
| parent | 0f2f85bac90c4aa498ab77d5cfef19aaa581afce (diff) | |
Merge branch 'org.openembedded.dev' of ssh://git.openembedded.net/openembedded into org.openembedded.dev
Diffstat (limited to 'recipes')
306 files changed, 24791 insertions, 10950 deletions
diff --git a/recipes/alsa/alsa-lib_1.0.11.bb b/recipes/alsa/alsa-lib_1.0.11.bb index 4d7c2e8893..5bdee7eebb 100644 --- a/recipes/alsa/alsa-lib_1.0.11.bb +++ b/recipes/alsa/alsa-lib_1.0.11.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" -LICENSE = "LGPL" +LICENSE = "LGPLv2.1" PR = "r4" # configure.in sets -D__arm__ on the command line for any arm system diff --git a/recipes/alsa/alsa-lib_1.0.13.bb b/recipes/alsa/alsa-lib_1.0.13.bb index 03ab74f664..1cfb52b7e0 100644 --- a/recipes/alsa/alsa-lib_1.0.13.bb +++ b/recipes/alsa/alsa-lib_1.0.13.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" -LICENSE = "LGPL" +LICENSE = "LGPLv2.1" PR = "r4" # configure.in sets -D__arm__ on the command line for any arm system diff --git a/recipes/alsa/alsa-lib_1.0.14.bb b/recipes/alsa/alsa-lib_1.0.14.bb index 284ddd9bc6..520b3256d9 100644 --- a/recipes/alsa/alsa-lib_1.0.14.bb +++ b/recipes/alsa/alsa-lib_1.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" -LICENSE = "LGPL" +LICENSE = "LGPLv2.1" PR = "r2" diff --git a/recipes/alsa/alsa-lib_1.0.15.bb b/recipes/alsa/alsa-lib_1.0.15.bb index b502adb3b5..6034aa7815 100644 --- a/recipes/alsa/alsa-lib_1.0.15.bb +++ b/recipes/alsa/alsa-lib_1.0.15.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" -LICENSE = "LGPL" +LICENSE = "LGPLv2.1" PR = "r1" # configure.in sets -D__arm__ on the command line for any arm system diff --git a/recipes/alsa/alsa-lib_1.0.17.bb b/recipes/alsa/alsa-lib_1.0.17.bb index eff114de4b..c2401c6d0e 100644 --- a/recipes/alsa/alsa-lib_1.0.17.bb +++ b/recipes/alsa/alsa-lib_1.0.17.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" -LICENSE = "LGPL" +LICENSE = "LGPLv2.1" # configure.in sets -D__arm__ on the command line for any arm system # (not just those with the ARM instruction set), this should be removed, diff --git a/recipes/alsa/alsa-lib_1.0.18.bb b/recipes/alsa/alsa-lib_1.0.18.bb index eff114de4b..c2401c6d0e 100644 --- a/recipes/alsa/alsa-lib_1.0.18.bb +++ b/recipes/alsa/alsa-lib_1.0.18.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" -LICENSE = "LGPL" +LICENSE = "LGPLv2.1" # configure.in sets -D__arm__ on the command line for any arm system # (not just those with the ARM instruction set), this should be removed, diff --git a/recipes/alsa/alsa-lib_1.0.19.bb b/recipes/alsa/alsa-lib_1.0.19.bb index eff114de4b..c2401c6d0e 100644 --- a/recipes/alsa/alsa-lib_1.0.19.bb +++ b/recipes/alsa/alsa-lib_1.0.19.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" -LICENSE = "LGPL" +LICENSE = "LGPLv2.1" # configure.in sets -D__arm__ on the command line for any arm system # (not just those with the ARM instruction set), this should be removed, diff --git a/recipes/alsa/alsa-lib_1.0.20.bb b/recipes/alsa/alsa-lib_1.0.20.bb index 6e61b4040b..55951be70b 100644 --- a/recipes/alsa/alsa-lib_1.0.20.bb +++ b/recipes/alsa/alsa-lib_1.0.20.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" -LICENSE = "LGPL" +LICENSE = "LGPLv2.1" PR = "r3" # configure.in sets -D__arm__ on the command line for any arm system diff --git a/recipes/alsa/alsa-utils_1.0.11.bb b/recipes/alsa/alsa-utils_1.0.11.bb index d2acfe1995..fbcf8d5c39 100644 --- a/recipes/alsa/alsa-utils_1.0.11.bb +++ b/recipes/alsa/alsa-utils_1.0.11.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ALSA Utilities" HOMEPAGE = "http://www.alsa-project.org" SECTION = "console/utils" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS = "alsa-lib ncurses" PR = "r1" diff --git a/recipes/alsa/alsa-utils_1.0.13.bb b/recipes/alsa/alsa-utils_1.0.13.bb index e77c2d97f7..a0248735b2 100644 --- a/recipes/alsa/alsa-utils_1.0.13.bb +++ b/recipes/alsa/alsa-utils_1.0.13.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ALSA Utilities" HOMEPAGE = "http://www.alsa-project.org" SECTION = "console/utils" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS = "alsa-lib ncurses" PR = "r1" diff --git a/recipes/alsa/alsa-utils_1.0.14.bb b/recipes/alsa/alsa-utils_1.0.14.bb index 25eeade7cd..e46f0e92be 100644 --- a/recipes/alsa/alsa-utils_1.0.14.bb +++ b/recipes/alsa/alsa-utils_1.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ALSA Utilities" HOMEPAGE = "http://www.alsa-project.org" SECTION = "console/utils" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS = "alsa-lib ncurses" PR = "r1" diff --git a/recipes/alsa/alsa-utils_1.0.15.bb b/recipes/alsa/alsa-utils_1.0.15.bb index b271e75439..ae879f2d6c 100644 --- a/recipes/alsa/alsa-utils_1.0.15.bb +++ b/recipes/alsa/alsa-utils_1.0.15.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ALSA Utilities" HOMEPAGE = "http://www.alsa-project.org" SECTION = "console/utils" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS = "alsa-lib ncurses" PR = "r1" diff --git a/recipes/alsa/alsa-utils_1.0.17.bb b/recipes/alsa/alsa-utils_1.0.17.bb index d5f116bafc..9d98601c08 100644 --- a/recipes/alsa/alsa-utils_1.0.17.bb +++ b/recipes/alsa/alsa-utils_1.0.17.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ALSA Utilities" HOMEPAGE = "http://www.alsa-project.org" SECTION = "console/utils" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS = "alsa-lib ncurses" SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ diff --git a/recipes/alsa/alsa-utils_1.0.18.bb b/recipes/alsa/alsa-utils_1.0.18.bb index 40718b5500..68af8a548a 100644 --- a/recipes/alsa/alsa-utils_1.0.18.bb +++ b/recipes/alsa/alsa-utils_1.0.18.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ALSA Utilities" HOMEPAGE = "http://www.alsa-project.org" SECTION = "console/utils" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS = "alsa-lib ncurses" PR = "r2" diff --git a/recipes/alsa/alsa-utils_1.0.19.bb b/recipes/alsa/alsa-utils_1.0.19.bb index 3e9bd86b7e..d218678dc8 100644 --- a/recipes/alsa/alsa-utils_1.0.19.bb +++ b/recipes/alsa/alsa-utils_1.0.19.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ALSA Utilities" HOMEPAGE = "http://www.alsa-project.org" SECTION = "console/utils" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS = "alsa-lib ncurses" PR = "r1" diff --git a/recipes/alsa/alsa-utils_1.0.20.bb b/recipes/alsa/alsa-utils_1.0.20.bb index 7eeb46ca7d..be146f605a 100644 --- a/recipes/alsa/alsa-utils_1.0.20.bb +++ b/recipes/alsa/alsa-utils_1.0.20.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ALSA Utilities" HOMEPAGE = "http://www.alsa-project.org" SECTION = "console/utils" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS = "alsa-lib ncurses" PR = "r0" diff --git a/recipes/android/android-image-utils-native_git.bb b/recipes/android/android-image-utils-native_git.bb new file mode 100644 index 0000000000..489a69349a --- /dev/null +++ b/recipes/android/android-image-utils-native_git.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Android Image Creation and Booting Utilities" +SECTION = "console/utils" +LICENSE = "GPL" +PV = "1.0+gitr${SRCREV}" +PR = "r1" + +SRC_URI = "\ + ${FREESMARTPHONE_GIT}/utilities.git;protocol=git;branch=master \ +" +S = "${WORKDIR}/git/android/image-utils" + +inherit autotools_stage native + +do_deploy () { + install -d ${DEPLOY_DIR_TOOLS} + install -m 0755 fastboot/fastboot ${DEPLOY_DIR_TOOLS} +} +do_deploy[dirs] = "${S}" +addtask deploy before do_build after do_compile diff --git a/recipes/at91bootstrap/at91bootstrap-2.13/at91cap9adk/defconfig b/recipes/at91bootstrap/at91bootstrap-2.13/at91cap9adk/defconfig deleted file mode 100644 index 8ccd36dbc8..0000000000 --- a/recipes/at91bootstrap/at91bootstrap-2.13/at91cap9adk/defconfig +++ /dev/null @@ -1,110 +0,0 @@ -# -# Automatically generated make config: don't edit -# Tue Jan 12 22:00:30 2010 -# -HAVE_DOT_CONFIG=y -CONFIG_BOARDNAME="at91cap9df" -# CONFIG_AT91SAM9260EK is not set -# CONFIG_AT91SAM9261EK is not set -# CONFIG_AT91SAM9263EK is not set -# CONFIG_AT91SAM9RLEK is not set -# CONFIG_AT91SAM9XEEK is not set -# CONFIG_AT91SAM9G10EK is not set -# CONFIG_AT91SAM9G20EK is not set -# CONFIG_AT91SAM9G45EK is not set -# CONFIG_AT91SAM9G45EKES is not set -# CONFIG_AT91SAM9M10EK is not set -CONFIG_AT91CAP9ADK=y -# CONFIG_AT91CAP9STK is not set -# CONFIG_AFEB9260 is not set -CONFIG_CHIP="AT91CAP9" -CONFIG_BOARD="at91cap9adk" -CONFIG_MACH_TYPE="0x61E" -CONFIG_LINK_ADDR="0x000000" -CONFIG_TOP_OF_MEMORY="0x108000" -CONFIG_BOOTSTRAP_MAXSIZE="13000" -CONFIG_CRYSTAL_12_000MHZ=y -# CONFIG_CRYSTAL_16_000MHZ is not set -# CONFIG_CRYSTAL_16_36766MHZ is not set -# CONFIG_CRYSTAL_18_432MHZ is not set -ALLOW_CRYSTAL_12_000MHZ=y -CONFIG_CRYSTAL="CRYSTAL_18_432MHZ" -# CONFIG_CPU_CLK_166MHZ is not set -# CONFIG_CPU_CLK_180MHZ is not set -CONFIG_CPU_CLK_200MHZ=y -# CONFIG_CPU_CLK_240MHZ is not set -# CONFIG_CPU_CLK_266MHZ is not set -# CONFIG_CPU_CLK_400MHZ is not set -ALLOW_CPU_CLK_200MHZ=y -ALLOW_CPU_CLK_240MHZ=y -# DISABLE_CPU_CLK_240MHZ is not set -# CONFIG_BUS_SPEED_83MHZ is not set -# CONFIG_BUS_SPEED_90MHZ is not set -CONFIG_BUS_SPEED_100MHZ=y -# CONFIG_BUS_SPEED_133MHZ is not set - -# -# Memory selection -# -# CONFIG_SDRAM is not set -CONFIG_SDDRC=y -# CONFIG_DDR2 is not set -ALLOW_DATAFLASH=y -ALLOW_FLASH=y -# ALLOW_NANDFLASH is not set -# ALLOW_SDCARD is not set -# ALLOW_PSRAM is not set -# ALLOW_SDRAM_16BIT is not set -# CONFIG_RAM_32MB is not set -CONFIG_RAM_64MB=y -# CONFIG_RAM_128MB is not set -# CONFIG_RAM_256MB is not set -CONFIG_DATAFLASH=y -# CONFIG_FLASH is not set -# CONFIG_NANDFLASH is not set -# CONFIG_SDCARD is not set -CONFIG_MEMORY="dataflash" - -# -# SPI configuration -# -CONFIG_SPI_CLK=33000000 -CONFIG_SMALL_DATAFLASH=y -# ALLOW_DATAFLASH_RECOVERY is not set -CONFIG_SPI_BOOT_CS0=y -# CONFIG_SPI_BOOT_CS1 is not set -# CONFIG_SPI_BOOT_CS2 is not set -# CONFIG_SPI_BOOT_CS3 is not set -ALLOW_BOOT_FROM_DATAFLASH_CS0=y -# ALLOW_BOOT_FROM_DATAFLASH_CS1 is not set -# ALLOW_BOOT_FROM_DATAFLASH_CS2 is not set -# ALLOW_BOOT_FROM_DATAFLASH_CS3 is not set -DATAFLASHCARD_ON_CS0=y -# DATAFLASHCARD_ON_CS1 is not set -# DATAFLASHCARD_ON_CS2 is not set -# DATAFLASHCARD_ON_CS3 is not set -CONFIG_DATAFLASHCARD=y -CONFIG_CARD_SUFFIX="card" -CONFIG_SPI_BOOT="AT91C_SPI_PCS0_DATAFLASH" -CONFIG_SPI_MODE_0=y -# CONFIG_SPI_MODE_1 is not set -# CONFIG_SPI_MODE_2 is not set -# CONFIG_SPI_MODE_3 is not set -CONFIG_SPI_MODE=0 -CONFIG_PROJECT="dataflash" -CONFIG_LOAD_UBOOT=y -# CONFIG_LOAD_64KB is not set -# CONFIG_LOAD_1MB is not set -# CONFIG_LOAD_4MB is not set -CONFIG_IMG_ADDRESS="0x00008400" -CONFIG_IMG_SIZE="0x00040000" -CONFIG_JUMP_ADDR="0x73F00000" -CONFIG_APP_CHECK=y -# CONFIG_LONG_TEST is not set -CONFIG_DEBUG=y -CONFIG_VERBOSE=y -CONFIG_HW_INIT=y -# CONFIG_USER_HW_INIT is not set -# CONFIG_THUMB is not set -CONFIG_SX_AT91=y -CONFIG_RAW_AT91=y diff --git a/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9260ek/defconfig b/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9260ek/defconfig deleted file mode 100644 index 5e744ad829..0000000000 --- a/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9260ek/defconfig +++ /dev/null @@ -1,110 +0,0 @@ -# -# Automatically generated make config: don't edit -# Tue Jan 12 22:00:52 2010 -# -HAVE_DOT_CONFIG=y -CONFIG_BOARDNAME="at91sam9260dfc" -CONFIG_AT91SAM9260EK=y -# CONFIG_AT91SAM9261EK is not set -# CONFIG_AT91SAM9263EK is not set -# CONFIG_AT91SAM9RLEK is not set -# CONFIG_AT91SAM9XEEK is not set -# CONFIG_AT91SAM9G10EK is not set -# CONFIG_AT91SAM9G20EK is not set -# CONFIG_AT91SAM9G45EK is not set -# CONFIG_AT91SAM9G45EKES is not set -# CONFIG_AT91SAM9M10EK is not set -# CONFIG_AT91CAP9ADK is not set -# CONFIG_AT91CAP9STK is not set -# CONFIG_AFEB9260 is not set -CONFIG_CHIP="AT91SAM9260" -CONFIG_BOARD="at91sam9260ek" -CONFIG_MACH_TYPE="0x44B" -CONFIG_LINK_ADDR="0x000000" -CONFIG_TOP_OF_MEMORY="0x301000" -CONFIG_BOOTSTRAP_MAXSIZE="4096" -# CONFIG_CRYSTAL_12_000MHZ is not set -# CONFIG_CRYSTAL_16_000MHZ is not set -# CONFIG_CRYSTAL_16_36766MHZ is not set -CONFIG_CRYSTAL_18_432MHZ=y -ALLOW_CRYSTAL_18_432MHZ=y -CONFIG_CRYSTAL="CRYSTAL_18_432MHZ" -# CONFIG_CPU_CLK_166MHZ is not set -# CONFIG_CPU_CLK_180MHZ is not set -CONFIG_CPU_CLK_200MHZ=y -# CONFIG_CPU_CLK_240MHZ is not set -# CONFIG_CPU_CLK_266MHZ is not set -# CONFIG_CPU_CLK_400MHZ is not set -ALLOW_CPU_CLK_200MHZ=y -# DISABLE_CPU_CLK_240MHZ is not set -# CONFIG_BUS_SPEED_83MHZ is not set -# CONFIG_BUS_SPEED_90MHZ is not set -CONFIG_BUS_SPEED_100MHZ=y -# CONFIG_BUS_SPEED_133MHZ is not set - -# -# Memory selection -# -CONFIG_SDRAM=y -# CONFIG_SDDRC is not set -# CONFIG_DDR2 is not set -ALLOW_DATAFLASH=y -# ALLOW_FLASH is not set -ALLOW_NANDFLASH=y -# ALLOW_SDCARD is not set -# ALLOW_PSRAM is not set -# ALLOW_SDRAM_16BIT is not set -# CONFIG_RAM_32MB is not set -CONFIG_RAM_64MB=y -# CONFIG_RAM_128MB is not set -# CONFIG_RAM_256MB is not set -CONFIG_DATAFLASH=y -# CONFIG_FLASH is not set -# CONFIG_NANDFLASH is not set -# CONFIG_SDCARD is not set -CONFIG_MEMORY="dataflash" - -# -# SPI configuration -# -CONFIG_SPI_CLK=33000000 -# CONFIG_SMALL_DATAFLASH is not set -CONFIG_DATAFLASH_RECOVERY=y -ALLOW_DATAFLASH_RECOVERY=y -CONFIG_SPI_BOOT_CS0=y -# CONFIG_SPI_BOOT_CS1 is not set -# CONFIG_SPI_BOOT_CS2 is not set -# CONFIG_SPI_BOOT_CS3 is not set -ALLOW_BOOT_FROM_DATAFLASH_CS0=y -ALLOW_BOOT_FROM_DATAFLASH_CS1=y -# ALLOW_BOOT_FROM_DATAFLASH_CS2 is not set -# ALLOW_BOOT_FROM_DATAFLASH_CS3 is not set -DATAFLASHCARD_ON_CS0=y -# DATAFLASHCARD_ON_CS1 is not set -# DATAFLASHCARD_ON_CS2 is not set -# DATAFLASHCARD_ON_CS3 is not set -CONFIG_DATAFLASHCARD=y -CONFIG_CARD_SUFFIX="card" -CONFIG_SPI_BOOT="AT91C_SPI_PCS0_DATAFLASH" -CONFIG_SPI_MODE_0=y -# CONFIG_SPI_MODE_1 is not set -# CONFIG_SPI_MODE_2 is not set -# CONFIG_SPI_MODE_3 is not set -CONFIG_SPI_MODE=0 -CONFIG_PROJECT="dataflash" -CONFIG_LOAD_UBOOT=y -# CONFIG_LOAD_64KB is not set -# CONFIG_LOAD_1MB is not set -# CONFIG_LOAD_4MB is not set -CONFIG_IMG_ADDRESS="0x00008400" -CONFIG_IMG_SIZE="0x00040000" -CONFIG_JUMP_ADDR="0x23F00000" -CONFIG_APP_CHECK=y -# CONFIG_LONG_TEST is not set -# CONFIG_DEBUG is not set -# CONFIG_VERBOSE is not set -CONFIG_HW_INIT=y -# CONFIG_USER_HW_INIT is not set -# CONFIG_THUMB is not set -CONFIG_SX_AT91=y -CONFIG_RAW_AT91=y diff --git a/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9261ek/defconfig b/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9261ek/defconfig deleted file mode 100644 index 05058be3d3..0000000000 --- a/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9261ek/defconfig +++ /dev/null @@ -1,110 +0,0 @@ -# -# Automatically generated make config: don't edit -# Tue Jan 12 22:00:56 2010 -# -HAVE_DOT_CONFIG=y -CONFIG_BOARDNAME="at91sam9261df" -# CONFIG_AT91SAM9260EK is not set -CONFIG_AT91SAM9261EK=y -# CONFIG_AT91SAM9263EK is not set -# CONFIG_AT91SAM9RLEK is not set -# CONFIG_AT91SAM9XEEK is not set -# CONFIG_AT91SAM9G10EK is not set -# CONFIG_AT91SAM9G20EK is not set -# CONFIG_AT91SAM9G45EK is not set -# CONFIG_AT91SAM9G45EKES is not set -# CONFIG_AT91SAM9M10EK is not set -# CONFIG_AT91CAP9ADK is not set -# CONFIG_AT91CAP9STK is not set -# CONFIG_AFEB9260 is not set -CONFIG_CHIP="AT91SAM9261" -CONFIG_BOARD="at91sam9261ek" -CONFIG_MACH_TYPE="0x350" -CONFIG_LINK_ADDR="0x000000" -CONFIG_TOP_OF_MEMORY="0x328000" -CONFIG_BOOTSTRAP_MAXSIZE="13000" -# CONFIG_CRYSTAL_12_000MHZ is not set -# CONFIG_CRYSTAL_16_000MHZ is not set -# CONFIG_CRYSTAL_16_36766MHZ is not set -CONFIG_CRYSTAL_18_432MHZ=y -ALLOW_CRYSTAL_18_432MHZ=y -CONFIG_CRYSTAL="CRYSTAL_18_432MHZ" -# CONFIG_CPU_CLK_166MHZ is not set -# CONFIG_CPU_CLK_180MHZ is not set -CONFIG_CPU_CLK_200MHZ=y -# CONFIG_CPU_CLK_240MHZ is not set -# CONFIG_CPU_CLK_266MHZ is not set -# CONFIG_CPU_CLK_400MHZ is not set -ALLOW_CPU_CLK_200MHZ=y -ALLOW_CPU_CLK_266MHZ=y -# DISABLE_CPU_CLK_240MHZ is not set -# CONFIG_BUS_SPEED_83MHZ is not set -# CONFIG_BUS_SPEED_90MHZ is not set -CONFIG_BUS_SPEED_100MHZ=y -# CONFIG_BUS_SPEED_133MHZ is not set - -# -# Memory selection -# -CONFIG_SDRAM=y -# CONFIG_SDDRC is not set -# CONFIG_DDR2 is not set -ALLOW_DATAFLASH=y -# ALLOW_FLASH is not set -ALLOW_NANDFLASH=y -# ALLOW_SDCARD is not set -# ALLOW_PSRAM is not set -# ALLOW_SDRAM_16BIT is not set -# CONFIG_RAM_32MB is not set -CONFIG_RAM_64MB=y -# CONFIG_RAM_128MB is not set -# CONFIG_RAM_256MB is not set -CONFIG_DATAFLASH=y -# CONFIG_FLASH is not set -# CONFIG_NANDFLASH is not set -# CONFIG_SDCARD is not set -CONFIG_MEMORY="dataflash" - -# -# SPI configuration -# -CONFIG_SPI_CLK=33000000 -CONFIG_SMALL_DATAFLASH=y -# ALLOW_DATAFLASH_RECOVERY is not set -CONFIG_SPI_BOOT_CS0=y -# CONFIG_SPI_BOOT_CS1 is not set -# CONFIG_SPI_BOOT_CS2 is not set -# CONFIG_SPI_BOOT_CS3 is not set -ALLOW_BOOT_FROM_DATAFLASH_CS0=y -# ALLOW_BOOT_FROM_DATAFLASH_CS1 is not set -# ALLOW_BOOT_FROM_DATAFLASH_CS2 is not set -ALLOW_BOOT_FROM_DATAFLASH_CS3=y -# DATAFLASHCARD_ON_CS0 is not set -# DATAFLASHCARD_ON_CS1 is not set -# DATAFLASHCARD_ON_CS2 is not set -# DATAFLASHCARD_ON_CS3 is not set -# CONFIG_DATAFLASHCARD is not set -CONFIG_CARD_SUFFIX="" -CONFIG_SPI_BOOT="AT91C_SPI_PCS0_DATAFLASH" -CONFIG_SPI_MODE_0=y -# CONFIG_SPI_MODE_1 is not set -# CONFIG_SPI_MODE_2 is not set -# CONFIG_SPI_MODE_3 is not set -CONFIG_SPI_MODE=0 -CONFIG_PROJECT="dataflash" -CONFIG_LOAD_UBOOT=y -# CONFIG_LOAD_64KB is not set -# CONFIG_LOAD_1MB is not set -# CONFIG_LOAD_4MB is not set -CONFIG_IMG_ADDRESS="0x00008400" -CONFIG_IMG_SIZE="0x00040000" -CONFIG_JUMP_ADDR="0x23F00000" -CONFIG_APP_CHECK=y -# CONFIG_LONG_TEST is not set -CONFIG_DEBUG=y -CONFIG_VERBOSE=y -CONFIG_HW_INIT=y -# CONFIG_USER_HW_INIT is not set -# CONFIG_THUMB is not set -CONFIG_SX_AT91=y -CONFIG_RAW_AT91=y diff --git a/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9263ek/defconfig b/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9263ek/defconfig deleted file mode 100644 index 70f6e3228e..0000000000 --- a/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9263ek/defconfig +++ /dev/null @@ -1,113 +0,0 @@ -# -# Automatically generated make config: don't edit -# Tue Jan 12 22:00:59 2010 -# -HAVE_DOT_CONFIG=y -CONFIG_BOARDNAME="at91sam9263dfc" -# CONFIG_AT91SAM9260EK is not set -# CONFIG_AT91SAM9261EK is not set -CONFIG_AT91SAM9263EK=y -# CONFIG_AT91SAM9RLEK is not set -# CONFIG_AT91SAM9XEEK is not set -# CONFIG_AT91SAM9G10EK is not set -# CONFIG_AT91SAM9G20EK is not set -# CONFIG_AT91SAM9G45EK is not set -# CONFIG_AT91SAM9G45EKES is not set -# CONFIG_AT91SAM9M10EK is not set -# CONFIG_AT91CAP9ADK is not set -# CONFIG_AT91CAP9STK is not set -# CONFIG_AFEB9260 is not set -CONFIG_CHIP="AT91SAM9263" -CONFIG_BOARD="at91sam9263ek" -CONFIG_MACH_TYPE="0x4B2" -CONFIG_LINK_ADDR="0x000000" -CONFIG_TOP_OF_MEMORY="0x314000" -CONFIG_BOOTSTRAP_MAXSIZE="13000" -# CONFIG_CRYSTAL_12_000MHZ is not set -# CONFIG_CRYSTAL_16_000MHZ is not set -CONFIG_CRYSTAL_16_36766MHZ=y -# CONFIG_CRYSTAL_18_432MHZ is not set -ALLOW_CRYSTAL_16_36766MHZ=y -ALLOW_CRYSTAL_18_432MHZ=y -CONFIG_CRYSTAL="CRYSTAL_16_36766MHZ" -# CONFIG_CPU_CLK_166MHZ is not set -# CONFIG_CPU_CLK_180MHZ is not set -CONFIG_CPU_CLK_200MHZ=y -# CONFIG_CPU_CLK_240MHZ is not set -# CONFIG_CPU_CLK_266MHZ is not set -# CONFIG_CPU_CLK_400MHZ is not set -ALLOW_CPU_CLK_200MHZ=y -ALLOW_CPU_CLK_240MHZ=y -DISABLE_CPU_CLK_240MHZ=y -# CONFIG_BUS_SPEED_83MHZ is not set -# CONFIG_BUS_SPEED_90MHZ is not set -CONFIG_BUS_SPEED_100MHZ=y -# CONFIG_BUS_SPEED_133MHZ is not set - -# -# Memory selection -# -CONFIG_SDRAM=y -# CONFIG_SDDRC is not set -# CONFIG_DDR2 is not set -ALLOW_DATAFLASH=y -# ALLOW_FLASH is not set -ALLOW_NANDFLASH=y -# ALLOW_SDCARD is not set -ALLOW_PSRAM=y -ALLOW_SDRAM_16BIT=y -# CONFIG_RAM_32MB is not set -CONFIG_RAM_64MB=y -# CONFIG_RAM_128MB is not set -# CONFIG_RAM_256MB is not set -# CONFIG_SDRAM_16BIT is not set -# CONFIG_PSRAM is not set -CONFIG_DATAFLASH=y -# CONFIG_FLASH is not set -# CONFIG_NANDFLASH is not set -# CONFIG_SDCARD is not set -CONFIG_MEMORY="dataflash" - -# -# SPI configuration -# -CONFIG_SPI_CLK=33000000 -CONFIG_SMALL_DATAFLASH=y -# ALLOW_DATAFLASH_RECOVERY is not set -CONFIG_SPI_BOOT_CS0=y -# CONFIG_SPI_BOOT_CS1 is not set -# CONFIG_SPI_BOOT_CS2 is not set -# CONFIG_SPI_BOOT_CS3 is not set -ALLOW_BOOT_FROM_DATAFLASH_CS0=y -# ALLOW_BOOT_FROM_DATAFLASH_CS1 is not set -# ALLOW_BOOT_FROM_DATAFLASH_CS2 is not set -# ALLOW_BOOT_FROM_DATAFLASH_CS3 is not set -DATAFLASHCARD_ON_CS0=y -# DATAFLASHCARD_ON_CS1 is not set -# DATAFLASHCARD_ON_CS2 is not set -# DATAFLASHCARD_ON_CS3 is not set -CONFIG_DATAFLASHCARD=y -CONFIG_CARD_SUFFIX="card" -CONFIG_SPI_BOOT="AT91C_SPI_PCS0_DATAFLASH" -CONFIG_SPI_MODE_0=y -# CONFIG_SPI_MODE_1 is not set -# CONFIG_SPI_MODE_2 is not set -# CONFIG_SPI_MODE_3 is not set -CONFIG_SPI_MODE=0 -CONFIG_PROJECT="dataflash" -CONFIG_LOAD_UBOOT=y -# CONFIG_LOAD_64KB is not set -# CONFIG_LOAD_1MB is not set -# CONFIG_LOAD_4MB is not set -CONFIG_IMG_ADDRESS="0x00008400" -CONFIG_IMG_SIZE="0x00040000" -CONFIG_JUMP_ADDR="0x23F00000" -CONFIG_APP_CHECK=y -# CONFIG_LONG_TEST is not set -# CONFIG_DEBUG is not set -CONFIG_VERBOSE=y -CONFIG_HW_INIT=y -# CONFIG_USER_HW_INIT is not set -# CONFIG_THUMB is not set -CONFIG_SX_AT91=y -CONFIG_RAW_AT91=y diff --git a/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9g20ek/defconfig b/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9g20ek/defconfig deleted file mode 100644 index 8520a79658..0000000000 --- a/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9g20ek/defconfig +++ /dev/null @@ -1,110 +0,0 @@ -# -# Automatically generated make config: don't edit -# Tue Jan 12 22:00:34 2010 -# -HAVE_DOT_CONFIG=y -CONFIG_BOARDNAME="at91sam9g20dfc" -# CONFIG_AT91SAM9260EK is not set -# CONFIG_AT91SAM9261EK is not set -# CONFIG_AT91SAM9263EK is not set -# CONFIG_AT91SAM9RLEK is not set -# CONFIG_AT91SAM9XEEK is not set -# CONFIG_AT91SAM9G10EK is not set -CONFIG_AT91SAM9G20EK=y -# CONFIG_AT91SAM9G45EK is not set -# CONFIG_AT91SAM9G45EKES is not set -# CONFIG_AT91SAM9M10EK is not set -# CONFIG_AT91CAP9ADK is not set -# CONFIG_AT91CAP9STK is not set -# CONFIG_AFEB9260 is not set -CONFIG_CHIP="AT91SAM9G20" -CONFIG_BOARD="at91sam9g20ek" -CONFIG_MACH_TYPE="0x658" -CONFIG_LINK_ADDR="0x000000" -CONFIG_TOP_OF_MEMORY="0x301000" -CONFIG_BOOTSTRAP_MAXSIZE="13000" -# CONFIG_CRYSTAL_12_000MHZ is not set -# CONFIG_CRYSTAL_16_000MHZ is not set -# CONFIG_CRYSTAL_16_36766MHZ is not set -CONFIG_CRYSTAL_18_432MHZ=y -ALLOW_CRYSTAL_18_432MHZ=y -CONFIG_CRYSTAL="CRYSTAL_18_432MHZ" -# CONFIG_CPU_CLK_166MHZ is not set -# CONFIG_CPU_CLK_180MHZ is not set -# CONFIG_CPU_CLK_200MHZ is not set -# CONFIG_CPU_CLK_240MHZ is not set -# CONFIG_CPU_CLK_266MHZ is not set -CONFIG_CPU_CLK_400MHZ=y -ALLOW_CPU_CLK_400MHZ=y -# DISABLE_CPU_CLK_240MHZ is not set -# CONFIG_BUS_SPEED_83MHZ is not set -# CONFIG_BUS_SPEED_90MHZ is not set -# CONFIG_BUS_SPEED_100MHZ is not set -CONFIG_BUS_SPEED_133MHZ=y - -# -# Memory selection -# -CONFIG_SDRAM=y -# CONFIG_SDDRC is not set -# CONFIG_DDR2 is not set -ALLOW_DATAFLASH=y -# ALLOW_FLASH is not set -ALLOW_NANDFLASH=y -# ALLOW_SDCARD is not set -# ALLOW_PSRAM is not set -# ALLOW_SDRAM_16BIT is not set -# CONFIG_RAM_32MB is not set -CONFIG_RAM_64MB=y -# CONFIG_RAM_128MB is not set -# CONFIG_RAM_256MB is not set -CONFIG_DATAFLASH=y -# CONFIG_FLASH is not set -# CONFIG_NANDFLASH is not set -# CONFIG_SDCARD is not set -CONFIG_MEMORY="dataflash" - -# -# SPI configuration -# -CONFIG_SPI_CLK=33000000 -CONFIG_SMALL_DATAFLASH=y -CONFIG_DATAFLASH_RECOVERY=y -ALLOW_DATAFLASH_RECOVERY=y -CONFIG_SPI_BOOT_CS0=y -# CONFIG_SPI_BOOT_CS1 is not set -# CONFIG_SPI_BOOT_CS2 is not set -# CONFIG_SPI_BOOT_CS3 is not set -ALLOW_BOOT_FROM_DATAFLASH_CS0=y -ALLOW_BOOT_FROM_DATAFLASH_CS1=y -# ALLOW_BOOT_FROM_DATAFLASH_CS2 is not set -# ALLOW_BOOT_FROM_DATAFLASH_CS3 is not set -DATAFLASHCARD_ON_CS0=y -# DATAFLASHCARD_ON_CS1 is not set -# DATAFLASHCARD_ON_CS2 is not set -# DATAFLASHCARD_ON_CS3 is not set -CONFIG_DATAFLASHCARD=y -CONFIG_CARD_SUFFIX="card" -CONFIG_SPI_BOOT="AT91C_SPI_PCS0_DATAFLASH" -CONFIG_SPI_MODE_0=y -# CONFIG_SPI_MODE_1 is not set -# CONFIG_SPI_MODE_2 is not set -# CONFIG_SPI_MODE_3 is not set -CONFIG_SPI_MODE=0 -CONFIG_PROJECT="dataflash" -CONFIG_LOAD_UBOOT=y -# CONFIG_LOAD_64KB is not set -# CONFIG_LOAD_1MB is not set -# CONFIG_LOAD_4MB is not set -CONFIG_IMG_ADDRESS="0x00008400" -CONFIG_IMG_SIZE="0x00040000" -CONFIG_JUMP_ADDR="0x23F00000" -CONFIG_APP_CHECK=y -# CONFIG_LONG_TEST is not set -CONFIG_DEBUG=y -CONFIG_VERBOSE=y -CONFIG_HW_INIT=y -# CONFIG_USER_HW_INIT is not set -# CONFIG_THUMB is not set -CONFIG_SX_AT91=y -CONFIG_RAW_AT91=y diff --git a/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9g45ek/defconfig b/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9g45ek/defconfig deleted file mode 100644 index 6259b01f13..0000000000 --- a/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9g45ek/defconfig +++ /dev/null @@ -1,110 +0,0 @@ -# -# Automatically generated make config: don't edit -# Tue Jan 12 22:00:42 2010 -# -HAVE_DOT_CONFIG=y -CONFIG_BOARDNAME="at91sam9g45df" -# CONFIG_AT91SAM9260EK is not set -# CONFIG_AT91SAM9261EK is not set -# CONFIG_AT91SAM9263EK is not set -# CONFIG_AT91SAM9RLEK is not set -# CONFIG_AT91SAM9XEEK is not set -# CONFIG_AT91SAM9G10EK is not set -# CONFIG_AT91SAM9G20EK is not set -CONFIG_AT91SAM9G45EK=y -# CONFIG_AT91SAM9G45EKES is not set -# CONFIG_AT91SAM9M10EK is not set -# CONFIG_AT91CAP9ADK is not set -# CONFIG_AT91CAP9STK is not set -# CONFIG_AFEB9260 is not set -CONFIG_CHIP="AT91SAM9G45" -CONFIG_BOARD="at91sam9g45ek" -CONFIG_MACH_TYPE="1830" -CONFIG_LINK_ADDR="0x000000" -CONFIG_TOP_OF_MEMORY="0x304000" -CONFIG_BOOTSTRAP_MAXSIZE="13000" -# CONFIG_CRYSTAL_12_000MHZ is not set -# CONFIG_CRYSTAL_16_000MHZ is not set -# CONFIG_CRYSTAL_16_36766MHZ is not set -CONFIG_CRYSTAL_18_432MHZ=y -ALLOW_CRYSTAL_18_432MHZ=y -CONFIG_CRYSTAL="CRYSTAL_18_432MHZ" -# CONFIG_CPU_CLK_166MHZ is not set -# CONFIG_CPU_CLK_180MHZ is not set -# CONFIG_CPU_CLK_200MHZ is not set -# CONFIG_CPU_CLK_240MHZ is not set -# CONFIG_CPU_CLK_266MHZ is not set -CONFIG_CPU_CLK_400MHZ=y -ALLOW_CPU_CLK_400MHZ=y -# DISABLE_CPU_CLK_240MHZ is not set -# CONFIG_BUS_SPEED_83MHZ is not set -# CONFIG_BUS_SPEED_90MHZ is not set -# CONFIG_BUS_SPEED_100MHZ is not set -CONFIG_BUS_SPEED_133MHZ=y - -# -# Memory selection -# -# CONFIG_SDRAM is not set -# CONFIG_SDDRC is not set -CONFIG_DDR2=y -ALLOW_DATAFLASH=y -# ALLOW_FLASH is not set -ALLOW_NANDFLASH=y -# ALLOW_SDCARD is not set -# ALLOW_PSRAM is not set -# ALLOW_SDRAM_16BIT is not set -# CONFIG_RAM_32MB is not set -# CONFIG_RAM_64MB is not set -CONFIG_RAM_128MB=y -# CONFIG_RAM_256MB is not set -CONFIG_DATAFLASH=y -# CONFIG_FLASH is not set -# CONFIG_NANDFLASH is not set -# CONFIG_SDCARD is not set -CONFIG_MEMORY="dataflash" - -# -# SPI configuration -# -CONFIG_SPI_CLK=33000000 -CONFIG_SMALL_DATAFLASH=y -CONFIG_DATAFLASH_RECOVERY=y -ALLOW_DATAFLASH_RECOVERY=y -CONFIG_SPI_BOOT_CS0=y -# CONFIG_SPI_BOOT_CS1 is not set -# CONFIG_SPI_BOOT_CS2 is not set -# CONFIG_SPI_BOOT_CS3 is not set -ALLOW_BOOT_FROM_DATAFLASH_CS0=y -# ALLOW_BOOT_FROM_DATAFLASH_CS1 is not set -# ALLOW_BOOT_FROM_DATAFLASH_CS2 is not set -# ALLOW_BOOT_FROM_DATAFLASH_CS3 is not set -DATAFLASHCARD_ON_CS0=y -# DATAFLASHCARD_ON_CS1 is not set -# DATAFLASHCARD_ON_CS2 is not set -# DATAFLASHCARD_ON_CS3 is not set -CONFIG_DATAFLASHCARD=y -CONFIG_CARD_SUFFIX="card" -CONFIG_SPI_BOOT="AT91C_SPI_PCS0_DATAFLASH" -CONFIG_SPI_MODE_0=y -# CONFIG_SPI_MODE_1 is not set -# CONFIG_SPI_MODE_2 is not set -# CONFIG_SPI_MODE_3 is not set -CONFIG_SPI_MODE=0 -CONFIG_PROJECT="dataflash" -CONFIG_LOAD_UBOOT=y -# CONFIG_LOAD_64KB is not set -# CONFIG_LOAD_1MB is not set -# CONFIG_LOAD_4MB is not set -CONFIG_IMG_ADDRESS="0x00008400" -CONFIG_IMG_SIZE="0x00040000" -CONFIG_JUMP_ADDR="0x73F00000" -CONFIG_APP_CHECK=y -# CONFIG_LONG_TEST is not set -CONFIG_DEBUG=y -CONFIG_VERBOSE=y -CONFIG_HW_INIT=y -# CONFIG_USER_HW_INIT is not set -# CONFIG_THUMB is not set -CONFIG_SX_AT91=y -CONFIG_RAW_AT91=y diff --git a/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9rlek/defconfig b/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9rlek/defconfig deleted file mode 100644 index af7ce6adfb..0000000000 --- a/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9rlek/defconfig +++ /dev/null @@ -1,110 +0,0 @@ -# -# Automatically generated make config: don't edit -# Tue Jan 12 22:00:47 2010 -# -HAVE_DOT_CONFIG=y -CONFIG_BOARDNAME="at91sam9rldf" -# CONFIG_AT91SAM9260EK is not set -# CONFIG_AT91SAM9261EK is not set -# CONFIG_AT91SAM9263EK is not set -CONFIG_AT91SAM9RLEK=y -# CONFIG_AT91SAM9XEEK is not set -# CONFIG_AT91SAM9G10EK is not set -# CONFIG_AT91SAM9G20EK is not set -# CONFIG_AT91SAM9G45EK is not set -# CONFIG_AT91SAM9G45EKES is not set -# CONFIG_AT91SAM9M10EK is not set -# CONFIG_AT91CAP9ADK is not set -# CONFIG_AT91CAP9STK is not set -# CONFIG_AFEB9260 is not set -CONFIG_CHIP="AT91SAM9RL" -CONFIG_BOARD="at91sam9rlek" -CONFIG_MACH_TYPE="1326" -CONFIG_LINK_ADDR="0x000000" -CONFIG_TOP_OF_MEMORY="0x310000" -CONFIG_BOOTSTRAP_MAXSIZE="13000" -# CONFIG_CRYSTAL_12_000MHZ is not set -# CONFIG_CRYSTAL_16_000MHZ is not set -# CONFIG_CRYSTAL_16_36766MHZ is not set -CONFIG_CRYSTAL_18_432MHZ=y -ALLOW_CRYSTAL_18_432MHZ=y -CONFIG_CRYSTAL="CRYSTAL_18_432MHZ" -# CONFIG_CPU_CLK_166MHZ is not set -# CONFIG_CPU_CLK_180MHZ is not set -CONFIG_CPU_CLK_200MHZ=y -# CONFIG_CPU_CLK_240MHZ is not set -# CONFIG_CPU_CLK_266MHZ is not set -# CONFIG_CPU_CLK_400MHZ is not set -ALLOW_CPU_CLK_200MHZ=y -ALLOW_CPU_CLK_266MHZ=y -# DISABLE_CPU_CLK_240MHZ is not set -# CONFIG_BUS_SPEED_83MHZ is not set -# CONFIG_BUS_SPEED_90MHZ is not set -CONFIG_BUS_SPEED_100MHZ=y -# CONFIG_BUS_SPEED_133MHZ is not set - -# -# Memory selection -# -CONFIG_SDRAM=y -# CONFIG_SDDRC is not set -# CONFIG_DDR2 is not set -ALLOW_DATAFLASH=y -# ALLOW_FLASH is not set -ALLOW_NANDFLASH=y -# ALLOW_SDCARD is not set -# ALLOW_PSRAM is not set -# ALLOW_SDRAM_16BIT is not set -# CONFIG_RAM_32MB is not set -CONFIG_RAM_64MB=y -# CONFIG_RAM_128MB is not set -# CONFIG_RAM_256MB is not set -CONFIG_DATAFLASH=y -# CONFIG_FLASH is not set -# CONFIG_NANDFLASH is not set -# CONFIG_SDCARD is not set -CONFIG_MEMORY="dataflash" - -# -# SPI configuration -# -CONFIG_SPI_CLK=33000000 -CONFIG_SMALL_DATAFLASH=y -# ALLOW_DATAFLASH_RECOVERY is not set -CONFIG_SPI_BOOT_CS0=y -# CONFIG_SPI_BOOT_CS1 is not set -# CONFIG_SPI_BOOT_CS2 is not set -# CONFIG_SPI_BOOT_CS3 is not set -ALLOW_BOOT_FROM_DATAFLASH_CS0=y -# ALLOW_BOOT_FROM_DATAFLASH_CS1 is not set -# ALLOW_BOOT_FROM_DATAFLASH_CS2 is not set -# ALLOW_BOOT_FROM_DATAFLASH_CS3 is not set -# DATAFLASHCARD_ON_CS0 is not set -# DATAFLASHCARD_ON_CS1 is not set -# DATAFLASHCARD_ON_CS2 is not set -# DATAFLASHCARD_ON_CS3 is not set -# CONFIG_DATAFLASHCARD is not set -CONFIG_CARD_SUFFIX="" -CONFIG_SPI_BOOT="AT91C_SPI_PCS0_DATAFLASH" -CONFIG_SPI_MODE_0=y -# CONFIG_SPI_MODE_1 is not set -# CONFIG_SPI_MODE_2 is not set -# CONFIG_SPI_MODE_3 is not set -CONFIG_SPI_MODE=0 -CONFIG_PROJECT="dataflash" -CONFIG_LOAD_UBOOT=y -# CONFIG_LOAD_64KB is not set -# CONFIG_LOAD_1MB is not set -# CONFIG_LOAD_4MB is not set -CONFIG_IMG_ADDRESS="0x00008400" -CONFIG_IMG_SIZE="0x00040000" -CONFIG_JUMP_ADDR="0x23F00000" -CONFIG_APP_CHECK=y -# CONFIG_LONG_TEST is not set -CONFIG_DEBUG=y -CONFIG_VERBOSE=y -CONFIG_HW_INIT=y -# CONFIG_USER_HW_INIT is not set -# CONFIG_THUMB is not set -CONFIG_SX_AT91=y -CONFIG_RAW_AT91=y diff --git a/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9xeek/defconfig b/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9xeek/defconfig deleted file mode 100644 index fc83730b6f..0000000000 --- a/recipes/at91bootstrap/at91bootstrap-2.13/at91sam9xeek/defconfig +++ /dev/null @@ -1,110 +0,0 @@ -# -# Automatically generated make config: don't edit -# Tue Jan 12 22:00:49 2010 -# -HAVE_DOT_CONFIG=y -CONFIG_BOARDNAME="at91sam9xedfc" -# CONFIG_AT91SAM9260EK is not set -# CONFIG_AT91SAM9261EK is not set -# CONFIG_AT91SAM9263EK is not set -# CONFIG_AT91SAM9RLEK is not set -CONFIG_AT91SAM9XEEK=y -# CONFIG_AT91SAM9G10EK is not set -# CONFIG_AT91SAM9G20EK is not set -# CONFIG_AT91SAM9G45EK is not set -# CONFIG_AT91SAM9G45EKES is not set -# CONFIG_AT91SAM9M10EK is not set -# CONFIG_AT91CAP9ADK is not set -# CONFIG_AT91CAP9STK is not set -# CONFIG_AFEB9260 is not set -CONFIG_CHIP="AT91SAM9XE" -CONFIG_BOARD="at91sam9xeek" -CONFIG_MACH_TYPE="0x44B" -CONFIG_LINK_ADDR="0x000000" -CONFIG_TOP_OF_MEMORY="0x301000" -CONFIG_BOOTSTRAP_MAXSIZE="13000" -# CONFIG_CRYSTAL_12_000MHZ is not set -# CONFIG_CRYSTAL_16_000MHZ is not set -# CONFIG_CRYSTAL_16_36766MHZ is not set -CONFIG_CRYSTAL_18_432MHZ=y -ALLOW_CRYSTAL_18_432MHZ=y -CONFIG_CRYSTAL="CRYSTAL_18_432MHZ" -# CONFIG_CPU_CLK_166MHZ is not set -# CONFIG_CPU_CLK_180MHZ is not set -CONFIG_CPU_CLK_200MHZ=y -# CONFIG_CPU_CLK_240MHZ is not set -# CONFIG_CPU_CLK_266MHZ is not set -# CONFIG_CPU_CLK_400MHZ is not set -ALLOW_CPU_CLK_200MHZ=y -# DISABLE_CPU_CLK_240MHZ is not set -# CONFIG_BUS_SPEED_83MHZ is not set -# CONFIG_BUS_SPEED_90MHZ is not set -CONFIG_BUS_SPEED_100MHZ=y -# CONFIG_BUS_SPEED_133MHZ is not set - -# -# Memory selection -# -CONFIG_SDRAM=y -# CONFIG_SDDRC is not set -# CONFIG_DDR2 is not set -ALLOW_DATAFLASH=y -# ALLOW_FLASH is not set -ALLOW_NANDFLASH=y -# ALLOW_SDCARD is not set -# ALLOW_PSRAM is not set -# ALLOW_SDRAM_16BIT is not set -# CONFIG_RAM_32MB is not set -CONFIG_RAM_64MB=y -# CONFIG_RAM_128MB is not set -# CONFIG_RAM_256MB is not set -CONFIG_DATAFLASH=y -# CONFIG_FLASH is not set -# CONFIG_NANDFLASH is not set -# CONFIG_SDCARD is not set -CONFIG_MEMORY="dataflash" - -# -# SPI configuration -# -CONFIG_SPI_CLK=33000000 -CONFIG_SMALL_DATAFLASH=y -CONFIG_DATAFLASH_RECOVERY=y -ALLOW_DATAFLASH_RECOVERY=y -CONFIG_SPI_BOOT_CS0=y -# CONFIG_SPI_BOOT_CS1 is not set -# CONFIG_SPI_BOOT_CS2 is not set -# CONFIG_SPI_BOOT_CS3 is not set -ALLOW_BOOT_FROM_DATAFLASH_CS0=y -ALLOW_BOOT_FROM_DATAFLASH_CS1=y -# ALLOW_BOOT_FROM_DATAFLASH_CS2 is not set -# ALLOW_BOOT_FROM_DATAFLASH_CS3 is not set -DATAFLASHCARD_ON_CS0=y -# DATAFLASHCARD_ON_CS1 is not set -# DATAFLASHCARD_ON_CS2 is not set -# DATAFLASHCARD_ON_CS3 is not set -CONFIG_DATAFLASHCARD=y -CONFIG_CARD_SUFFIX="card" -CONFIG_SPI_BOOT="AT91C_SPI_PCS0_DATAFLASH" -CONFIG_SPI_MODE_0=y -# CONFIG_SPI_MODE_1 is not set -# CONFIG_SPI_MODE_2 is not set -# CONFIG_SPI_MODE_3 is not set -CONFIG_SPI_MODE=0 -CONFIG_PROJECT="dataflash" -CONFIG_LOAD_UBOOT=y -# CONFIG_LOAD_64KB is not set -# CONFIG_LOAD_1MB is not set -# CONFIG_LOAD_4MB is not set -CONFIG_IMG_ADDRESS="0x00008400" -CONFIG_IMG_SIZE="0x00040000" -CONFIG_JUMP_ADDR="0x23F00000" -CONFIG_APP_CHECK=y -# CONFIG_LONG_TEST is not set -CONFIG_DEBUG=y -CONFIG_VERBOSE=y -CONFIG_HW_INIT=y -# CONFIG_USER_HW_INIT is not set -# CONFIG_THUMB is not set -CONFIG_SX_AT91=y -CONFIG_RAW_AT91=y diff --git a/recipes/at91bootstrap/at91bootstrap_2.0.inc b/recipes/at91bootstrap/at91bootstrap_2.0.inc new file mode 100644 index 0000000000..67e7893c3e --- /dev/null +++ b/recipes/at91bootstrap/at91bootstrap_2.0.inc @@ -0,0 +1,33 @@ +DESCRIPTION = "at91bootstrap: loaded into internal SRAM by AT91 BootROM" +SECTION = "bootloaders" + +PARALLEL_MAKE = "" + +SRC_URI = "ftp://www.at91.com/pub/buildroot/${PN}-${PV}.tar.bz2 \ + " + +S = "${WORKDIR}/${PN}-${PV}" +PACKAGE_ARCH = "${MACHINE_ARCH}" +EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} DESTDIR=${DEPLOY_DIR_IMAGE} REVISION=${PR}" + +do_compile () { + unset LDFLAGS + unset CFLAGS + unset CPPFLAGS + + rm -Rf ${S}/binaries + if ! [ "x${AT91BOOTSTRAP_BOARD}" == "x" ] ; then + for board in ${AT91BOOTSTRAP_BOARD} ; do + cp `find ./board/ -name ${board}_defconfig` .config + oe_runmake AT91_CUSTOM_FLAGS="${AT91BOOTSTRAP_FLAGS}" + oe_runmake AT91_CUSTOM_FLAGS="${AT91BOOTSTRAP_FLAGS}" boot + oe_runmake AT91_CUSTOM_FLAGS="${AT91BOOTSTRAP_FLAGS}" install + done + else + cp ${S}/../defconfig ${S}/.config + oe_runmake AT91_CUSTOM_FLAGS="${AT91BOOTSTRAP_FLAGS}" + oe_runmake AT91_CUSTOM_FLAGS="${AT91BOOTSTRAP_FLAGS}" boot + oe_runmake AT91_CUSTOM_FLAGS="${AT91BOOTSTRAP_FLAGS}" install + fi + +} diff --git a/recipes/at91bootstrap/at91bootstrap_2.13.bb b/recipes/at91bootstrap/at91bootstrap_2.13.bb index 6f544fba54..147bb61cf1 100644 --- a/recipes/at91bootstrap/at91bootstrap_2.13.bb +++ b/recipes/at91bootstrap/at91bootstrap_2.13.bb @@ -1,5 +1,5 @@ -require at91bootstrap.inc -PR = "r0" +require at91bootstrap_2.0.inc +PR = "r1" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_at91sam9g45ek = "1" DEFAULT_PREFERENCE_at91sam9g45ekes = "1" diff --git a/recipes/base-passwd/base-passwd_3.5.20.bb b/recipes/base-passwd/base-passwd_3.5.20.bb index 5305730a9f..2ae3651584 100644 --- a/recipes/base-passwd/base-passwd_3.5.20.bb +++ b/recipes/base-passwd/base-passwd_3.5.20.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Base system password/group files." SECTION = "base" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" SRC_URI = "\ diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc index d1904a6dbc..1ee263ad90 100644 --- a/recipes/busybox/busybox.inc +++ b/recipes/busybox/busybox.inc @@ -7,7 +7,7 @@ functionality and behave very much like their GNU counterparts. BusyBox \ provides a fairly complete POSIX environment for any small or embedded \ system." HOMEPAGE = "http://www.busybox.net" -LICENSE = "GPL" +LICENSE = "GPLv2" SECTION = "base" PRIORITY = "required" diff --git a/recipes/ctorrent/ctorrent_3.3.1.bb b/recipes/ctorrent/ctorrent_3.3.1.bb index 91a1fac181..ae189af36f 100644 --- a/recipes/ctorrent/ctorrent_3.3.1.bb +++ b/recipes/ctorrent/ctorrent_3.3.1.bb @@ -2,6 +2,8 @@ require ctorrent.inc DESCRIPTION += "This is the Enhanced version from the dtorrent project" -SRC_URI = "${SOURCEFORGE_MIRROR}/dtorrent/ctorrent-dnh${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/dtorrent/ctorrent-dnh${PV}.tar.gz \ + file://CVE-2009-1759.patch;patch=1;pnum=0 " S = "${WORKDIR}/${PN}-dnh${PV}" +PR="r1" diff --git a/recipes/ctorrent/files/CVE-2009-1759.patch b/recipes/ctorrent/files/CVE-2009-1759.patch new file mode 100644 index 0000000000..2f61c92852 --- /dev/null +++ b/recipes/ctorrent/files/CVE-2009-1759.patch @@ -0,0 +1,88 @@ +CVE-2009-1759 + +http://sourceforge.net/tracker/?func=detail&aid=2782875&group_id=202532&atid=981959 + +Index: bencode.h +=================================================================== +--- bencode.h (revision 301) ++++ bencode.h (revision 302) +@@ -25,7 +25,7 @@ + size_t decode_list(const char *b,size_t len,const char *keylist); + size_t decode_rev(const char *b,size_t len,const char *keylist); + size_t decode_query(const char *b,size_t len,const char *keylist,const char **ps,size_t *pi,int64_t *pl,int method); +-size_t decode_list2path(const char *b, size_t n, char *pathname); ++size_t decode_list2path(const char *b, size_t n, char *pathname, size_t maxlen); + size_t bencode_buf(const char *str,size_t len,FILE *fp); + size_t bencode_str(const char *str, FILE *fp); + size_t bencode_int(const uint64_t integer, FILE *fp); +Index: bencode.cpp +=================================================================== +--- bencode.cpp (revision 301) ++++ bencode.cpp (revision 302) +@@ -233,22 +233,28 @@ + return bencode_end_dict_list(fp); + } + +-size_t decode_list2path(const char *b, size_t n, char *pathname) ++size_t decode_list2path(const char *b, size_t n, char *pathname, size_t maxlen) + { + const char *pb = b; + const char *s = (char *) 0; ++ const char *endmax = pathname + maxlen - 1; + size_t r,q; + + if( 'l' != *pb ) return 0; + pb++; + n--; + if( !n ) return 0; +- for(; n;){ ++ while( n && pathname < endmax ){ + if(!(r = buf_str(pb, n, &s, &q)) ) return 0; ++ if( q >= maxlen ) return 0; + memcpy(pathname, s, q); + pathname += q; +- pb += r; n -= r; +- if( 'e' != *pb ){*pathname = PATH_SP, pathname++;} else break; ++ maxlen -= q; ++ pb += r; ++ n -= r; ++ if( 'e' == *pb ) break; ++ if( pathname >= endmax ) return 0; ++ *pathname++ = PATH_SP; + } + *pathname = '\0'; + return (pb - b + 1); +Index: btfiles.cpp +=================================================================== +--- btfiles.cpp (revision 301) ++++ btfiles.cpp (revision 302) +@@ -471,6 +471,8 @@ + BTFILE *pbf_last = (BTFILE*) 0; + BTFILE *pbf = (BTFILE*) 0; + size_t dl; ++ unsigned long nfiles = 0; ++ + if( decode_query(metabuf,metabuf_len,"info|length", + (const char**) 0,(size_t*) 0,(int64_t*) 0,QUERY_LONG) ) + return -1; +@@ -524,12 +526,18 @@ + #ifndef WINDOWS + if( !pbf ) return -1; + #endif ++ nfiles++; + pbf->bf_length = t; + m_total_files_length += t; + r = decode_query(p, dl, "path", (const char **)0, &n, (int64_t*)0, + QUERY_POS); +- if( !r ) return -1; +- if(!decode_list2path(p + r, n, path)) return -1; ++ if( !r || !decode_list2path(p + r, n, path, sizeof(path)) ){ ++ CONSOLE.Warning(1, ++ "error, invalid path in torrent data for file %lu at offset %llu", ++ nfiles, m_total_files_length - t); ++ delete pbf; ++ return -1; ++ } + + int f_conv; + char *tmpfn = new char[strlen(path)*2+5]; diff --git a/recipes/devmem2/devmem2.bb b/recipes/devmem2/devmem2.bb index 4888d333b1..6a18173329 100644 --- a/recipes/devmem2/devmem2.bb +++ b/recipes/devmem2/devmem2.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Simple program to read/write from/to any location in memory." SRC_URI = "http://www.lartmaker.nl/lartware/port/devmem2.c" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r3" S = "${WORKDIR}" diff --git a/recipes/dosfstools/dosfstools_2.10.bb b/recipes/dosfstools/dosfstools_2.10.bb index 100044b75d..2b2dc016af 100644 --- a/recipes/dosfstools/dosfstools_2.10.bb +++ b/recipes/dosfstools/dosfstools_2.10.bb @@ -6,7 +6,7 @@ DESCRIPTION = "DOS FAT Filesystem Utilities" SECTION = "base" PRIORITY = "optional" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r2" diff --git a/recipes/dosfstools/dosfstools_2.11.bb b/recipes/dosfstools/dosfstools_2.11.bb index a5f6e034dd..a8ae11cbc1 100644 --- a/recipes/dosfstools/dosfstools_2.11.bb +++ b/recipes/dosfstools/dosfstools_2.11.bb @@ -6,7 +6,7 @@ DESCRIPTION = "DOS FAT Filesystem Utilities" SECTION = "base" PRIORITY = "optional" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" diff --git a/recipes/efl1/ecore.inc b/recipes/efl1/ecore.inc index ef3ba55d55..69d3f7607c 100644 --- a/recipes/efl1/ecore.inc +++ b/recipes/efl1/ecore.inc @@ -5,10 +5,12 @@ DEPENDS = "gettext-native virtual/libiconv curl eet evas tslib glib-2.0 \ # optional # DEPENDS += "directfb libsdl-x11 openssl virtual/libiconv" PV = "0.9.9.060+svnr${SRCPV}" -PR = "r3" +PR = "r4" inherit efl +SRC_URI += "file://fix-ecore-fb-initialization.patch;patch=1" + do_configure_prepend() { touch ${S}/po/Makefile.in.in || true sed -i -e 's: po::g' ${S}/Makefile.am @@ -71,5 +73,3 @@ FILES_${PN}-txt = "${libdir}/libecore_txt*.so.*" FILES_${PN}-x = "${libdir}/libecore_x*.so.*" FILES_${PN}-input = "${libdir}/libecore_input*.so.*" - - diff --git a/recipes/efl1/ecore/fix-ecore-fb-initialization.patch b/recipes/efl1/ecore/fix-ecore-fb-initialization.patch new file mode 100644 index 0000000000..2ac61ca63c --- /dev/null +++ b/recipes/efl1/ecore/fix-ecore-fb-initialization.patch @@ -0,0 +1,29 @@ +# +# The whole ecore-fb init logic is somewhat flawed; with this patch we +# get at least a working touchscreen w/ tslib again. +# +# Signed-off-by: Michael 'Mickey' Lauer <mlauer@vanille-media.de> +# + +Index: ecore/src/lib/ecore_fb/ecore_fb.c +=================================================================== +--- ecore.orig/src/lib/ecore_fb/ecore_fb.c ++++ ecore/src/lib/ecore_fb/ecore_fb.c +@@ -46,6 +46,9 @@ + + if (!ecore_fb_vt_init()) + return --_ecore_fb_init_count; ++ ++ if (!ecore_fb_ts_init()) ++ return --_ecore_fb_init_count; + + ECORE_FB_EVENT_KEY_DOWN = ecore_event_type_new(); + ECORE_FB_EVENT_KEY_UP = ecore_event_type_new(); +@@ -70,6 +73,7 @@ + if (--_ecore_fb_init_count != 0) + return _ecore_fb_init_count; + ++ ecore_fb_ts_shutdown(); + ecore_fb_vt_shutdown(); + + return _ecore_fb_init_count; diff --git a/recipes/efl1/ecore_svn.bb b/recipes/efl1/ecore_svn.bb index 2354673eb3..6fc4676214 100644 --- a/recipes/efl1/ecore_svn.bb +++ b/recipes/efl1/ecore_svn.bb @@ -1,10 +1,11 @@ require ecore.inc -PR = "r7" +PR = "r8" -SRC_URI += "file://iconv.patch;patch=1;maxrev=43996 \ - file://exit_uclibc_dns.patch;patch=1;maxrev=47076 \ - file://exit_uclibc.patch;patch=1 \ - " +SRC_URI += "\ + file://iconv.patch;patch=1;maxrev=43996 \ + file://exit_uclibc_dns.patch;patch=1;maxrev=47076 \ + file://exit_uclibc.patch;patch=1 \ +" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ diff --git a/recipes/efl1/elementary_svn.bb b/recipes/efl1/elementary_svn.bb index db75d52160..e3a1e91ee5 100644 --- a/recipes/efl1/elementary_svn.bb +++ b/recipes/efl1/elementary_svn.bb @@ -6,32 +6,42 @@ PR = "r7" inherit efl -EXTRA_OECONF = " \ - --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \ - --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ +EXTRA_OECONF = "\ + --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ + --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \ " SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/TMP/st;module=elementary;proto=http" S = "${WORKDIR}/elementary" -RDEPENDS_${PN} = "elementary-themes" -RSUGGESTS_${PN} = "elementary-tests" - do_compile_append() { sed -i -e s:${STAGING_DIR_TARGET}::g \ -e s:/${TARGET_SYS}::g \ elementary.pc } +PACKAGES =+ "${PN}-configs" + +RDEPENDS_${PN} = "\ + elementary-themes \ + elementary-configs \ +" +RSUGGESTS_${PN} = "elementary-tests" + FILES_${PN}-themes = "\ ${datadir}/elementary/themes \ " +FILES_${PN}-configs = "\ + ${datadir}/elementary/config \ +" + FILES_${PN}-tests = "\ ${bindir}/elementary* \ ${datadir}/elementary/images \ ${datadir}/elementary/objects \ ${datadir}/applications/* \ ${datadir}/icons/* \ + ${libdir}/elementary/modules/test_entry/* \ " diff --git a/recipes/efl1/evas-native_svn.bb b/recipes/efl1/evas-native_svn.bb index 0cb192ca9f..5c46a01234 100644 --- a/recipes/efl1/evas-native_svn.bb +++ b/recipes/efl1/evas-native_svn.bb @@ -62,57 +62,3 @@ EXTRA_OECONF = "\ --disable-convert-32-rgb-rot-270" -# evas needs a different oe_libinstall, so copy/paste autotools_stage_all -do_oldstage() { - rm -rf ${STAGE_TEMP} - mkdir -p ${STAGE_TEMP} - oe_runmake DESTDIR="${STAGE_TEMP}" install - autotools_stage_dir ${STAGE_TEMP}/${includedir} ${STAGING_INCDIR} - if [ "${BUILD_SYS}" = "${HOST_SYS}" ]; then - autotools_stage_dir ${STAGE_TEMP}/${bindir} ${STAGING_DIR_HOST}${layout_bindir} - autotools_stage_dir ${STAGE_TEMP}/${sbindir} ${STAGING_DIR_HOST}${layout_sbindir} - autotools_stage_dir ${STAGE_TEMP}/${base_bindir} ${STAGING_DIR_HOST}${layout_base_bindir} - autotools_stage_dir ${STAGE_TEMP}/${base_sbindir} ${STAGING_DIR_HOST}${layout_base_sbindir} - autotools_stage_dir ${STAGE_TEMP}/${libexecdir} ${STAGING_DIR_HOST}${layout_libexecdir} - fi - if [ -d ${STAGE_TEMP}/${libdir} ] - then - olddir=`pwd` - cd ${STAGE_TEMP}/${libdir} - las=$(find . -name \*.la -type f) - cd $olddir - echo "Found la files: $las" - if [ -n "$las" ]; then - # If there are .la files then libtool was used in the - # build, so install them with magic mangling. - for i in $las - do - dir=$(dirname $i) - echo "oe_libinstall -C ${STAGE_TEMP}/${libdir}/${dir} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir}" - oe_libinstall -C ${STAGE_TEMP}/${libdir}/${dir} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir} - done - else - # Otherwise libtool wasn't used, and lib/ can be copied - # directly. - echo "cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}" - cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR} - fi - - fi - # Ok, this is nasty. pkgconfig.bbclass is usually used to install .pc files, - # however some packages rely on the presence of .pc files to enable/disable - # their configurataions in which case we better should not install everything - # unconditionally, but rather depend on the actual results of make install. - # The good news though: a) there are not many packages doing this and - # b) packaged staging will fix that anyways. :M: - if [ "${AUTOTOOLS_STAGE_PKGCONFIG}" = "1" ] - then - echo "cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/" - cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/ - fi - rm -rf ${STAGE_TEMP}/${mandir} || true - rm -rf ${STAGE_TEMP}/${infodir} || true - autotools_stage_dir ${STAGE_TEMP}/${datadir} ${STAGING_DATADIR} - rm -rf ${STAGE_TEMP} - -} diff --git a/recipes/faad2/faad2_2.7.bb b/recipes/faad2/faad2_2.7.bb new file mode 100644 index 0000000000..e778432840 --- /dev/null +++ b/recipes/faad2/faad2_2.7.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Library for reading some sort of media format." +SECTION = "libs" +LICENSE = "LGPL" +PRIORITY = "optional" + +inherit autotools + +SRC_URI = "${SOURCEFORGE_MIRROR}/faac/faad2-src/faad2-${PV}/${PN}-${PV}.tar.bz2;name=faad2 \ +" + +SRC_URI[faad2.md5sum] = "4c332fa23febc0e4648064685a3d4332" +SRC_URI[faad2.sha256sum] = "14561b5d6bc457e825bfd3921ae50a6648f377a9396eaf16d4b057b39a3f63b5" + +PACKAGES =+ "libfaad libfaad-dev libmp4ff libmp4ff-dev" + +FILES_${PN} = "${bindir}/faad" + +FILES_libfaad = "${libdir}/libfaad.so.*" +FILES_libfaad-dev = "${libdir}/libfaad.so ${libdir}/libfaad.la ${libdir}/libfaad.a ${includedir}/faad.h" + +FILES_libmp4ff = "${libdir}/libmp4ff.so.*" +FILES_libmp4ff-dev = "${libdir}/libmp4ff.so ${libdir}/libmp4ff.la ${libdir}/libmp4ff.a ${includedir}/mp4ff.h" + diff --git a/recipes/fbset/fbset_2.1.bb b/recipes/fbset/fbset_2.1.bb index 9037350bad..6299148579 100644 --- a/recipes/fbset/fbset_2.1.bb +++ b/recipes/fbset/fbset_2.1.bb @@ -6,7 +6,7 @@ # Date: 28-May-06 DESCRIPTION = "The fbset console tool" -LICENSE = "GPL" +LICENSE = "GPLv2" RRECOMMENDS = "fbset-modes" PR = "r2" diff --git a/recipes/fbv/fbv-1.0b/fbv-1.0b.patch b/recipes/fbv/fbv-1.0b/fbv-1.0b.patch new file mode 100644 index 0000000000..2ca9d522b9 --- /dev/null +++ b/recipes/fbv/fbv-1.0b/fbv-1.0b.patch @@ -0,0 +1,12 @@ +diff -urN fbv-1.0b-0rig/Makefile fbv-1.0b/Makefile +--- fbv-1.0b-0rig/Makefile 2009-08-20 00:33:58.000000000 +0200 ++++ fbv-1.0b/Makefile 2009-08-20 00:34:16.000000000 +0200 +@@ -12,7 +12,7 @@ + OBJECTS = ${SOURCES:.c=.o} + + OUT = fbv +-#LIBS = -lungif -L/usr/X11R6/lib -ljpeg -lpng ++LIBS = -L/usr/lib -ljpeg -lpng #-lungif + + all: $(OUT) + @echo Build DONE. diff --git a/recipes/fbv/fbv_1.0b.bb b/recipes/fbv/fbv_1.0b.bb index 04c70661d6..6016e0a709 100644 --- a/recipes/fbv/fbv_1.0b.bb +++ b/recipes/fbv/fbv_1.0b.bb @@ -1,25 +1,28 @@ DESCRIPTION = "Frame Buffer Viewer" LICENSE = "GPL" -DEPENDS = "libpng" -PR = "r1" +DEPENDS = "libpng jpeg" +PR = "r2" SRC_URI = "http://s-tech.elsat.net.pl/fbv/fbv-1.0b.tar.gz \ - file://cross_compile.patch;patch=1" + file://cross_compile.patch;patch=1 \ + file://fbv-1.0b.patch;patch=1 \ + " do_configure() { - CC="${CC}" ./configure --without-libungif --without-bmp \ - --without-libjpeg + CC="${CC}" ./configure --without-libungif } do_compile() { - oe_runmake CFLAGS="-O2 -Wall -D_GNU_SOURCE -D__KERNEL_STRICT_NAMES" \ - CC="${CC}" + oe_runmake CC="${CC}" \ + CFLAGS="-O2 -Wall -D_GNU_SOURCE -D__KERNEL_STRICT_NAMES" } + do_install() { install -d ${D}${bindir} - install -m 0755 fbv ${D}${bindir} + install -m 0755 fbv ${D}${bindir} - # man - install -d ${D}${mandir}/man1/ - install -m 0644 fbv.1 ${D}${mandir}/man1/fbv.1 +# man + install -d ${D}${mandir}/man1/ + install -m 0644 fbv.1 ${D}${mandir}/man1/fbv.1 } + diff --git a/recipes/ffmpeg/ffmpeg_svn.bb b/recipes/ffmpeg/ffmpeg_svn.bb index 0414e138b2..ec3082179a 100644 --- a/recipes/ffmpeg/ffmpeg_svn.bb +++ b/recipes/ffmpeg/ffmpeg_svn.bb @@ -2,7 +2,7 @@ require ffmpeg.inc DEPENDS += "schroedinger libgsm" -SRCREV = "21107" +SRCREV = "22521" PE = "1" PV = "0.5.0+${PR}+svnr${SRCPV}" @@ -44,6 +44,7 @@ EXTRA_OECONF = " \ --enable-libtheora \ --enable-libvorbis \ --arch=${TARGET_ARCH} \ + --target-os="linux" \ --enable-cross-compile \ --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ --extra-ldflags="${TARGET_LDFLAGS}" \ diff --git a/recipes/fltk/fltkspacetrader_svn.bb b/recipes/fltk/fltkspacetrader_svn.bb index f793aa2b77..b19e5928e6 100644 --- a/recipes/fltk/fltkspacetrader_svn.bb +++ b/recipes/fltk/fltkspacetrader_svn.bb @@ -4,11 +4,11 @@ AUTHOR = "Benjamin 'blindcoder' Schieder' LICENSE = "GPLv2" SECTION = "x11/game" DEPENDS = "fltk" -SRCREV = "110" -PV = "1.0+svnr${SRCPV}" +SRCREV = "190" +PV = "1.2+svnr${SRCPV}" PR = "r0" -S = "${WORKDIR}/1.0-stable" +S = "${WORKDIR}/1.2-stable" inherit autotools -SRC_URI = "svn://scavenger.homeip.net/svn/fltkspacetrader/tags;module=1.0-stable;proto=http" +SRC_URI = "svn://scavenger.homeip.net/svn/fltkspacetrader/tags;module=1.2-stable;proto=http" diff --git a/recipes/freesmartphone/zhone2_git.bb b/recipes/freesmartphone/zhone2_git.bb new file mode 100644 index 0000000000..eb19fbaeec --- /dev/null +++ b/recipes/freesmartphone/zhone2_git.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "A demo phone application based on FSO" +AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" +HOMEPAGE = "http://www.freesmartphone.org" +SECTION = "x11" +LICENSE = "GPLv2" +DEPENDS = "edje-native vala-native evas ecore edje libeflvala libfsobasics libfsoframework libfso-glib" +PV = "2.0.0+gitr${SRCREV}" +PR = "r0" + +SRC_URI = "${FREESMARTPHONE_GIT}/aurora.git;protocol=git;branch=master" +S = "${WORKDIR}/git/zhone2" + +inherit autotools_stage diff --git a/recipes/gdb/gdb-cross-sdk_6.6.bb b/recipes/gdb/gdb-cross-sdk_6.6.bb index bf0f2ebbab..aa6e7563cf 100644 --- a/recipes/gdb/gdb-cross-sdk_6.6.bb +++ b/recipes/gdb/gdb-cross-sdk_6.6.bb @@ -1,4 +1,5 @@ require gdb-cross.inc +LICENSE = "GPLv2" inherit sdk diff --git a/recipes/gdb/gdb-cross_6.3.bb b/recipes/gdb/gdb-cross_6.3.bb index 5b27e09959..fd2f97245c 100644 --- a/recipes/gdb/gdb-cross_6.3.bb +++ b/recipes/gdb/gdb-cross_6.3.bb @@ -1,4 +1,5 @@ require gdb-cross.inc +LICENSE = "GPLv2" inherit cross diff --git a/recipes/gdb/gdb-cross_6.4.bb b/recipes/gdb/gdb-cross_6.4.bb index e4946b0fe1..2e6de0895e 100644 --- a/recipes/gdb/gdb-cross_6.4.bb +++ b/recipes/gdb/gdb-cross_6.4.bb @@ -1,4 +1,5 @@ require gdb-cross.inc +LICENSE = "GPLv2" inherit cross diff --git a/recipes/gdb/gdb-cross_6.6.bb b/recipes/gdb/gdb-cross_6.6.bb index 570dd52859..a1851f7777 100644 --- a/recipes/gdb/gdb-cross_6.6.bb +++ b/recipes/gdb/gdb-cross_6.6.bb @@ -1,4 +1,6 @@ require gdb-cross.inc +LICENSE = "GPLv2" + inherit cross PR = "r3" diff --git a/recipes/gdb/gdb-cross_6.7.1.bb b/recipes/gdb/gdb-cross_6.7.1.bb index adccebe115..0681029694 100644 --- a/recipes/gdb/gdb-cross_6.7.1.bb +++ b/recipes/gdb/gdb-cross_6.7.1.bb @@ -1,4 +1,6 @@ require gdb-cross.inc +LICENSE = "GPLv3" + inherit cross DEFAULT_PREFERENCE_avr32 = "99" diff --git a/recipes/gdb/gdb_6.3.bb b/recipes/gdb/gdb_6.3.bb index 988cfb4c44..69d9e7117d 100644 --- a/recipes/gdb/gdb_6.3.bb +++ b/recipes/gdb/gdb_6.3.bb @@ -1,3 +1,4 @@ require gdb.inc +LICENSE = "GPLv2" PR = "r4" diff --git a/recipes/gdb/gdb_6.4.bb b/recipes/gdb/gdb_6.4.bb index be40f3f12b..b3c53a27ae 100644 --- a/recipes/gdb/gdb_6.4.bb +++ b/recipes/gdb/gdb_6.4.bb @@ -1,3 +1,4 @@ require gdb.inc +LICENSE = "GPLv2" PR = "r2" diff --git a/recipes/gdb/gdb_6.6.bb b/recipes/gdb/gdb_6.6.bb index e4502a648e..501e1164ff 100644 --- a/recipes/gdb/gdb_6.6.bb +++ b/recipes/gdb/gdb_6.6.bb @@ -1,4 +1,5 @@ require gdb.inc +LICENSE = "GPLv2" PR = "r5" diff --git a/recipes/gdb/gdb_6.7.1.bb b/recipes/gdb/gdb_6.7.1.bb index fedf2bf1f1..fb9ed3f1bf 100644 --- a/recipes/gdb/gdb_6.7.1.bb +++ b/recipes/gdb/gdb_6.7.1.bb @@ -1,4 +1,5 @@ require gdb.inc +LICENSE = "GPLv3" PR = "r1" diff --git a/recipes/gettext/gettext-0.17/m4_copy.patch b/recipes/gettext/gettext-0.17/m4_copy.patch new file mode 100644 index 0000000000..2502221379 --- /dev/null +++ b/recipes/gettext/gettext-0.17/m4_copy.patch @@ -0,0 +1,53 @@ +@ -0,0 +1,52 @@ +Re: _AC_LANG_OPENMP and m4_copy + +Bruno Haible +Wed, 03 Dec 2008 16:33:38 -0800 + +Hello Ralf, + +Thanks for the report and fix. + +Eric Blake wrote: +> Looks fine to me, but let Bruno chime in before committing. I agree with +> your approach of fixing gnulib to avoid the problem by not competing when +> a new-enough autoconf provides the macro + +I agree with this approach. But the patch introduces the use of another +undocumented macro, namely 'm4_version_prereq'. I prefer to get away without +it, and am committing this: + + +2008-12-03 Ralf Wildenhues <[EMAIL PROTECTED]> + Bruno Haible <[EMAIL PROTECTED]> + + * m4/openmp.m4 (AC_OPENMP): Do not define with Autoconf 2.62 or newer. + + +--- gettext-0.17.old/gettext-tools/gnulib-m4/openmp.m4 2007-05-27 21:50:22.000000000 +0200 ++++ gettext-0.17/gettext-tools/gnulib-m4/openmp.m4 2010-02-10 16:48:58.000000000 +0100 +@@ -1,11 +1,15 @@ +-# openmp.m4 serial 4 +-dnl Copyright (C) 2006-2007 Free Software Foundation, Inc. ++# openmp.m4 serial 5 ++dnl Copyright (C) 2006-2008 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + + dnl This file can be removed once we assume autoconf >= 2.62. + ++dnl Expand to nothing in autoconf >= 2.62. m4_copy has a different ++dnl semantic in autoconf > 2.63. ++m4_ifdef([AC_OPENMP], [], [ ++ + # _AC_LANG_OPENMP + # --------------- + # Expands to some language dependent source code for testing the presence of +@@ -90,3 +94,6 @@ + fi + AC_SUBST([OPENMP_]_AC_LANG_PREFIX[FLAGS]) + ]) ++ ++]) ++ diff --git a/recipes/gettext/gettext_0.17.bb b/recipes/gettext/gettext_0.17.bb index fbb479a75e..36a99f6dc7 100644 --- a/recipes/gettext/gettext_0.17.bb +++ b/recipes/gettext/gettext_0.17.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The GNU internationalization library." HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" SECTION = "libs" LICENSE = "GPLv3" -PR = "r5" +PR = "r6" DEPENDS = "gettext-native virtual/libiconv ncurses expat" DEPENDS_virtclass-native = "libxml2-native" PROVIDES = "virtual/libintl" @@ -16,6 +16,7 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ file://wchar-uclibc.patch;patch=1 \ file://use_open_properly.patch;patch=1 \ file://gettext-autoconf-lib-link-no-L.patch;patch=1 \ + file://m4_copy.patch;patch=1 \ " SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1" diff --git a/recipes/gftp/gftp/gftp-2.0.18-188252.patch b/recipes/gftp/gftp/gftp-2.0.18-188252.patch new file mode 100644 index 0000000000..27b3d48ac8 --- /dev/null +++ b/recipes/gftp/gftp/gftp-2.0.18-188252.patch @@ -0,0 +1,77 @@ +Gentoo patch from http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/net-ftp/gftp/files/gftp-2.0.18-188252.patch?rev=1.1 + +addresses: CVE-2007-3961, CVE-2007-3962 + +diff --exclude-from=/home/dang/.scripts/diffrc -up -bruN gftp-2.0.18.orig/lib/fsplib/fsplib.c gftp-2.0.18/lib/fsplib/fsplib.c +--- gftp-2.0.18.orig/lib/fsplib/fsplib.c 2005-01-18 21:03:45.000000000 -0500 ++++ gftp-2.0.18/lib/fsplib/fsplib.c 2007-09-21 16:03:01.000000000 -0400 +@@ -612,7 +612,7 @@ int fsp_readdir_r(FSP_DIR *dir,struct di + entry->d_reclen = fentry.reclen; + strncpy(entry->d_name,fentry.name,MAXNAMLEN); + +- if (fentry.namlen > MAXNAMLEN) ++ if (fentry.namlen >= MAXNAMLEN) + { + entry->d_name[MAXNAMLEN + 1 ] = '\0'; + #ifdef HAVE_NAMLEN +@@ -680,9 +680,19 @@ int fsp_readdir_native(FSP_DIR *dir,FSP_ + /* skip file date and file size */ + dir->dirpos += 9; + /* read file name */ +- entry->name[255 + 1] = '\0'; ++ entry->name[255] = '\0'; + strncpy(entry->name,(char *)( dir->data + dir->dirpos ),MAXNAMLEN); ++ /* check for ASCIIZ encoded filename */ ++ if (memchr(dir->data + dir->dirpos,0,dir->datasize - dir->dirpos) != NULL) ++ { + namelen = strlen( (char *) dir->data+dir->dirpos); ++ } ++ else ++ { ++ /* \0 terminator not found at end of filename */ ++ *result = NULL; ++ return 0; ++ } + /* skip over file name */ + dir->dirpos += namelen +1; + +@@ -709,12 +719,12 @@ int fsp_readdir_native(FSP_DIR *dir,FSP_ + + struct dirent * fsp_readdir(FSP_DIR *dirp) + { +- static struct dirent entry; ++ static dirent_workaround entry; + struct dirent *result; + + + if (dirp == NULL) return NULL; +- if ( fsp_readdir_r(dirp,&entry,&result) ) ++ if ( fsp_readdir_r(dirp,&entry.dirent,&result) ) + return NULL; + else + return result; +diff --exclude-from=/home/dang/.scripts/diffrc -up -bruN gftp-2.0.18.orig/lib/fsplib/fsplib.h gftp-2.0.18/lib/fsplib/fsplib.h +--- gftp-2.0.18.orig/lib/fsplib/fsplib.h 2005-01-18 21:04:02.000000000 -0500 ++++ gftp-2.0.18/lib/fsplib/fsplib.h 2007-09-21 15:56:37.000000000 -0400 +@@ -1,6 +1,8 @@ + #ifndef _FSPLIB_H + #define _FSPLIB_H 1 + #include <time.h> ++#include <stddef.h> ++ + /* The FSP v2 protocol support library - public interface */ + + /* +@@ -138,6 +140,12 @@ typedef struct FSP_FILE { + unsigned int pos; /* position of next packet */ + } FSP_FILE; + ++ ++typedef union dirent_workaround { ++ struct dirent dirent; ++ char fill[offsetof (struct dirent, d_name) + MAXNAMLEN + 1]; ++} dirent_workaround; ++ + /* function prototypes */ + + /* session management */ diff --git a/recipes/gftp/gftp/gftp-2.0.18-ipv6.patch b/recipes/gftp/gftp/gftp-2.0.18-ipv6.patch new file mode 100644 index 0000000000..05454211b8 --- /dev/null +++ b/recipes/gftp/gftp/gftp-2.0.18-ipv6.patch @@ -0,0 +1,33 @@ +2006-7-19 Brian Masney <masneyb@gftp.org> + * lib/misc.c (gftp_copy_request) - fixes when doing an IPv6 transfer or + using ignore PASV address (from (from Aurelien Jarno) (closes GNOME bugzilla #169671) + +--- a/trunk/lib/misc.c 2006/07/20 02:32:58 784 ++++ b/trunk/lib/misc.c 2006/07/20 02:37:45 785 +@@ -568,8 +568,24 @@ + newreq->use_proxy = req->use_proxy; + newreq->logging_function = req->logging_function; + newreq->ai_family = req->ai_family; +- newreq->free_hostp = 0; +- newreq->hostp = NULL; ++ ++ if (req->hostp) ++ { ++#if defined (HAVE_GETADDRINFO) && defined (HAVE_GAI_STRERROR) ++ newreq->hostp = g_malloc (sizeof(struct addrinfo)); ++ memcpy(newreq->hostp, req->hostp, sizeof(struct addrinfo)); ++ if (req->current_hostp) ++ newreq->current_hostp = newreq->hostp + (req->current_hostp - req->hostp); ++#else ++ newreq->hostp = g_malloc (sizeof(struct hostent)); ++ memcpy(newreq->hostp, req->hostp, sizeof(struct hostent)); ++ newreq->host = req->host; ++ newreq->curhost = req->curhost; ++#endif ++ } ++ else ++ newreq->hostp = NULL; ++ newreq->free_hostp = 1; + + gftp_copy_local_options (&newreq->local_options_vars, + &newreq->local_options_hash, diff --git a/recipes/gftp/gftp/gftp-2.0.18-mkinstalldir.patch b/recipes/gftp/gftp/gftp-2.0.18-mkinstalldir.patch new file mode 100644 index 0000000000..e2781bd928 --- /dev/null +++ b/recipes/gftp/gftp/gftp-2.0.18-mkinstalldir.patch @@ -0,0 +1,14 @@ +Index: gftp-2.0.18/po/Makefile.in.in +=================================================================== +--- gftp-2.0.18.orig/po/Makefile.in.in 2010-03-16 14:07:50.311553658 +0800 ++++ gftp-2.0.18/po/Makefile.in.in 2010-03-16 14:08:08.977119831 +0800 +@@ -28,8 +28,7 @@ + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +-MKINSTALLDIRS = @MKINSTALLDIRS@ +-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + + GMSGFMT = @GMSGFMT@ + MSGFMT = @MSGFMT@ diff --git a/recipes/gftp/gftp/gftp-2.0.18-ssh2-read.patch b/recipes/gftp/gftp/gftp-2.0.18-ssh2-read.patch new file mode 100644 index 0000000000..765741be7b --- /dev/null +++ b/recipes/gftp/gftp/gftp-2.0.18-ssh2-read.patch @@ -0,0 +1,13 @@ +--- gftp-2.0.18.orig/lib/sshv2.c ++++ gftp-2.0.18/lib/sshv2.c +@@ -1841,7 +1841,7 @@ + { + int ret; + +- if ((ret = sshv2_open_file (request, file, startsize, SSH_FXP_OPEN)) < 0) ++ if ((ret = sshv2_open_file (request, file, startsize, SSH_FXF_READ)) < 0) + return (ret); + + return (sshv2_get_file_size (request, file)); + + diff --git a/recipes/gftp/gftp/gftp-2.0.18-ssl-wildcardcert.patch b/recipes/gftp/gftp/gftp-2.0.18-ssl-wildcardcert.patch new file mode 100644 index 0000000000..202b2931c9 --- /dev/null +++ b/recipes/gftp/gftp/gftp-2.0.18-ssl-wildcardcert.patch @@ -0,0 +1,22 @@ +--- lib/sslcommon.c 2005-01-04 14:32:11.000000000 +0100 ++++ lib/sslcommon.c 2006-06-19 15:23:13.000000000 +0200 +@@ -182,7 +182,18 @@ + X509_NAME_get_text_by_NID (subj, NID_commonName, data, 256) > 0) + { + data[sizeof (data) - 1] = '\0'; +- if (strcasecmp (data, request->hostname) != 0) ++ /* Check for wildcard CN (must begin with *.) */ ++ if (strncmp(data, "*.", 2) == 0) ++ { ++ int hostname_len = strlen(data) - 1; ++ if (strlen(request->hostname) > hostname_len && ++ strcasecmp (&(data[1]), &(request->hostname[strlen(request->hostname) - hostname_len])) == 0) ++ ok = 1; ++ } ++ else if (strcasecmp (data, request->hostname) == 0) ++ ok = 1; ++ ++ if (!ok) + { + request->logging_function (gftp_logging_error, request, + _("ERROR: The host in the SSL certificate (%s) does not match the host that we connected to (%s). Aborting connection.\n"), diff --git a/recipes/gftp/gftp_2.0.18.bb b/recipes/gftp/gftp_2.0.18.bb index f5705b1357..fa73486d4a 100644 --- a/recipes/gftp/gftp_2.0.18.bb +++ b/recipes/gftp/gftp_2.0.18.bb @@ -6,10 +6,15 @@ DESCRIPTION = "Free multithreaded file transfer client (FTP/HTTP/SSH)." HOMEPAGE="http://www.gftp.org/" SECTION = "x11/network" LICENSE="GPL" -PR = "r1" +PR = "r4" SRC_URI="http://www.gftp.org/gftp-${PV}.tar.bz2 \ - file://configure.patch;patch=1" + file://configure.patch;patch=1 \ + file://gftp-2.0.18-188252.patch;patch=1 \ + file://gftp-2.0.18-ipv6.patch;patch=1;pnum=2 \ + file://gftp-2.0.18-ssh2-read.patch;patch=1 \ + file://gftp-2.0.18-ssl-wildcardcert.patch;patch=1;pnum=0 \ + file://gftp-2.0.18-mkinstalldir.patch;patch=1 " DEPENDS="gtk+ openssl" diff --git a/recipes/git/git-native_1.7.0.2.bb b/recipes/git/git-native_1.7.0.2.bb index 63b14cbaad..b55070aa71 100644 --- a/recipes/git/git-native_1.7.0.2.bb +++ b/recipes/git/git-native_1.7.0.2.bb @@ -4,3 +4,5 @@ DEPENDS = "openssl-native curl-native zlib-native expat-native" PR = "r4" SRC_URI[src.md5sum] = "76518fa774b36de81d160b85fa4f19c1" SRC_URI[src.sha256sum] = "5601df7fc282fdd66de196b282694eb77dcfc50438f01587de144b3ead1a6b2f" + +EXTRA_OECONF_append = " --without-python" diff --git a/recipes/gnome/gnome-screensaver_2.28.0.bb b/recipes/gnome/gnome-screensaver_2.28.3.bb index 06a4ffe48e..d6468a3533 100644 --- a/recipes/gnome/gnome-screensaver_2.28.0.bb +++ b/recipes/gnome/gnome-screensaver_2.28.3.bb @@ -1,23 +1,24 @@ DESCRIPTION = "GNOME utilities" SECTION = "x11/gnome" LICENSE = "GPL" -DEPENDS = "gnome-common glib-2.0 gtk+ gconf" +DEPENDS = "gnome-menus gnome-desktop gnome-common shadow glib-2.0 gtk+ gconf" -inherit gnome pkgconfig +inherit gnome -PR = "r1" +SRC_URI[archive.md5sum] = "e6fb9b206f3470c04e21474ee6d69687" +SRC_URI[archive.sha256sum] = "f2ffec4f637883c7db15fb94c3f85a7d59ade3cf1f0107ecebc01df13f0ad5c3" EXTRA_OECONF = " \ --with-shadow=${STAGING_INCDIR}/.. \ " - -do_configure_prepend () { +# requires a too recent, non-default autoconf +do_configure () { cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S} sed -i -e 's:$CPPFLAGS -I$includedir:$CPPFLAGS:g' configure.ac -} + sed -i -e 's:$CPPFLAGS -I$includedir:$CPPFLAGS:g' configure -do_stage () { - autotools_stage_all + gnu-configize + oe_runconf } FILES_${PN} += "${datadir}/*background* ${datadir}/desktop-directories" diff --git a/recipes/grip/grip-3.2.0/no-host-includes.patch b/recipes/grip/grip-3.2.0/no-host-includes.patch new file mode 100644 index 0000000000..66fca367ee --- /dev/null +++ b/recipes/grip/grip-3.2.0/no-host-includes.patch @@ -0,0 +1,10 @@ +Index: grip-3.2.0/src/Makefile.am +=================================================================== +--- grip-3.2.0.orig/src/Makefile.am 2010-03-16 14:46:01.651553829 +0800 ++++ grip-3.2.0/src/Makefile.am 2010-03-16 14:46:05.240303128 +0800 +@@ -1,4 +1,4 @@ +-INCLUDES = -I$(top_srcdir) -I$(includedir) \ ++INCLUDES = -I$(top_srcdir) \ + -DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" \ + -DG_LOG_DOMAIN=\"grip\" -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -I../intl -I$(top_srcdir)/intl \ diff --git a/recipes/grip/grip-3.2.0/patch-src::discdb b/recipes/grip/grip-3.2.0/patch-src::discdb new file mode 100644 index 0000000000..1d300b270f --- /dev/null +++ b/recipes/grip/grip-3.2.0/patch-src::discdb @@ -0,0 +1,20 @@ +--- src/discdb.c.orig Thu Apr 15 21:23:37 2004 ++++ src/discdb.c Wed Mar 16 19:02:09 2005 +@@ -311,7 +311,7 @@ + query->query_match=MATCH_EXACT; + query->query_matches=0; + +- while((inbuffer=DiscDBReadLine(&dataptr))) { ++ while(query->query_matches < MAX_INEXACT_MATCHES && (inbuffer=DiscDBReadLine(&dataptr))) { + query->query_list[query->query_matches].list_genre= + DiscDBGenreValue(g_strstrip(strtok(inbuffer," "))); + +@@ -331,7 +331,7 @@ + query->query_match=MATCH_INEXACT; + query->query_matches=0; + +- while((inbuffer=DiscDBReadLine(&dataptr))) { ++ while(query->query_matches < MAX_INEXACT_MATCHES && (inbuffer=DiscDBReadLine(&dataptr))) { + query->query_list[query->query_matches].list_genre= + DiscDBGenreValue(g_strstrip(strtok(inbuffer," "))); + diff --git a/recipes/grip/grip-3.2.0/patch-src::main.c b/recipes/grip/grip-3.2.0/patch-src::main.c new file mode 100644 index 0000000000..40f1bc169b --- /dev/null +++ b/recipes/grip/grip-3.2.0/patch-src::main.c @@ -0,0 +1,11 @@ +--- src/main.c.orig ++++ src/main.c +@@ -163,7 +163,7 @@ + GNOME_PARAM_POPT_TABLE,options, + GNOME_PROGRAM_STANDARD_PROPERTIES,NULL); + +- bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF8"); ++ bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); + + /* Session Management */ + diff --git a/recipes/grip/grip_3.2.0.bb b/recipes/grip/grip_3.2.0.bb index 063803138d..81c36709f6 100644 --- a/recipes/grip/grip_3.2.0.bb +++ b/recipes/grip/grip_3.2.0.bb @@ -5,7 +5,12 @@ HOMEPAGE="http://www.nostatic.org/grip/" LICENSE="GPL" -SRC_URI="${SOURCEFORGE_MIRROR}/grip/grip-${PV}.tar.gz" +SRC_URI="${SOURCEFORGE_MIRROR}/grip/grip-${PV}.tar.gz \ + file://patch-src::discdb;patch=1;pnum=0 \ + file://patch-src::main.c;patch=1;pnum=0 \ + file://no-host-includes.patch;patch=1 " DEPENDS="libgnomeui vte curl cdparanoia id3lib" +PR = "r3" + inherit autotools diff --git a/recipes/gtk-webcore/files/no-static-templates.patch b/recipes/gtk-webcore/files/no-static-templates.patch new file mode 100644 index 0000000000..2cfb41f655 --- /dev/null +++ b/recipes/gtk-webcore/files/no-static-templates.patch @@ -0,0 +1,21 @@ +diff -urN JavaScriptCore-0rig/kjs/protected_values.cpp JavaScriptCore/kjs/protected_values.cpp +--- JavaScriptCore-0rig/kjs/protected_values.cpp 2010-02-26 12:57:50.000000000 +0100 ++++ JavaScriptCore/kjs/protected_values.cpp 2010-02-26 12:59:13.000000000 +0100 +@@ -195,7 +195,7 @@ + + template <int size> static unsigned hash(ValueImp *pointer); + +-template <> static inline unsigned hash<4>(ValueImp *pointer) ++template <> inline unsigned hash<4>(ValueImp *pointer) + { + int a = (int)(intptr_t)PHI; + int b = (int)(intptr_t)pointer; +@@ -214,7 +214,7 @@ + return (unsigned)c; + } + +-template <> static inline unsigned hash<8>(ValueImp *pointer) ++template <> inline unsigned hash<8>(ValueImp *pointer) + { + int a = (int)PHI; + int b = (int)(intptr_t)pointer; diff --git a/recipes/gtk-webcore/osb-jscore_svn.bb b/recipes/gtk-webcore/osb-jscore_svn.bb index 52c56f98b5..af85764842 100644 --- a/recipes/gtk-webcore/osb-jscore_svn.bb +++ b/recipes/gtk-webcore/osb-jscore_svn.bb @@ -4,10 +4,12 @@ LICENSE = "GPL" PRIORITY = "optional" PV = "0.5.2+svnr${SRCPV}" -PR = "r1" +PR = "r2" SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=JavaScriptCore;proto=https \ - file://gcc4-fno-threadsafe-statics-JavaScriptCore.patch;patch=1" + file://gcc4-fno-threadsafe-statics-JavaScriptCore.patch;patch=1 \ + file://no-static-templates.patch;patch=1 \ + " S = "${WORKDIR}/JavaScriptCore" diff --git a/recipes/gzip/gzip-1.3.13/configure.patch b/recipes/gzip/gzip-1.3.13/configure.patch new file mode 100644 index 0000000000..55e8c77345 --- /dev/null +++ b/recipes/gzip/gzip-1.3.13/configure.patch @@ -0,0 +1,15 @@ +Index: gzip-1.3.13/configure.ac +=================================================================== +--- gzip-1.3.13.orig/configure.ac 2010-03-15 13:15:37.457912205 +0800 ++++ gzip-1.3.13/configure.ac 2010-03-15 13:17:46.497912101 +0800 +@@ -27,8 +27,8 @@ + AC_CONFIG_SRCDIR(gzip.c) + AC_CONFIG_AUX_DIR(build-aux) + AC_CONFIG_HEADERS([lib/config.h:lib/config.hin]) +-AM_INIT_AUTOMAKE([1.11 dist-xz]) +-AM_SILENT_RULES([yes]) # make --enable-silent-rules the default. ++AM_INIT_AUTOMAKE([1.10]) ++m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + + AC_PROG_CC_STDC + AM_PROG_CC_C_O diff --git a/recipes/gzip/gzip-1.3.5/configure.patch b/recipes/gzip/gzip-1.3.5/configure.patch deleted file mode 100644 index 64e901a9a4..0000000000 --- a/recipes/gzip/gzip-1.3.5/configure.patch +++ /dev/null @@ -1,30 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- gzip-1.3.5/./configure.in~configure -+++ gzip-1.3.5/./configure.in -@@ -18,8 +18,8 @@ - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - # 02111-1307, USA. - --AC_PREREQ(2.54) --AC_INIT(gzip, 1.3.5, bug-gzip@gnu.org) -+AC_PREREQ(2.57) -+AC_INIT([gzip],[1.3.5],[bug-gzip@gnu.org]) - AC_CONFIG_SRCDIR(gzip.c) - AM_INIT_AUTOMAKE - -@@ -39,9 +39,8 @@ - - AC_CACHE_CHECK([for underline in external names], [gzip_cv_underline], - [gzip_cv_underline=yes -- AC_TRY_COMPILE([int foo() {return 0;}], [], -- [nm conftest.$OBJEXT | grep _foo >/dev/null 2>&1 || -- gzip_cv_underline=no])]) -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[int foo() {return 0;}]], [[]])],[nm conftest.$OBJEXT | grep _foo >/dev/null 2>&1 || -+ gzip_cv_underline=no],[])]) - if test $gzip_cv_underline = no; then - ASCPP="${ASCPP} -DNO_UNDERLINE" - fi diff --git a/recipes/gzip/gzip_1.3.5.bb b/recipes/gzip/gzip_1.3.13.bb index a0c49864b4..86c1abede6 100644 --- a/recipes/gzip/gzip_1.3.5.bb +++ b/recipes/gzip/gzip_1.3.13.bb @@ -6,8 +6,10 @@ to be a replacement for 'compress'. The GNU Project uses it as \ the standard compression program for its system." PR = "r1" -SRC_URI = "${DEBIAN_MIRROR}/main/g/gzip/gzip_${PV}.orig.tar.gz \ +SRC_URI = "${GNU_MIRROR}/gzip/gzip-${PV}.tar.gz;name=src \ file://configure.patch;patch=1" +SRC_URI[src.md5sum] = "c54a31b93e865f6a4410b2dc64662706" +SRC_URI[src.sha256sum] = "1d06ff9f5c523651bed3dcde6e6aa8118eee48b22534a157a2588705fa517ca3" S = "${WORKDIR}/gzip-${PV}" diff --git a/recipes/i2c-tools/i2c-tools_3.0.1.bb b/recipes/i2c-tools/i2c-tools_3.0.1.bb index c8ea32a5f1..7bbad35272 100644 --- a/recipes/i2c-tools/i2c-tools_3.0.1.bb +++ b/recipes/i2c-tools/i2c-tools_3.0.1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Set of i2c tools for linux" SECTION = "base" -LICENSE = "GPL" +LICENSE = "GPLv2" SRC_URI = "http://dl.lm-sensors.org/i2c-tools/releases/i2c-tools-${PV}.tar.bz2" diff --git a/recipes/i2c-tools/i2c-tools_3.0.2.bb b/recipes/i2c-tools/i2c-tools_3.0.2.bb index c44af1e3ba..e86763d857 100644 --- a/recipes/i2c-tools/i2c-tools_3.0.2.bb +++ b/recipes/i2c-tools/i2c-tools_3.0.2.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Set of i2c tools for linux" SECTION = "base" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" diff --git a/recipes/iproute2/iproute2.inc b/recipes/iproute2/iproute2.inc index 3b3d5b9b92..e755ce5abc 100644 --- a/recipes/iproute2/iproute2.inc +++ b/recipes/iproute2/iproute2.inc @@ -1,7 +1,7 @@ DESCRIPTION = "kernel routing and traffic control utilities" HOMEPAGE = "http://linux-net.osdl.org/index.php/Iproute2" SECTION = "base" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS = "flex-native bison-native" INC_PR = "r3" diff --git a/recipes/liba52/files/01-enable-pic.diff b/recipes/liba52/files/01-enable-pic.diff new file mode 100644 index 0000000000..ed1accd37a --- /dev/null +++ b/recipes/liba52/files/01-enable-pic.diff @@ -0,0 +1,23 @@ +Description: Disabling -prefer-non-pic which enables -fPIC +Bug-Debian: http://bugs.debian.org/401590 +Author: Daniel Baumann <daniel@debian.org>, Dmitrijs Ledkovs <dmitrij.ledkov@gmail.com> + + +--- + liba52/configure.incl | 3 --- + 1 files changed, 0 insertions(+), 3 deletions(-) + +Index: a52dec-deb/liba52/configure.incl +=================================================================== +--- a52dec-deb.orig/liba52/configure.incl 2009-12-05 02:52:12.000000000 +0000 ++++ a52dec-deb/liba52/configure.incl 2009-12-05 03:23:45.000000000 +0000 +@@ -1,9 +1,6 @@ + AC_SUBST([LIBA52_CFLAGS]) + AC_SUBST([LIBA52_LIBS]) + +-dnl avoid -fPIC when possible +-LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic" +- + AC_ARG_ENABLE([double], + [ --enable-double use double-precision samples]) + if test x"$enable_double" = x"yes"; then diff --git a/recipes/liba52/liba52_0.7.4.bb b/recipes/liba52/liba52_0.7.4.bb index 743fa30f83..ea87cbef4f 100644 --- a/recipes/liba52/liba52_0.7.4.bb +++ b/recipes/liba52/liba52_0.7.4.bb @@ -2,11 +2,12 @@ DESCRIPTION = "Library for reading some sort of media format." LICENSE = "GPL" SECTION = "libs" PRIORITY = "optional" -PR = "r1" +PR = "r2" inherit autotools -SRC_URI = "http://liba52.sourceforge.net/files/a52dec-${PV}.tar.gz" +SRC_URI = "http://liba52.sourceforge.net/files/a52dec-${PV}.tar.gz \ + file://01-enable-pic.diff;patch=1" S = "${WORKDIR}/a52dec-${PV}" EXTRA_OECONF = " --enable-shared " diff --git a/recipes/liboop/liboop_1.0.bb b/recipes/liboop/liboop_1.0.bb index 676ecbe700..b27fb5fd42 100644 --- a/recipes/liboop/liboop_1.0.bb +++ b/recipes/liboop/liboop_1.0.bb @@ -8,6 +8,9 @@ S = "${WORKDIR}/liboop-${PV}" inherit autotools pkgconfig +EXTRA_OECONF = "--without-tcl --without-glib \ + --without-readline --without-adns" + headers = "oop.h oop-adns.h oop-glib.h \ oop-tcl.h oop-www.h oop-rl.h \ oop-read.h" diff --git a/recipes/libtiff/tiff_3.8.2.bb b/recipes/libtiff/tiff_3.9.2.bb index 00edb40eb3..5f022e0b1d 100644 --- a/recipes/libtiff/tiff_3.8.2.bb +++ b/recipes/libtiff/tiff_3.9.2.bb @@ -2,12 +2,23 @@ DESCRIPTION = "This software provides support for the Tag Image File Format (TIF LICENSE = "${PN}" HOMEPAGE = "http://www.remotesensing.org/libtiff/" DEPENDS = "zlib jpeg lzo" -PV = "3.8.2+4.0.0beta2" +PV = "3.9.2+4.0.0beta5" -SRC_URI = "ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.0beta2.tar.gz" -S = "${WORKDIR}/${PN}-4.0.0beta2" +PR = "r1" -inherit autotools_stage +SRC_URI = "ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.0beta5.tar.gz;name=tiff400beta5targz" +SRC_URI[tiff400beta5targz.md5sum] = "a0a83604e38a299fae9f0b1a39c04870" +SRC_URI[tiff400beta5targz.sha256sum] = "64b61567782643a841e33a8d031d0d6a9b3e436108829e2e947183f8dcdc6ec7" + +S = "${WORKDIR}/${PN}-4.0.0beta5" + +inherit autotools + +# requires a too recent, non-default autoconf +do_configure() { + gnu-configize + oe_runconf +} PACKAGES =+ "tiffxx tiffxx-dbg tiffxx-dev tiff-utils tiff-utils-dbg" FILES_tiffxx = "${libdir}/libtiffxx.so.*" diff --git a/recipes/libungif/libungif_4.1.3.bb b/recipes/libungif/libungif_4.1.3.bb index caf0427551..db16ff931d 100644 --- a/recipes/libungif/libungif_4.1.3.bb +++ b/recipes/libungif/libungif_4.1.3.bb @@ -2,7 +2,7 @@ SECTION = "libs" DESCRIPTION = "shared library for GIF images" SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/libungif-${PV}.tar.bz2" LICENSE = "MIT" -PR = "r1" +PR = "r2" PACKAGES += "${PN}-utils" diff --git a/recipes/libusb/libusb-compat_0.1.2.bb b/recipes/libusb/libusb-compat_0.1.2.bb index 8ce111f2d8..6de1d482ff 100644 --- a/recipes/libusb/libusb-compat_0.1.2.bb +++ b/recipes/libusb/libusb-compat_0.1.2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "libusb-0 compatibility library using libusb-1" HOMEPAGE = "http://libusb.sf.net" SECTION = "libs" -LICENSE = "LGPL" +LICENSE = "LGPLv2.1" PROVIDES = "virtual/libusb0" PE = "1" PR = "r0" diff --git a/recipes/libusb/libusb-compat_0.1.3.bb b/recipes/libusb/libusb-compat_0.1.3.bb index 25aaa0597e..85a5561685 100644 --- a/recipes/libusb/libusb-compat_0.1.3.bb +++ b/recipes/libusb/libusb-compat_0.1.3.bb @@ -1,7 +1,7 @@ DESCRIPTION = "libusb-0 compatibility library using libusb-1" HOMEPAGE = "http://libusb.sf.net" SECTION = "libs" -LICENSE = "LGPL" +LICENSE = "LGPLv2.1" PROVIDES = "virtual/libusb0" PE = "1" PR = "r0" diff --git a/recipes/libusb/libusb1_1.0.2.bb b/recipes/libusb/libusb1_1.0.2.bb index 145e4cbe97..2b1360192c 100644 --- a/recipes/libusb/libusb1_1.0.2.bb +++ b/recipes/libusb/libusb1_1.0.2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "library to provide userspace access to USB devices" HOMEPAGE = "http://libusb.sf.net" SECTION = "libs" -LICENSE = "LGPL" +LICENSE = "LGPLv2.1" SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2" S = "${WORKDIR}/libusb-${PV}" diff --git a/recipes/libusb/libusb1_1.0.4.bb b/recipes/libusb/libusb1_1.0.4.bb index 1e56006ef1..5221f6e7f1 100644 --- a/recipes/libusb/libusb1_1.0.4.bb +++ b/recipes/libusb/libusb1_1.0.4.bb @@ -1,7 +1,7 @@ DESCRIPTION = "library to provide userspace access to USB devices" HOMEPAGE = "http://libusb.sf.net" SECTION = "libs" -LICENSE = "LGPL" +LICENSE = "LGPLv2.1" PR = "r1" diff --git a/recipes/libusb/libusb_0.1.12.bb b/recipes/libusb/libusb_0.1.12.bb index ccf4a5850e..3b5ac65a55 100644 --- a/recipes/libusb/libusb_0.1.12.bb +++ b/recipes/libusb/libusb_0.1.12.bb @@ -1,9 +1,9 @@ DESCRIPTION = "libusb is a library to provide userspace access to USB devices." HOMEPAGE = "http://libusb.sf.net" SECTION = "libs" -LICENSE = "LGPL" +LICENSE = "LGPLv2.1" PROVIDES = "virtual/libusb0" -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.gz \ file://configure_fix.patch;patch=1" diff --git a/recipes/libvorbis/libvorbis-1.2.3/patch-lib_backends.h b/recipes/libvorbis/libvorbis-1.2.3/patch-lib_backends.h new file mode 100644 index 0000000000..44da9d3107 --- /dev/null +++ b/recipes/libvorbis/libvorbis-1.2.3/patch-lib_backends.h @@ -0,0 +1,11 @@ +$FreeBSD: ports/audio/libvorbis/files/patch-lib_backends.h,v 1.1 2009/11/24 21:32:39 naddy Exp $ +--- lib/backends.h.orig 2009-11-24 21:46:47.000000000 +0100 ++++ lib/backends.h 2009-11-24 21:46:47.000000000 +0100 +@@ -109,6 +109,7 @@ typedef struct vorbis_info_residue0{ + /* first stage (lossless partitioning) */ + int grouping; /* group n vectors per partition */ + int partitions; /* possible codebooks for a partition */ ++ int partvals; /* partitions ^ groupbook dim */ + int groupbook; /* huffbook for partitioning */ + int secondstages[64]; /* expanded out to pointers in lookup */ + int booklist[512]; /* list of second stage books */ diff --git a/recipes/libvorbis/libvorbis-1.2.3/patch-lib_codebook.c b/recipes/libvorbis/libvorbis-1.2.3/patch-lib_codebook.c new file mode 100644 index 0000000000..ed76a9edea --- /dev/null +++ b/recipes/libvorbis/libvorbis-1.2.3/patch-lib_codebook.c @@ -0,0 +1,11 @@ +$FreeBSD: ports/audio/libvorbis/files/patch-lib_codebook.c,v 1.3 2009/11/24 21:32:39 naddy Exp $ +--- lib/codebook.c.orig 2009-07-09 11:12:08.000000000 +0200 ++++ lib/codebook.c 2009-11-24 21:46:47.000000000 +0100 +@@ -198,6 +198,7 @@ int vorbis_staticbook_unpack(oggpack_buf + for(i=0;i<s->entries;){ + long num=oggpack_read(opb,_ilog(s->entries-i)); + if(num==-1)goto _eofout; ++ if(length>32)goto _errout; + for(j=0;j<num && i<s->entries;j++,i++) + s->lengthlist[i]=length; + length++; diff --git a/recipes/libvorbis/libvorbis-1.2.3/patch-lib_modes_residue_44.h b/recipes/libvorbis/libvorbis-1.2.3/patch-lib_modes_residue_44.h new file mode 100644 index 0000000000..13bc016feb --- /dev/null +++ b/recipes/libvorbis/libvorbis-1.2.3/patch-lib_modes_residue_44.h @@ -0,0 +1,30 @@ +$FreeBSD: ports/audio/libvorbis/files/patch-lib_modes_residue_44.h,v 1.1 2009/11/24 21:32:39 naddy Exp $ +--- lib/modes/residue_44.h.orig 2009-07-09 11:12:08.000000000 +0200 ++++ lib/modes/residue_44.h 2009-11-24 21:46:47.000000000 +0100 +@@ -22,7 +22,7 @@ + /***** residue backends *********************************************/ + + static const vorbis_info_residue0 _residue_44_low={ +- 0,-1, -1, 9,-1, ++ 0,-1, -1, 9,-1,-1, + /* 0 1 2 3 4 5 6 7 */ + {0}, + {-1}, +@@ -31,7 +31,7 @@ static const vorbis_info_residue0 _resid + }; + + static const vorbis_info_residue0 _residue_44_mid={ +- 0,-1, -1, 10,-1, ++ 0,-1, -1, 10,-1,-1, + /* 0 1 2 3 4 5 6 7 8 */ + {0}, + {-1}, +@@ -40,7 +40,7 @@ static const vorbis_info_residue0 _resid + }; + + static const vorbis_info_residue0 _residue_44_high={ +- 0,-1, -1, 10,-1, ++ 0,-1, -1, 10,-1,-1, + /* 0 1 2 3 4 5 6 7 8 */ + {0}, + {-1}, diff --git a/recipes/libvorbis/libvorbis-1.2.3/patch-lib_modes_residue_44u.h b/recipes/libvorbis/libvorbis-1.2.3/patch-lib_modes_residue_44u.h new file mode 100644 index 0000000000..4c0cb74ae1 --- /dev/null +++ b/recipes/libvorbis/libvorbis-1.2.3/patch-lib_modes_residue_44u.h @@ -0,0 +1,30 @@ +$FreeBSD: ports/audio/libvorbis/files/patch-lib_modes_residue_44u.h,v 1.1 2009/11/24 21:32:39 naddy Exp $ +--- lib/modes/residue_44u.h.orig 2009-07-08 07:40:12.000000000 +0200 ++++ lib/modes/residue_44u.h 2009-11-24 21:46:47.000000000 +0100 +@@ -23,7 +23,7 @@ + + + static const vorbis_info_residue0 _residue_44_low_un={ +- 0,-1, -1, 8,-1, ++ 0,-1, -1, 8,-1,-1, + {0}, + {-1}, + { .5, 1.5, 1.5, 2.5, 2.5, 4.5, 28.5}, +@@ -31,7 +31,7 @@ static const vorbis_info_residue0 _resid + }; + + static const vorbis_info_residue0 _residue_44_mid_un={ +- 0,-1, -1, 10,-1, ++ 0,-1, -1, 10,-1,-1, + /* 0 1 2 3 4 5 6 7 8 9 */ + {0}, + {-1}, +@@ -40,7 +40,7 @@ static const vorbis_info_residue0 _resid + }; + + static const vorbis_info_residue0 _residue_44_hi_un={ +- 0,-1, -1, 10,-1, ++ 0,-1, -1, 10,-1,-1, + /* 0 1 2 3 4 5 6 7 8 9 */ + {0}, + {-1}, diff --git a/recipes/libvorbis/libvorbis-1.2.3/patch-lib_res0.c b/recipes/libvorbis/libvorbis-1.2.3/patch-lib_res0.c new file mode 100644 index 0000000000..910311b271 --- /dev/null +++ b/recipes/libvorbis/libvorbis-1.2.3/patch-lib_res0.c @@ -0,0 +1,40 @@ +$FreeBSD: ports/audio/libvorbis/files/patch-lib_res0.c,v 1.3 2009/11/24 21:32:39 naddy Exp $ +--- lib/res0.c.orig 2009-11-24 21:51:43.000000000 +0100 ++++ lib/res0.c 2009-11-24 21:52:01.000000000 +0100 +@@ -238,6 +238,10 @@ vorbis_info_residue *res0_unpack(vorbis_ + + /* verify the phrasebook is not specifying an impossible or + inconsistent partitioning scheme. */ ++ /* modify the phrasebook ranging check from r16327; an early beta ++ encoder had a bug where it used an oversized phrasebook by ++ accident. These files should continue to be playable, but don't ++ allow an exploit */ + { + int entries = ci->book_param[info->groupbook]->entries; + int dim = ci->book_param[info->groupbook]->dim; +@@ -247,6 +251,7 @@ vorbis_info_residue *res0_unpack(vorbis_ + if(partvals > entries) goto errout; + dim--; + } ++ info->partvals = partvals; + } + + return(info); +@@ -667,7 +672,7 @@ static int _01inverse(vorbis_block *vb,v + for(j=0;j<ch;j++){ + int temp=vorbis_book_decode(look->phrasebook,&vb->opb); + +- if(temp==-1)goto eopbreak; ++ if(temp==-1 || temp>=info->partvals)goto eopbreak; + partword[j][l]=look->decodemap[temp]; + if(partword[j][l]==NULL)goto errout; + } +@@ -883,7 +888,7 @@ int res2_inverse(vorbis_block *vb,vorbis + if(s==0){ + /* fetch the partition word */ + int temp=vorbis_book_decode(look->phrasebook,&vb->opb); +- if(temp==-1)goto eopbreak; ++ if(temp==-1 || temp>info->partvals)goto eopbreak; + partword[l]=look->decodemap[temp]; + if(partword[l]==NULL)goto errout; + } diff --git a/recipes/libvorbis/libvorbis_1.2.3.bb b/recipes/libvorbis/libvorbis_1.2.3.bb index 1173809d48..87d4d3cab3 100644 --- a/recipes/libvorbis/libvorbis_1.2.3.bb +++ b/recipes/libvorbis/libvorbis_1.2.3.bb @@ -1,10 +1,15 @@ require libvorbis.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI = "http://downloads.xiph.org/releases/vorbis/libvorbis-${PV}.tar.gz \ file://configure_powerpc-no-fixed-cpu.patch;patch=1 \ + file://patch-lib_backends.h;patch=1;pnum=0 \ + file://patch-lib_codebook.c;patch=1;pnum=0 \ + file://patch-lib_modes_residue_44.h;patch=1;pnum=0 \ + file://patch-lib_modes_residue_44u.h;patch=1;pnum=0 \ + file://patch-lib_res0.c;patch=1;pnum=0 \ " # override should be handeld by pkgconfig now diff --git a/recipes/libwmf/files/libwmf-0.2.8.4-intoverflow.patch b/recipes/libwmf/files/libwmf-0.2.8.4-intoverflow.patch new file mode 100644 index 0000000000..50d915c010 --- /dev/null +++ b/recipes/libwmf/files/libwmf-0.2.8.4-intoverflow.patch @@ -0,0 +1,31 @@ +http://cvs.fedoraproject.org/viewvc/devel/libwmf/libwmf-0.2.8.4-intoverflow.patch?view=log + +CVE-2006-3376 libwmf integer overflow + +--- libwmf-0.2.8.4.orig/src/player.c 2002-12-10 19:30:26.000000000 +0000 ++++ libwmf-0.2.8.4/src/player.c 2006-07-12 15:12:52.000000000 +0100 +@@ -42,6 +42,7 @@ + #include "player/defaults.h" /* Provides: default settings */ + #include "player/record.h" /* Provides: parameter mechanism */ + #include "player/meta.h" /* Provides: record interpreters */ ++#include <stdint.h> + + /** + * @internal +@@ -132,8 +134,14 @@ + } + } + +-/* P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)-3) * 2 * sizeof (unsigned char)); +- */ P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API) ) * 2 * sizeof (unsigned char)); ++ if (MAX_REC_SIZE(API) > UINT32_MAX / 2) ++ { ++ API->err = wmf_E_InsMem; ++ WMF_DEBUG (API,"bailing..."); ++ return (API->err); ++ } ++ ++ P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API) ) * 2 * sizeof (unsigned char)); + + if (ERR (API)) + { WMF_DEBUG (API,"bailing..."); diff --git a/recipes/libwmf/files/libwmf-0.2.8.4-useafterfree.patch b/recipes/libwmf/files/libwmf-0.2.8.4-useafterfree.patch new file mode 100644 index 0000000000..4d2d285641 --- /dev/null +++ b/recipes/libwmf/files/libwmf-0.2.8.4-useafterfree.patch @@ -0,0 +1,14 @@ + +http://cvs.fedoraproject.org/viewvc/devel/libwmf/libwmf-0.2.8.4-useafterfree.patch?view=log +Resolves: CVE-2009-1364 + +--- libwmf-0.2.8.4/src/extra/gd/gd_clip.c.CVE-2009-1364-im-clip-list 2009-04-24 04:06:44.000000000 -0400 ++++ libwmf-0.2.8.4/src/extra/gd/gd_clip.c 2009-04-24 04:08:30.000000000 -0400 +@@ -70,6 +70,7 @@ void gdClipSetAdd(gdImagePtr im,gdClipRe + { more = gdRealloc (im->clip->list,(im->clip->max + 8) * sizeof (gdClipRectangle)); + if (more == 0) return; + im->clip->max += 8; ++ im->clip->list = more; + } + im->clip->list[im->clip->count] = (*rect); + im->clip->count++; diff --git a/recipes/libwmf/libwmf-native_0.2.8.4.bb b/recipes/libwmf/libwmf-native_0.2.8.4.bb index a33461fcdb..4b7c2259b6 100644 --- a/recipes/libwmf/libwmf-native_0.2.8.4.bb +++ b/recipes/libwmf/libwmf-native_0.2.8.4.bb @@ -1,4 +1,6 @@ require libwmf_0.2.8.4.bb inherit native -SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/libwmf/${PV}/libwmf-${PV}.tar.gz;name=tarball" +SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/${PN}/${PV}/libwmf-${PV}.tar.gz;name=tarball \ + file://libwmf-0.2.8.4-intoverflow.patch;patch=1 \ + file://libwmf-0.2.8.4-useafterfree.patch;patch=1" diff --git a/recipes/libwmf/libwmf_0.2.8.4.bb b/recipes/libwmf/libwmf_0.2.8.4.bb index fc02940eb3..37e69e3a2b 100644 --- a/recipes/libwmf/libwmf_0.2.8.4.bb +++ b/recipes/libwmf/libwmf_0.2.8.4.bb @@ -1,6 +1,8 @@ inherit autotools_stage -SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/${PN}/${PV}/${P}.tar.gz;name=tarball" +SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/${PN}/${PV}/${P}.tar.gz;name=tarball \ + file://libwmf-0.2.8.4-intoverflow.patch;patch=1 \ + file://libwmf-0.2.8.4-useafterfree.patch;patch=1" SRC_URI[tarball.md5sum] = "d1177739bf1ceb07f57421f0cee191e0" SRC_URI[tarball.sha256sum] = "5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8" @@ -10,3 +12,4 @@ LICENSE = "GPL-2" SECTION = "libs" +PR="r1" diff --git a/recipes/linux/LAB-kernel_2.6.13-hh2.bb b/recipes/linux/LAB-kernel_2.6.13-hh2.bb index f03a7db402..8340043f82 100644 --- a/recipes/linux/LAB-kernel_2.6.13-hh2.bb +++ b/recipes/linux/LAB-kernel_2.6.13-hh2.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Liux As Bootloader kernelm" -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_HOST = "arm.*-linux" COMPATIBLE_MACHINE = "h2200" diff --git a/recipes/linux/LAB-kernel_cvs.bb b/recipes/linux/LAB-kernel_cvs.bb index 0daa4742f3..2ee43c7ac8 100644 --- a/recipes/linux/LAB-kernel_cvs.bb +++ b/recipes/linux/LAB-kernel_cvs.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Liux As Bootloader kernelm" -LICENSE = "GPL" +LICENSE = "GPLv2" PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}" #!BIG FAT WARNING: diff --git a/recipes/linux/c7x0-kernels-2.4-embedix.bb b/recipes/linux/c7x0-kernels-2.4-embedix.bb index 60b7a5cafb..95bdfbce61 100644 --- a/recipes/linux/c7x0-kernels-2.4-embedix.bb +++ b/recipes/linux/c7x0-kernels-2.4-embedix.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Build all c7x0 kernels in one go" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PROVIDES = "virtual/kernel" PR = "r1" diff --git a/recipes/linux/chumby-kernel_2.6.16-chumby-1.2.bb b/recipes/linux/chumby-kernel_2.6.16-chumby-1.2.bb index 4967c1ec35..91d32c98f6 100644 --- a/recipes/linux/chumby-kernel_2.6.16-chumby-1.2.bb +++ b/recipes/linux/chumby-kernel_2.6.16-chumby-1.2.bb @@ -2,7 +2,7 @@ require linux.inc SECTION = "kernel" DESCRIPTION = "Linux kernel for the Chumby" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r4" SRC_URI = "http://files.chumby.com/source/ironforge/build396/linux-2.6.16-chumby-1.2.tar.gz \ diff --git a/recipes/linux/collie-kernels-2.4-embedix.bb b/recipes/linux/collie-kernels-2.4-embedix.bb index 1445e41151..d5f9a7d749 100644 --- a/recipes/linux/collie-kernels-2.4-embedix.bb +++ b/recipes/linux/collie-kernels-2.4-embedix.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Build all collie kernels in one go" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PROVIDES = "virtual/kernel" PR = "r2" diff --git a/recipes/linux/compulab-pxa270_2.6.16.bb b/recipes/linux/compulab-pxa270_2.6.16.bb index 6dc92f69b6..71b7c8f009 100644 --- a/recipes/linux/compulab-pxa270_2.6.16.bb +++ b/recipes/linux/compulab-pxa270_2.6.16.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the Compulab PXA270 system" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r6" do_unpack[depends] += "unzip-native:do_populate_staging" diff --git a/recipes/linux/devkitidp-pxa255_2.6.19.bb b/recipes/linux/devkitidp-pxa255_2.6.19.bb index f9eb6a7777..6f098d9ff3 100644 --- a/recipes/linux/devkitidp-pxa255_2.6.19.bb +++ b/recipes/linux/devkitidp-pxa255_2.6.19.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the BSQUARE PXA255 DevKitIDP" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r4" DEPENDS = "u-boot" diff --git a/recipes/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb b/recipes/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb index b233dd7870..d3a079da36 100644 --- a/recipes/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb +++ b/recipes/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for Cirrus Logic ep39xx compatible machines" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" COMPATIBLE_MACHINE = "ep93xx" diff --git a/recipes/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb b/recipes/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb index 9aab5d8bed..9bd3a4ad92 100644 --- a/recipes/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb +++ b/recipes/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for Cirrus Logic ep39xx compatible machines" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" COMPATIBLE_MACHINE = "ep93xx" diff --git a/recipes/linux/gumstix-linux.inc b/recipes/linux/gumstix-linux.inc index 030abf2c88..0b80cc86fe 100644 --- a/recipes/linux/gumstix-linux.inc +++ b/recipes/linux/gumstix-linux.inc @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for custom configurations" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" inherit kernel diff --git a/recipes/linux/gumstix_2.6.5-gnalm1-gum0.bb b/recipes/linux/gumstix_2.6.5-gnalm1-gum0.bb index 9af2696d66..2bab58ec43 100644 --- a/recipes/linux/gumstix_2.6.5-gnalm1-gum0.bb +++ b/recipes/linux/gumstix_2.6.5-gnalm1-gum0.bb @@ -3,7 +3,7 @@ BROKEN = "1" SECTION = "kernel" DESCRIPTION = "Linux kernel for OMAP processors" -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_MACHINE = "gumstix" diff --git a/recipes/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb b/recipes/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb index 21e3c18534..0b76adba52 100644 --- a/recipes/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb +++ b/recipes/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices." -LICENSE = "GPL" +LICENSE = "GPLv2" #PR = "r1" diff --git a/recipes/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh42.bb b/recipes/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh42.bb index adca8740de..65fdbda6da 100644 --- a/recipes/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh42.bb +++ b/recipes/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh42.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices." -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/linux/ipod_2.4.24-ipod0.bb b/recipes/linux/ipod_2.4.24-ipod0.bb index b0fe9886e5..2704d1da38 100644 --- a/recipes/linux/ipod_2.4.24-ipod0.bb +++ b/recipes/linux/ipod_2.4.24-ipod0.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for Ipods" -LICENSE = "GPL" +LICENSE = "GPLv2" KV = "2.4.24" PV = "${KV}-ipod0" diff --git a/recipes/linux/ixp4xx-kernel.inc b/recipes/linux/ixp4xx-kernel.inc index 910819e666..10779c52c7 100644 --- a/recipes/linux/ixp4xx-kernel.inc +++ b/recipes/linux/ixp4xx-kernel.inc @@ -24,7 +24,7 @@ # SECTION = "kernel" DESCRIPTION = "Linux kernel for the Intel IXP4xx device" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS = "arm-kernel-shim devio-native" diff --git a/recipes/linux/linux-2.6.33/p2020ds/defconfig b/recipes/linux/linux-2.6.33/p2020ds/defconfig new file mode 100644 index 0000000000..7d98bc60d2 --- /dev/null +++ b/recipes/linux/linux-2.6.33/p2020ds/defconfig @@ -0,0 +1,1986 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.33-rc3 +# Wed Jan 6 09:24:07 2010 +# +# CONFIG_PPC64 is not set + +# +# Processor support +# +# CONFIG_PPC_BOOK3S_32 is not set +CONFIG_PPC_85xx=y +# CONFIG_PPC_8xx is not set +# CONFIG_40x is not set +# CONFIG_44x is not set +# CONFIG_E200 is not set +CONFIG_E500=y +# CONFIG_PPC_E500MC is not set +CONFIG_FSL_EMB_PERFMON=y +CONFIG_BOOKE=y +CONFIG_FSL_BOOKE=y +# CONFIG_PHYS_64BIT is not set +CONFIG_SPE=y +CONFIG_PPC_MMU_NOHASH=y +CONFIG_PPC_MMU_NOHASH_32=y +CONFIG_PPC_BOOK3E_MMU=y +# CONFIG_PPC_MM_SLICES is not set +CONFIG_SMP=y +CONFIG_NR_CPUS=8 +CONFIG_PPC32=y +CONFIG_WORD_SIZE=32 +# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set +CONFIG_MMU=y +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_TIME_VSYSCALL=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set +# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set +CONFIG_IRQ_PER_CPU=y +CONFIG_NR_IRQS=512 +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_ARCH_HAS_ILOG2_U32=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_FIND_NEXT_BIT=y +CONFIG_GENERIC_GPIO=y +# CONFIG_ARCH_NO_VIRT_TO_BUS is not set +CONFIG_PPC=y +CONFIG_EARLY_PRINTK=y +CONFIG_GENERIC_NVRAM=y +CONFIG_SCHED_OMIT_FRAME_POINTER=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_PPC_OF=y +CONFIG_OF=y +CONFIG_PPC_UDBG_16550=y +CONFIG_GENERIC_TBSYNC=y +CONFIG_AUDIT_ARCH=y +CONFIG_GENERIC_BUG=y +CONFIG_DTC=y +CONFIG_DEFAULT_UIMAGE=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +# CONFIG_PPC_DCR_NATIVE is not set +# CONFIG_PPC_DCR_MMIO is not set +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_CONSTRUCTORS=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +# CONFIG_TASKSTATS is not set +CONFIG_AUDIT=y +# CONFIG_AUDITSYSCALL is not set + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +# CONFIG_TREE_PREEMPT_RCU is not set +# CONFIG_TINY_RCU is not set +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=32 +# CONFIG_RCU_FANOUT_EXACT is not set +# CONFIG_TREE_RCU_TRACE is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_GROUP_SCHED=y +# CONFIG_FAIR_GROUP_SCHED is not set +# CONFIG_RT_GROUP_SCHED is not set +CONFIG_USER_SCHED=y +# CONFIG_CGROUP_SCHED is not set +# CONFIG_CGROUPS is not set +CONFIG_SYSFS_DEPRECATED=y +CONFIG_SYSFS_DEPRECATED_V2=y +# CONFIG_RELAY is not set +# CONFIG_NAMESPACES is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +CONFIG_EMBEDDED=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +CONFIG_KALLSYMS_ALL=y +CONFIG_KALLSYMS_EXTRA_PASS=y +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_HAVE_PERF_EVENTS=y + +# +# Kernel Performance Events And Counters +# +# CONFIG_PERF_EVENTS is not set +# CONFIG_PERF_COUNTERS is not set +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_PCI_QUIRKS=y +CONFIG_SLUB_DEBUG=y +CONFIG_COMPAT_BRK=y +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLOB is not set +# CONFIG_PROFILING is not set +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_USE_GENERIC_SMP_HELPERS=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_DMA_API_DEBUG=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +# CONFIG_SLOW_WORK is not set +# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_STOP_MACHINE=y +CONFIG_BLOCK=y +CONFIG_LBDAF=y +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_BLK_DEV_INTEGRITY is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +# CONFIG_INLINE_SPIN_TRYLOCK is not set +# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK is not set +# CONFIG_INLINE_SPIN_LOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK_IRQ is not set +# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +CONFIG_INLINE_SPIN_UNLOCK=y +# CONFIG_INLINE_SPIN_UNLOCK_BH is not set +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y +# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_READ_TRYLOCK is not set +# CONFIG_INLINE_READ_LOCK is not set +# CONFIG_INLINE_READ_LOCK_BH is not set +# CONFIG_INLINE_READ_LOCK_IRQ is not set +# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set +CONFIG_INLINE_READ_UNLOCK=y +# CONFIG_INLINE_READ_UNLOCK_BH is not set +CONFIG_INLINE_READ_UNLOCK_IRQ=y +# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_WRITE_TRYLOCK is not set +# CONFIG_INLINE_WRITE_LOCK is not set +# CONFIG_INLINE_WRITE_LOCK_BH is not set +# CONFIG_INLINE_WRITE_LOCK_IRQ is not set +# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set +CONFIG_INLINE_WRITE_UNLOCK=y +# CONFIG_INLINE_WRITE_UNLOCK_BH is not set +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set +CONFIG_MUTEX_SPIN_ON_OWNER=y +# CONFIG_FREEZER is not set +CONFIG_PPC_MSI_BITMAP=y + +# +# Platform support +# +# CONFIG_PPC_CELL is not set +# CONFIG_PPC_CELL_NATIVE is not set +# CONFIG_PQ2ADS is not set +CONFIG_FSL_SOC_BOOKE=y +CONFIG_MPC8540_ADS=y +CONFIG_MPC8560_ADS=y +CONFIG_MPC85xx_CDS=y +CONFIG_MPC85xx_MDS=y +CONFIG_MPC8536_DS=y +CONFIG_MPC85xx_DS=y +CONFIG_MPC85xx_RDB=y +CONFIG_SOCRATES=y +CONFIG_KSI8560=y +CONFIG_XES_MPC85xx=y +CONFIG_STX_GP3=y +CONFIG_TQM8540=y +CONFIG_TQM8541=y +CONFIG_TQM8548=y +CONFIG_TQM8555=y +CONFIG_TQM8560=y +CONFIG_SBC8548=y +# CONFIG_SBC8560 is not set +# CONFIG_P4080_DS is not set +CONFIG_TQM85xx=y +# CONFIG_IPIC is not set +CONFIG_MPIC=y +# CONFIG_MPIC_WEIRD is not set +CONFIG_PPC_I8259=y +# CONFIG_PPC_RTAS is not set +# CONFIG_MMIO_NVRAM is not set +# CONFIG_PPC_MPC106 is not set +# CONFIG_PPC_970_NAP is not set +# CONFIG_PPC_INDIRECT_IO is not set +# CONFIG_GENERIC_IOMAP is not set +# CONFIG_CPU_FREQ is not set +CONFIG_QUICC_ENGINE=y +CONFIG_QE_GPIO=y +CONFIG_CPM2=y +CONFIG_FSL_ULI1575=y +CONFIG_CPM=y +CONFIG_MPC8xxx_GPIO=y +# CONFIG_SIMPLE_GPIO is not set + +# +# Kernel options +# +CONFIG_HIGHMEM=y +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +# CONFIG_HZ_100 is not set +CONFIG_HZ_250=y +# CONFIG_HZ_300 is not set +# CONFIG_HZ_1000 is not set +CONFIG_HZ=250 +CONFIG_SCHED_HRTICK=y +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT is not set +CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +# CONFIG_HAVE_AOUT is not set +CONFIG_BINFMT_MISC=m +CONFIG_MATH_EMULATION=y +CONFIG_IOMMU_HELPER=y +CONFIG_SWIOTLB=y +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_ARCH_HAS_WALK_MEMORY=y +CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y +# CONFIG_IRQ_ALL_CPUS is not set +CONFIG_SPARSE_IRQ=y +CONFIG_MAX_ACTIVE_REGIONS=32 +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_ARCH_POPULATES_NODE_MAP=y +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_MIGRATION=y +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +# CONFIG_KSM is not set +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_PPC_4K_PAGES=y +# CONFIG_PPC_16K_PAGES is not set +# CONFIG_PPC_64K_PAGES is not set +# CONFIG_PPC_256K_PAGES is not set +CONFIG_FORCE_MAX_ZONEORDER=11 +CONFIG_PROC_DEVICETREE=y +# CONFIG_CMDLINE_BOOL is not set +CONFIG_EXTRA_TARGETS="" +# CONFIG_PM is not set +CONFIG_SECCOMP=y +CONFIG_ISA_DMA_API=y + +# +# Bus options +# +CONFIG_ZONE_DMA=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_PPC_INDIRECT_PCI=y +CONFIG_FSL_SOC=y +CONFIG_FSL_PCI=y +CONFIG_PPC_PCI_CHOICE=y +CONFIG_PCI=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCI_SYSCALL=y +# CONFIG_PCIEPORTBUS is not set +CONFIG_ARCH_SUPPORTS_MSI=y +CONFIG_PCI_MSI=y +# CONFIG_PCI_LEGACY is not set +# CONFIG_PCI_DEBUG is not set +# CONFIG_PCI_STUB is not set +# CONFIG_PCI_IOV is not set +# CONFIG_PCCARD is not set +# CONFIG_HOTPLUG_PCI is not set +CONFIG_HAS_RAPIDIO=y +CONFIG_RAPIDIO=y +CONFIG_RAPIDIO_DISC_TIMEOUT=30 + +# +# Advanced setup +# +# CONFIG_ADVANCED_OPTIONS is not set + +# +# Default settings for advanced configuration options are used +# +CONFIG_LOWMEM_SIZE=0x30000000 +CONFIG_LOWMEM_CAM_NUM=3 +CONFIG_PAGE_OFFSET=0xc0000000 +CONFIG_KERNEL_START=0xc0000000 +CONFIG_PHYSICAL_START=0x00000000 +CONFIG_PHYSICAL_ALIGN=0x04000000 +CONFIG_TASK_SIZE=0xc0000000 +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +CONFIG_XFRM=y +CONFIG_XFRM_USER=y +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +CONFIG_NET_KEY=y +# CONFIG_NET_KEY_MIGRATE is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_ASK_IP_FIB_HASH=y +# CONFIG_IP_FIB_TRIE is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y +CONFIG_NET_IPIP=y +CONFIG_NET_IPGRE=y +CONFIG_NET_IPGRE_BROADCAST=y +CONFIG_IP_MROUTE=y +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +CONFIG_ARPD=y +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +CONFIG_INET_ESP=y +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +CONFIG_INET_TUNNEL=y +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_LRO is not set +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +CONFIG_IPV6=y +# CONFIG_IPV6_PRIVACY is not set +# CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +# CONFIG_INET6_AH is not set +# CONFIG_INET6_ESP is not set +# CONFIG_INET6_IPCOMP is not set +# CONFIG_IPV6_MIP6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +CONFIG_INET6_XFRM_MODE_TRANSPORT=y +CONFIG_INET6_XFRM_MODE_TUNNEL=y +CONFIG_INET6_XFRM_MODE_BEET=y +# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +CONFIG_IPV6_SIT=y +# CONFIG_IPV6_SIT_6RD is not set +CONFIG_IPV6_NDISC_NODETYPE=y +# CONFIG_IPV6_TUNNEL is not set +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_IPV6_MROUTE is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set +# CONFIG_IP_DCCP is not set +CONFIG_IP_SCTP=m +# CONFIG_SCTP_DBG_MSG is not set +# CONFIG_SCTP_DBG_OBJCNT is not set +# CONFIG_SCTP_HMAC_NONE is not set +# CONFIG_SCTP_HMAC_SHA1 is not set +CONFIG_SCTP_HMAC_MD5=y +# CONFIG_RDS is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_NET_DSA is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_PHONET is not set +# CONFIG_IEEE802154 is not set +# CONFIG_NET_SCHED is not set +# CONFIG_DCB is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +# CONFIG_CFG80211 is not set +# CONFIG_LIB80211 is not set + +# +# CFG80211 needs to be enabled for MAC80211 +# +# CONFIG_WIMAX is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +# CONFIG_DEVTMPFS is not set +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_CONNECTOR is not set +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_TESTS is not set +CONFIG_MTD_CONCAT=y +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_CMDLINE_PARTS is not set +CONFIG_MTD_OF_PARTS=y +# CONFIG_MTD_AR7_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +# CONFIG_MTD_OOPS is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +CONFIG_MTD_JEDECPROBE=y +CONFIG_MTD_GEN_PROBE=y +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=y +CONFIG_MTD_CFI_AMDSTD=y +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=y +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set +CONFIG_MTD_PHYSMAP_OF=y +# CONFIG_MTD_INTEL_VR_NOR is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_PMC551 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_NAND=y +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_CAFE is not set +# CONFIG_MTD_NAND_NANDSIM is not set +# CONFIG_MTD_NAND_PLATFORM is not set +# CONFIG_MTD_ALAUDA is not set +CONFIG_MTD_NAND_FSL_ELBC=y +# CONFIG_MTD_NAND_FSL_UPM is not set +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +# CONFIG_MTD_LPDDR is not set + +# +# UBI - Unsorted block images +# +# CONFIG_MTD_UBI is not set +CONFIG_OF_DEVICE=y +CONFIG_OF_GPIO=y +CONFIG_OF_I2C=y +CONFIG_OF_MDIO=y +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_FD is not set +# CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_CPQ_CISS_DA is not set +# CONFIG_BLK_DEV_DAC960 is not set +# CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set + +# +# DRBD disabled because PROC_FS, INET or CONNECTOR not selected +# +CONFIG_BLK_DEV_NBD=y +# CONFIG_BLK_DEV_SX8 is not set +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=131072 +# CONFIG_BLK_DEV_XIP is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +# CONFIG_BLK_DEV_HD is not set +CONFIG_MISC_DEVICES=y +# CONFIG_AD525X_DPOT is not set +# CONFIG_PHANTOM is not set +# CONFIG_SGI_IOC4 is not set +# CONFIG_TIFM_CORE is not set +# CONFIG_ICS932S401 is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_HP_ILO is not set +# CONFIG_ISL29003 is not set +# CONFIG_DS1682 is not set +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +# CONFIG_EEPROM_AT24 is not set +CONFIG_EEPROM_LEGACY=y +# CONFIG_EEPROM_MAX6875 is not set +# CONFIG_EEPROM_93CX6 is not set +# CONFIG_CB710_CORE is not set +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +CONFIG_CHR_DEV_ST=y +# CONFIG_CHR_DEV_OSST is not set +CONFIG_BLK_DEV_SR=y +# CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_CHR_DEV_SG=y +# CONFIG_CHR_DEV_SCH is not set +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +CONFIG_SCSI_LOGGING=y +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set +# CONFIG_SCSI_SRP_ATTRS is not set +CONFIG_SCSI_LOWLEVEL=y +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_CXGB3_ISCSI is not set +# CONFIG_SCSI_BNX2_ISCSI is not set +# CONFIG_BE2ISCSI is not set +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set +# CONFIG_SCSI_HPSA is not set +# CONFIG_SCSI_3W_9XXX is not set +# CONFIG_SCSI_3W_SAS is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_AIC79XX is not set +# CONFIG_SCSI_AIC94XX is not set +# CONFIG_SCSI_MVSAS is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_ARCMSR is not set +# CONFIG_MEGARAID_NEWGEN is not set +# CONFIG_MEGARAID_LEGACY is not set +# CONFIG_MEGARAID_SAS is not set +# CONFIG_SCSI_MPT2SAS is not set +# CONFIG_SCSI_HPTIOP is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_LIBFC is not set +# CONFIG_LIBFCOE is not set +# CONFIG_FCOE is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_SCSI_IPS is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_STEX is not set +# CONFIG_SCSI_SYM53C8XX_2 is not set +# CONFIG_SCSI_IPR is not set +# CONFIG_SCSI_QLOGIC_1280 is not set +# CONFIG_SCSI_QLA_FC is not set +# CONFIG_SCSI_QLA_ISCSI is not set +# CONFIG_SCSI_LPFC is not set +# CONFIG_SCSI_DC395x is not set +# CONFIG_SCSI_DC390T is not set +# CONFIG_SCSI_NSP32 is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_PMCRAID is not set +# CONFIG_SCSI_PM8001 is not set +# CONFIG_SCSI_SRP is not set +# CONFIG_SCSI_BFA_FC is not set +# CONFIG_SCSI_DH is not set +# CONFIG_SCSI_OSD_INITIATOR is not set +CONFIG_ATA=y +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_SATA_PMP=y +CONFIG_SATA_AHCI=y +# CONFIG_SATA_SIL24 is not set +CONFIG_SATA_FSL=y +CONFIG_ATA_SFF=y +# CONFIG_SATA_SVW is not set +# CONFIG_ATA_PIIX is not set +# CONFIG_SATA_MV is not set +# CONFIG_SATA_NV is not set +# CONFIG_PDC_ADMA is not set +# CONFIG_SATA_QSTOR is not set +# CONFIG_SATA_PROMISE is not set +# CONFIG_SATA_SX4 is not set +# CONFIG_SATA_SIL is not set +# CONFIG_SATA_SIS is not set +# CONFIG_SATA_ULI is not set +# CONFIG_SATA_VIA is not set +# CONFIG_SATA_VITESSE is not set +# CONFIG_SATA_INIC162X is not set +CONFIG_PATA_ALI=y +# CONFIG_PATA_AMD is not set +# CONFIG_PATA_ARTOP is not set +# CONFIG_PATA_ATP867X is not set +# CONFIG_PATA_ATIIXP is not set +# CONFIG_PATA_CMD640_PCI is not set +# CONFIG_PATA_CMD64X is not set +# CONFIG_PATA_CS5520 is not set +# CONFIG_PATA_CS5530 is not set +# CONFIG_PATA_CYPRESS is not set +# CONFIG_PATA_EFAR is not set +# CONFIG_ATA_GENERIC is not set +# CONFIG_PATA_HPT366 is not set +# CONFIG_PATA_HPT37X is not set +# CONFIG_PATA_HPT3X2N is not set +# CONFIG_PATA_HPT3X3 is not set +# CONFIG_PATA_IT821X is not set +# CONFIG_PATA_IT8213 is not set +# CONFIG_PATA_JMICRON is not set +# CONFIG_PATA_TRIFLEX is not set +# CONFIG_PATA_MARVELL is not set +# CONFIG_PATA_MPIIX is not set +# CONFIG_PATA_OLDPIIX is not set +# CONFIG_PATA_NETCELL is not set +# CONFIG_PATA_NINJA32 is not set +# CONFIG_PATA_NS87410 is not set +# CONFIG_PATA_NS87415 is not set +# CONFIG_PATA_OPTI is not set +# CONFIG_PATA_OPTIDMA is not set +# CONFIG_PATA_PDC2027X is not set +# CONFIG_PATA_PDC_OLD is not set +# CONFIG_PATA_RADISYS is not set +# CONFIG_PATA_RDC is not set +# CONFIG_PATA_RZ1000 is not set +# CONFIG_PATA_SC1200 is not set +# CONFIG_PATA_SERVERWORKS is not set +# CONFIG_PATA_SIL680 is not set +# CONFIG_PATA_SIS is not set +# CONFIG_PATA_TOSHIBA is not set +# CONFIG_PATA_VIA is not set +# CONFIG_PATA_WINBOND is not set +# CONFIG_PATA_PLATFORM is not set +# CONFIG_PATA_SCH is not set +# CONFIG_MD is not set +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# You can enable one or both FireWire driver stacks. +# + +# +# The newer stack is recommended. +# +# CONFIG_FIREWIRE is not set +# CONFIG_IEEE1394 is not set +# CONFIG_I2O is not set +# CONFIG_MACINTOSH_DRIVERS is not set +CONFIG_NETDEVICES=y +CONFIG_DUMMY=y +# CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set +# CONFIG_VETH is not set +# CONFIG_ARCNET is not set +CONFIG_PHYLIB=y + +# +# MII PHY device drivers +# +CONFIG_MARVELL_PHY=y +CONFIG_DAVICOM_PHY=y +# CONFIG_QSEMI_PHY is not set +# CONFIG_LXT_PHY is not set +CONFIG_CICADA_PHY=y +CONFIG_VITESSE_PHY=y +# CONFIG_SMSC_PHY is not set +# CONFIG_BROADCOM_PHY is not set +# CONFIG_ICPLUS_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_NATIONAL_PHY is not set +# CONFIG_STE10XP is not set +# CONFIG_LSI_ET1011C_PHY is not set +CONFIG_FIXED_PHY=y +# CONFIG_MDIO_BITBANG is not set +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +# CONFIG_HAPPYMEAL is not set +# CONFIG_SUNGEM is not set +# CONFIG_CASSINI is not set +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_ETHOC is not set +# CONFIG_DNET is not set +# CONFIG_NET_TULIP is not set +# CONFIG_HP100 is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +# CONFIG_NET_PCI is not set +# CONFIG_B44 is not set +# CONFIG_KS8842 is not set +# CONFIG_KS8851_MLL is not set +# CONFIG_ATL2 is not set +# CONFIG_XILINX_EMACLITE is not set +CONFIG_FS_ENET=y +CONFIG_FS_ENET_HAS_SCC=y +CONFIG_FS_ENET_HAS_FCC=y +# CONFIG_FS_ENET_MDIO_FCC is not set +CONFIG_NETDEV_1000=y +# CONFIG_ACENIC is not set +# CONFIG_DL2K is not set +# CONFIG_E1000 is not set +# CONFIG_E1000E is not set +# CONFIG_IP1000 is not set +# CONFIG_IGB is not set +# CONFIG_IGBVF is not set +# CONFIG_NS83820 is not set +# CONFIG_HAMACHI is not set +# CONFIG_YELLOWFIN is not set +# CONFIG_R8169 is not set +# CONFIG_SIS190 is not set +# CONFIG_SKGE is not set +# CONFIG_SKY2 is not set +# CONFIG_VIA_VELOCITY is not set +# CONFIG_TIGON3 is not set +# CONFIG_BNX2 is not set +# CONFIG_CNIC is not set +CONFIG_FSL_PQ_MDIO=y +CONFIG_GIANFAR=y +CONFIG_UCC_GETH=y +# CONFIG_UGETH_TX_ON_DEMAND is not set +# CONFIG_MV643XX_ETH is not set +# CONFIG_QLA3XXX is not set +# CONFIG_ATL1 is not set +# CONFIG_ATL1E is not set +# CONFIG_ATL1C is not set +# CONFIG_JME is not set +CONFIG_NETDEV_10000=y +# CONFIG_CHELSIO_T1 is not set +CONFIG_CHELSIO_T3_DEPENDS=y +# CONFIG_CHELSIO_T3 is not set +# CONFIG_ENIC is not set +# CONFIG_IXGBE is not set +# CONFIG_IXGB is not set +# CONFIG_S2IO is not set +# CONFIG_VXGE is not set +# CONFIG_MYRI10GE is not set +# CONFIG_NETXEN_NIC is not set +# CONFIG_NIU is not set +# CONFIG_MLX4_EN is not set +# CONFIG_MLX4_CORE is not set +# CONFIG_TEHUTI is not set +# CONFIG_BNX2X is not set +# CONFIG_QLGE is not set +# CONFIG_SFC is not set +# CONFIG_BE2NET is not set +# CONFIG_TR is not set +CONFIG_WLAN=y +# CONFIG_AIRO is not set +# CONFIG_ATMEL is not set +# CONFIG_PRISM54 is not set +# CONFIG_USB_ZD1201 is not set +# CONFIG_HOSTAP is not set + +# +# Enable WiMAX (Networking options) to see the WiMAX drivers +# + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_USBNET is not set +# CONFIG_WAN is not set +# CONFIG_RIONET is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_NET_FC is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set +# CONFIG_VMXNET3 is not set +# CONFIG_ISDN is not set +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_FF_MEMLESS=m +# CONFIG_INPUT_POLLDEV is not set +# CONFIG_INPUT_SPARSEKMAP is not set + +# +# Userland interfaces +# +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_EVDEV is not set +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=y +# CONFIG_SERIO_PCIPS2 is not set +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_SERIO_XILINX_XPS_PS2 is not set +# CONFIG_SERIO_ALTERA_PS2 is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_DEVKMEM=y +# CONFIG_SERIAL_NONSTANDARD is not set +# CONFIG_NOZOMI is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_NR_UARTS=2 +CONFIG_SERIAL_8250_RUNTIME_UARTS=2 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_DETECT_IRQ=y +CONFIG_SERIAL_8250_RSA=y + +# +# Non-8250 serial port support +# +# CONFIG_SERIAL_UARTLITE is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_SERIAL_CPM is not set +# CONFIG_SERIAL_JSM is not set +# CONFIG_SERIAL_OF_PLATFORM is not set +CONFIG_SERIAL_QE=m +# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set +CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 +# CONFIG_HVC_UDBG is not set +# CONFIG_IPMI_HANDLER is not set +CONFIG_HW_RANDOM=y +# CONFIG_HW_RANDOM_TIMERIOMEM is not set +CONFIG_NVRAM=y +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +CONFIG_DEVPORT=y +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +# CONFIG_I2C_CHARDEV is not set +CONFIG_I2C_HELPER_AUTO=y + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +# CONFIG_I2C_ALI1535 is not set +# CONFIG_I2C_ALI1563 is not set +# CONFIG_I2C_ALI15X3 is not set +# CONFIG_I2C_AMD756 is not set +# CONFIG_I2C_AMD8111 is not set +# CONFIG_I2C_I801 is not set +# CONFIG_I2C_ISCH is not set +# CONFIG_I2C_PIIX4 is not set +# CONFIG_I2C_NFORCE2 is not set +# CONFIG_I2C_SIS5595 is not set +# CONFIG_I2C_SIS630 is not set +# CONFIG_I2C_SIS96X is not set +# CONFIG_I2C_VIA is not set +# CONFIG_I2C_VIAPRO is not set + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +CONFIG_I2C_CPM=m +# CONFIG_I2C_DESIGNWARE is not set +# CONFIG_I2C_GPIO is not set +CONFIG_I2C_MPC=y +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_SIMTEC is not set + +# +# External I2C/SMBus adapter drivers +# +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_TAOS_EVM is not set +# CONFIG_I2C_TINY_USB is not set + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_STUB is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_TSL2550 is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set +# CONFIG_SPI is not set + +# +# PPS support +# +# CONFIG_PPS is not set +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_DEBUG_GPIO is not set +# CONFIG_GPIO_SYSFS is not set + +# +# Memory mapped GPIO expanders: +# +# CONFIG_GPIO_XILINX is not set + +# +# I2C GPIO expanders: +# +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set + +# +# PCI GPIO expanders: +# +# CONFIG_GPIO_CS5535 is not set +# CONFIG_GPIO_BT8XX is not set +# CONFIG_GPIO_LANGWELL is not set + +# +# SPI GPIO expanders: +# + +# +# AC97 GPIO expanders: +# +# CONFIG_W1 is not set +# CONFIG_POWER_SUPPLY is not set +# CONFIG_HWMON is not set +# CONFIG_THERMAL is not set +# CONFIG_WATCHDOG is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +# CONFIG_SSB is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_CORE is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_UCB1400_CORE is not set +# CONFIG_TPS65010 is not set +# CONFIG_TWL4030_CORE is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_PMIC_DA903X is not set +# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM831X is not set +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_MFD_PCF50633 is not set +# CONFIG_AB3100_CORE is not set +# CONFIG_MFD_88PM8607 is not set +# CONFIG_REGULATOR is not set +# CONFIG_MEDIA_SUPPORT is not set + +# +# Graphics support +# +# CONFIG_AGP is not set +CONFIG_VGA_ARB=y +# CONFIG_DRM is not set +# CONFIG_VGASTATE is not set +CONFIG_VIDEO_OUTPUT_CONTROL=y +# CONFIG_FB is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +# CONFIG_VGACON_SOFT_SCROLLBACK is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_SOUND=y +CONFIG_SOUND_OSS_CORE=y +CONFIG_SOUND_OSS_CORE_PRECLAIM=y +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +# CONFIG_SND_SEQUENCER is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y +CONFIG_SND_PCM_OSS_PLUGINS=y +# CONFIG_SND_HRTIMER is not set +# CONFIG_SND_DYNAMIC_MINORS is not set +# CONFIG_SND_SUPPORT_OLD_API is not set +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_VMASTER=y +# CONFIG_SND_RAWMIDI_SEQ is not set +# CONFIG_SND_OPL3_LIB_SEQ is not set +# CONFIG_SND_OPL4_LIB_SEQ is not set +# CONFIG_SND_SBAWE_SEQ is not set +# CONFIG_SND_EMU10K1_SEQ is not set +CONFIG_SND_AC97_CODEC=y +CONFIG_SND_DRIVERS=y +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set +# CONFIG_SND_AC97_POWER_SAVE is not set +CONFIG_SND_PCI=y +# CONFIG_SND_AD1889 is not set +# CONFIG_SND_ALS300 is not set +# CONFIG_SND_ALS4000 is not set +# CONFIG_SND_ALI5451 is not set +# CONFIG_SND_ATIIXP is not set +# CONFIG_SND_ATIIXP_MODEM is not set +# CONFIG_SND_AU8810 is not set +# CONFIG_SND_AU8820 is not set +# CONFIG_SND_AU8830 is not set +# CONFIG_SND_AW2 is not set +# CONFIG_SND_AZT3328 is not set +# CONFIG_SND_BT87X is not set +# CONFIG_SND_CA0106 is not set +# CONFIG_SND_CMIPCI is not set +# CONFIG_SND_OXYGEN is not set +# CONFIG_SND_CS4281 is not set +# CONFIG_SND_CS46XX is not set +# CONFIG_SND_CS5530 is not set +# CONFIG_SND_CS5535AUDIO is not set +# CONFIG_SND_CTXFI is not set +# CONFIG_SND_DARLA20 is not set +# CONFIG_SND_GINA20 is not set +# CONFIG_SND_LAYLA20 is not set +# CONFIG_SND_DARLA24 is not set +# CONFIG_SND_GINA24 is not set +# CONFIG_SND_LAYLA24 is not set +# CONFIG_SND_MONA is not set +# CONFIG_SND_MIA is not set +# CONFIG_SND_ECHO3G is not set +# CONFIG_SND_INDIGO is not set +# CONFIG_SND_INDIGOIO is not set +# CONFIG_SND_INDIGODJ is not set +# CONFIG_SND_INDIGOIOX is not set +# CONFIG_SND_INDIGODJX is not set +# CONFIG_SND_EMU10K1 is not set +# CONFIG_SND_EMU10K1X is not set +# CONFIG_SND_ENS1370 is not set +# CONFIG_SND_ENS1371 is not set +# CONFIG_SND_ES1938 is not set +# CONFIG_SND_ES1968 is not set +# CONFIG_SND_FM801 is not set +# CONFIG_SND_HDA_INTEL is not set +# CONFIG_SND_HDSP is not set +# CONFIG_SND_HDSPM is not set +# CONFIG_SND_HIFIER is not set +# CONFIG_SND_ICE1712 is not set +# CONFIG_SND_ICE1724 is not set +CONFIG_SND_INTEL8X0=y +# CONFIG_SND_INTEL8X0M is not set +# CONFIG_SND_KORG1212 is not set +# CONFIG_SND_LX6464ES is not set +# CONFIG_SND_MAESTRO3 is not set +# CONFIG_SND_MIXART is not set +# CONFIG_SND_NM256 is not set +# CONFIG_SND_PCXHR is not set +# CONFIG_SND_RIPTIDE is not set +# CONFIG_SND_RME32 is not set +# CONFIG_SND_RME96 is not set +# CONFIG_SND_RME9652 is not set +# CONFIG_SND_SONICVIBES is not set +# CONFIG_SND_TRIDENT is not set +# CONFIG_SND_VIA82XX is not set +# CONFIG_SND_VIA82XX_MODEM is not set +# CONFIG_SND_VIRTUOSO is not set +# CONFIG_SND_VX222 is not set +# CONFIG_SND_YMFPCI is not set +CONFIG_SND_PPC=y +CONFIG_SND_USB=y +# CONFIG_SND_USB_AUDIO is not set +# CONFIG_SND_USB_USX2Y is not set +# CONFIG_SND_USB_CAIAQ is not set +# CONFIG_SND_SOC is not set +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=y +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +# CONFIG_HIDRAW is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=y +# CONFIG_HID_PID is not set +# CONFIG_USB_HIDDEV is not set + +# +# Special HID drivers +# +CONFIG_HID_A4TECH=y +CONFIG_HID_APPLE=y +CONFIG_HID_BELKIN=y +CONFIG_HID_CHERRY=y +CONFIG_HID_CHICONY=y +CONFIG_HID_CYPRESS=y +# CONFIG_HID_DRAGONRISE is not set +CONFIG_HID_EZKEY=y +# CONFIG_HID_KYE is not set +CONFIG_HID_GYRATION=y +# CONFIG_HID_TWINHAN is not set +# CONFIG_HID_KENSINGTON is not set +CONFIG_HID_LOGITECH=y +# CONFIG_LOGITECH_FF is not set +# CONFIG_LOGIRUMBLEPAD2_FF is not set +CONFIG_HID_MICROSOFT=y +CONFIG_HID_MONTEREY=y +# CONFIG_HID_NTRIG is not set +CONFIG_HID_PANTHERLORD=y +# CONFIG_PANTHERLORD_FF is not set +CONFIG_HID_PETALYNX=y +CONFIG_HID_SAMSUNG=y +CONFIG_HID_SONY=y +CONFIG_HID_SUNPLUS=y +# CONFIG_HID_GREENASIA is not set +# CONFIG_HID_SMARTJOYPLUS is not set +# CONFIG_HID_TOPSEED is not set +# CONFIG_HID_THRUSTMASTER is not set +# CONFIG_HID_ZEROPLUS is not set +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set +# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +CONFIG_USB_DEVICE_CLASS=y +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_OTG is not set +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set +CONFIG_USB_MON=y +# CONFIG_USB_WUSB is not set +# CONFIG_USB_WUSB_CBAF is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +# CONFIG_USB_XHCI_HCD is not set +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_ROOT_HUB_TT=y +# CONFIG_USB_EHCI_TT_NEWSCHED is not set +# CONFIG_XPS_USB_HCD_XILINX is not set +CONFIG_USB_EHCI_FSL=y +CONFIG_USB_EHCI_HCD_PPC_OF=y +# CONFIG_USB_OXU210HP_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_ISP1760_HCD is not set +# CONFIG_USB_ISP1362_HCD is not set +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_HCD_PPC_OF_BE=y +CONFIG_USB_OHCI_HCD_PPC_OF_LE=y +CONFIG_USB_OHCI_HCD_PPC_OF=y +CONFIG_USB_OHCI_HCD_PCI=y +CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y +CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +# CONFIG_USB_UHCI_HCD is not set +# CONFIG_USB_FHCI_HCD is not set +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_WHCI_HCD is not set +# CONFIG_USB_HWA_HCD is not set + +# +# USB Device Class drivers +# +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set +# CONFIG_USB_WDM is not set +# CONFIG_USB_TMC is not set + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=y +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_ONETOUCH is not set +# CONFIG_USB_STORAGE_KARMA is not set +# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set + +# +# USB port drivers +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_SEVSEG is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_BERRY_CHARGE is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_SISUSBVGA is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set +# CONFIG_USB_TEST is not set +# CONFIG_USB_ISIGHTFW is not set +# CONFIG_USB_VST is not set +# CONFIG_USB_GADGET is not set + +# +# OTG and related infrastructure +# +# CONFIG_USB_GPIO_VBUS is not set +# CONFIG_NOP_USB_XCEIV is not set +# CONFIG_UWB is not set +# CONFIG_MMC is not set +# CONFIG_MEMSTICK is not set +# CONFIG_NEW_LEDS is not set +# CONFIG_ACCESSIBILITY is not set +# CONFIG_INFINIBAND is not set +CONFIG_EDAC=y + +# +# Reporting subsystems +# +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_MM_EDAC=y +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1374 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_MAX6900 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_M41T80 is not set +# CONFIG_RTC_DRV_BQ32K is not set +# CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_FM3130 is not set +# CONFIG_RTC_DRV_RX8581 is not set +# CONFIG_RTC_DRV_RX8025 is not set + +# +# SPI RTC drivers +# + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=y +# CONFIG_RTC_DRV_DS1286 is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T35 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_MSM6242 is not set +# CONFIG_RTC_DRV_BQ4802 is not set +# CONFIG_RTC_DRV_RP5C01 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# +# CONFIG_RTC_DRV_GENERIC is not set +CONFIG_DMADEVICES=y + +# +# DMA Devices +# +CONFIG_FSL_DMA=y +CONFIG_DMA_ENGINE=y + +# +# DMA Clients +# +# CONFIG_NET_DMA is not set +# CONFIG_ASYNC_TX_DMA is not set +# CONFIG_DMATEST is not set +# CONFIG_AUXDISPLAY is not set +# CONFIG_UIO is not set + +# +# TI VLYNQ +# +# CONFIG_STAGING is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +# CONFIG_EXT4_FS is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_BTRFS_FS is not set +# CONFIG_NILFS2_FS is not set +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# Caches +# +# CONFIG_FSCACHE is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_NTFS_FS=y +# CONFIG_NTFS_DEBUG is not set +# CONFIG_NTFS_RW is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +# CONFIG_CONFIGFS_FS is not set +CONFIG_MISC_FILESYSTEMS=y +CONFIG_ADFS_FS=m +# CONFIG_ADFS_FS_RW is not set +CONFIG_AFFS_FS=m +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +CONFIG_BFS_FS=m +CONFIG_EFS_FS=m +CONFIG_CRAMFS=y +# CONFIG_SQUASHFS is not set +CONFIG_VXFS_FS=m +# CONFIG_MINIX_FS is not set +# CONFIG_OMFS_FS is not set +CONFIG_HPFS_FS=m +CONFIG_QNX4FS_FS=m +# CONFIG_ROMFS_FS is not set +CONFIG_SYSV_FS=m +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V4=y +# CONFIG_NFS_V4_1 is not set +CONFIG_ROOT_NFS=y +CONFIG_NFSD=y +# CONFIG_NFSD_V3 is not set +# CONFIG_NFSD_V4 is not set +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +CONFIG_RPCSEC_GSS_KRB5=y +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +# CONFIG_EFI_PARTITION is not set +# CONFIG_SYSV68_PARTITION is not set +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +# CONFIG_NLS_CODEPAGE_437 is not set +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +# CONFIG_NLS_ISO8859_1 is not set +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +CONFIG_NLS_UTF8=m +# CONFIG_DLM is not set +CONFIG_UCC_SLOW=y +CONFIG_UCC_FAST=y +CONFIG_UCC=y +# CONFIG_BINARY_PRINTF is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_LAST_BIT=y +# CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set +CONFIG_CRC_T10DIF=y +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +# CONFIG_CRC7 is not set +CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=y +CONFIG_DECOMPRESS_GZIP=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_HAVE_LMB=y +CONFIG_NLATTR=y +CONFIG_GENERIC_ATOMIC64=y + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_STRIP_ASM_SYMS is not set +# CONFIG_UNUSED_SYMBOLS is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +CONFIG_DETECT_SOFTLOCKUP=y +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 +CONFIG_DETECT_HUNG_TASK=y +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 +CONFIG_SCHED_DEBUG=y +# CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS is not set +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_SLUB_STATS is not set +# CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_HIGHMEM is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_WRITECOUNT is not set +# CONFIG_DEBUG_MEMORY_INIT is not set +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_RCU_CPU_STALL_DETECTOR is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +CONFIG_SYSCTL_SYSCALL_CHECK=y +# CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_TRACING_SUPPORT=y +CONFIG_FTRACE=y +# CONFIG_FUNCTION_TRACER is not set +# CONFIG_IRQSOFF_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_ENABLE_DEFAULT_TRACERS is not set +# CONFIG_BOOT_TRACER is not set +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +# CONFIG_PROFILE_ALL_BRANCHES is not set +# CONFIG_STACK_TRACER is not set +# CONFIG_KMEMTRACE is not set +# CONFIG_WORKQUEUE_TRACER is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_DYNAMIC_DEBUG is not set +# CONFIG_DMA_API_DEBUG is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +# CONFIG_PPC_DISABLE_WERROR is not set +CONFIG_PPC_WERROR=y +CONFIG_PRINT_STACK_DEPTH=64 +# CONFIG_DEBUG_STACKOVERFLOW is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_PPC_EMULATED_STATS is not set +# CONFIG_CODE_PATCHING_SELFTEST is not set +# CONFIG_FTR_FIXUP_SELFTEST is not set +# CONFIG_MSI_BITMAP_SELFTEST is not set +# CONFIG_XMON is not set +# CONFIG_IRQSTACKS is not set +CONFIG_VIRQ_DEBUG=y +# CONFIG_BDI_SWITCH is not set +# CONFIG_PPC_EARLY_DEBUG is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITYFS is not set +# CONFIG_DEFAULT_SECURITY_SELINUX is not set +# CONFIG_DEFAULT_SECURITY_SMACK is not set +# CONFIG_DEFAULT_SECURITY_TOMOYO is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=y +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_PCOMP=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +# CONFIG_CRYPTO_GF128MUL is not set +# CONFIG_CRYPTO_NULL is not set +CONFIG_CRYPTO_WORKQUEUE=y +# CONFIG_CRYPTO_CRYPTD is not set +CONFIG_CRYPTO_AUTHENC=y +# CONFIG_CRYPTO_TEST is not set + +# +# Authenticated Encryption with Associated Data +# +# CONFIG_CRYPTO_CCM is not set +# CONFIG_CRYPTO_GCM is not set +# CONFIG_CRYPTO_SEQIV is not set + +# +# Block modes +# +CONFIG_CRYPTO_CBC=y +# CONFIG_CRYPTO_CTR is not set +# CONFIG_CRYPTO_CTS is not set +# CONFIG_CRYPTO_ECB is not set +# CONFIG_CRYPTO_LRW is not set +CONFIG_CRYPTO_PCBC=m +# CONFIG_CRYPTO_XTS is not set + +# +# Hash modes +# +CONFIG_CRYPTO_HMAC=y +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_VMAC is not set + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=m +# CONFIG_CRYPTO_GHASH is not set +# CONFIG_CRYPTO_MD4 is not set +CONFIG_CRYPTO_MD5=y +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_RMD128 is not set +# CONFIG_CRYPTO_RMD160 is not set +# CONFIG_CRYPTO_RMD256 is not set +# CONFIG_CRYPTO_RMD320 is not set +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_SHA512=y +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_WP512 is not set + +# +# Ciphers +# +CONFIG_CRYPTO_AES=y +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_ARC4 is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +CONFIG_CRYPTO_DES=y +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_SEED is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_TWOFISH is not set + +# +# Compression +# +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_ZLIB is not set +# CONFIG_CRYPTO_LZO is not set + +# +# Random Number Generation +# +# CONFIG_CRYPTO_ANSI_CPRNG is not set +CONFIG_CRYPTO_HW=y +# CONFIG_CRYPTO_DEV_HIFN_795X is not set +CONFIG_CRYPTO_DEV_TALITOS=y +CONFIG_PPC_CLOCK=y +CONFIG_PPC_LIB_RHEAP=y +# CONFIG_VIRTUALIZATION is not set diff --git a/recipes/linux/linux-amsdelta-2.6_2.6.16-omap2.bb b/recipes/linux/linux-amsdelta-2.6_2.6.16-omap2.bb index db72fe7d31..d989b831ae 100644 --- a/recipes/linux/linux-amsdelta-2.6_2.6.16-omap2.bb +++ b/recipes/linux/linux-amsdelta-2.6_2.6.16-omap2.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "2.6 Linux kernel for the Amstrad Delta (E3)" -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_MACHINE = "amsdelta" diff --git a/recipes/linux/linux-bast_2.4.25-vrs1-bast1.bb b/recipes/linux/linux-bast_2.4.25-vrs1-bast1.bb index 2fbdf1aa9c..04fb39c87e 100644 --- a/recipes/linux/linux-bast_2.4.25-vrs1-bast1.bb +++ b/recipes/linux/linux-bast_2.4.25-vrs1-bast1.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for Simtec EB2410ITX" -LICENSE = "GPL" +LICENSE = "GPLv2" KV = "2.4.25" KERNEL_CCSUFFIX = "-3.3.3" diff --git a/recipes/linux/linux-bd-neon-2.6_2.6.22.bb b/recipes/linux/linux-bd-neon-2.6_2.6.22.bb index 3fca851ef2..111b43aa7e 100644 --- a/recipes/linux/linux-bd-neon-2.6_2.6.22.bb +++ b/recipes/linux/linux-bd-neon-2.6_2.6.22.bb @@ -1,7 +1,7 @@ DESCRIPTION = "2.6 Linux Kernel for Boundary Devices NEON Board" SECTION = "kernel" HOMEPAGE = "N/A" -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_MACHINE = "bd-neon" DEPENDS += "u-boot-utils-native" diff --git a/recipes/linux/linux-colinux_2.4.28.bb b/recipes/linux/linux-colinux_2.4.28.bb index dc052afce1..58ea5889ea 100644 --- a/recipes/linux/linux-colinux_2.4.28.bb +++ b/recipes/linux/linux-colinux_2.4.28.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "User Mode Linux Kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" COLV = "0.6.1" COMPATIBLE_MACHINE = "colinux" diff --git a/recipes/linux/linux-colinux_2.6.10.bb b/recipes/linux/linux-colinux_2.6.10.bb index df06ccdd65..f206c98662 100644 --- a/recipes/linux/linux-colinux_2.6.10.bb +++ b/recipes/linux/linux-colinux_2.6.10.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "User Mode Linux Kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" COLV = "0.6.2" COMPATIBLE_MACHINE = "colinux" diff --git a/recipes/linux/linux-ea3250_2.6.27.8.bb b/recipes/linux/linux-ea3250_2.6.27.8.bb index 37c152da17..4bfbd3e4a3 100644 --- a/recipes/linux/linux-ea3250_2.6.27.8.bb +++ b/recipes/linux/linux-ea3250_2.6.27.8.bb @@ -2,7 +2,7 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the EmbeddedArtists LPC3250 development board" HOMEPAGE = "http://embeddedartists.com" # DEPENDS = "" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" # Location of the base kernel and NXP's patches diff --git a/recipes/linux/linux-efika_2.6.18+2.6.19-rc6.bb b/recipes/linux/linux-efika_2.6.18+2.6.19-rc6.bb index 1907b09f75..a5fba1bc20 100644 --- a/recipes/linux/linux-efika_2.6.18+2.6.19-rc6.bb +++ b/recipes/linux/linux-efika_2.6.18+2.6.19-rc6.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for the EFIKA dev platform" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r3" COMPATIBLE_MACHINE = "efika" diff --git a/recipes/linux/linux-efika_2.6.20.20.bb b/recipes/linux/linux-efika_2.6.20.20.bb index 2f707a17e3..c51ebc467e 100644 --- a/recipes/linux/linux-efika_2.6.20.20.bb +++ b/recipes/linux/linux-efika_2.6.20.20.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for the EFIKA dev platform" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r2" COMPATIBLE_MACHINE = "efika" diff --git a/recipes/linux/linux-efika_2.6.20.bb b/recipes/linux/linux-efika_2.6.20.bb index 839d206cd1..4cd121c722 100644 --- a/recipes/linux/linux-efika_2.6.20.bb +++ b/recipes/linux/linux-efika_2.6.20.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for the EFIKA dev platform" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r2" COMPATIBLE_MACHINE = "efika" diff --git a/recipes/linux/linux-efika_2.6.21+git.bb b/recipes/linux/linux-efika_2.6.21+git.bb index 20b5bf86b6..e4f92c6e09 100644 --- a/recipes/linux/linux-efika_2.6.21+git.bb +++ b/recipes/linux/linux-efika_2.6.21+git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for the EFIKA dev platform" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" PV = "2.6.21+git${SRCDATE}" diff --git a/recipes/linux/linux-epia_2.6.11.bb b/recipes/linux/linux-epia_2.6.11.bb index 04c47ca397..f5e63ac709 100644 --- a/recipes/linux/linux-epia_2.6.11.bb +++ b/recipes/linux/linux-epia_2.6.11.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for VIA EPiA" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" KERNEL_CCSUFFIX = "-3.3.4" diff --git a/recipes/linux/linux-epia_2.6.12.bb b/recipes/linux/linux-epia_2.6.12.bb index 04c47ca397..f5e63ac709 100644 --- a/recipes/linux/linux-epia_2.6.12.bb +++ b/recipes/linux/linux-epia_2.6.12.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for VIA EPiA" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" KERNEL_CCSUFFIX = "-3.3.4" diff --git a/recipes/linux/linux-epia_2.6.19.2.bb b/recipes/linux/linux-epia_2.6.19.2.bb index ce253c45c6..0a2d6c70ab 100644 --- a/recipes/linux/linux-epia_2.6.19.2.bb +++ b/recipes/linux/linux-epia_2.6.19.2.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for VIA EPiA" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" KERNEL_CCSUFFIX = "-3.3.4" diff --git a/recipes/linux/linux-epia_2.6.8.1.bb b/recipes/linux/linux-epia_2.6.8.1.bb index 315ff118e8..5cf1d4ed7f 100644 --- a/recipes/linux/linux-epia_2.6.8.1.bb +++ b/recipes/linux/linux-epia_2.6.8.1.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for VIA EPiA" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r15" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ diff --git a/recipes/linux/linux-geodegx_2.4.24.bb b/recipes/linux/linux-geodegx_2.4.24.bb index fb42b562cc..af147a796e 100644 --- a/recipes/linux/linux-geodegx_2.4.24.bb +++ b/recipes/linux/linux-geodegx_2.4.24.bb @@ -6,7 +6,7 @@ COMPATIBLE_MACHINE = "geodegx" KV = "2.4.24" DESCRIPTION = "Linux kernel for the AMD Geode GX processor" -LICENSE = "GPL" +LICENSE = "GPLv2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ http://www.amd.com/files/connectivitysolutions/geode/Patches_Linux_${KV}_1.00.tar.gz \ diff --git a/recipes/linux/linux-geodelx_2.6.11.bb b/recipes/linux/linux-geodelx_2.6.11.bb index adfd7475bb..ef287c72ac 100644 --- a/recipes/linux/linux-geodelx_2.6.11.bb +++ b/recipes/linux/linux-geodelx_2.6.11.bb @@ -6,7 +6,7 @@ COMPATIBLE_MACHINE = "geodelx" DESCRIPTION = "Linux kernel for the AMD Geode GX5535/LX5536" HOMEPAGE = "http://www.amd.com/embedded" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" AMD_DRIVER_VERSION = "02.03.0100" diff --git a/recipes/linux/linux-gumstix_2.6.15.bb b/recipes/linux/linux-gumstix_2.6.15.bb index 1812148f6e..60d269b467 100644 --- a/recipes/linux/linux-gumstix_2.6.15.bb +++ b/recipes/linux/linux-gumstix_2.6.15.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for the Gumstix" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r2" DEPENDS = "u-boot-utils-native" diff --git a/recipes/linux/linux-h1940_2.6.11-bk1-h1940.bb b/recipes/linux/linux-h1940_2.6.11-bk1-h1940.bb index 7624f32a8a..265788f11a 100644 --- a/recipes/linux/linux-h1940_2.6.11-bk1-h1940.bb +++ b/recipes/linux/linux-h1940_2.6.11-bk1-h1940.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for h1940 devices." SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_HOST = "arm.*-linux" COMPATIBLE_MACHINE = "h1940" diff --git a/recipes/linux/linux-h1940_2.6.14-h1940.bb b/recipes/linux/linux-h1940_2.6.14-h1940.bb index 0669600a98..c0ade59e9a 100644 --- a/recipes/linux/linux-h1940_2.6.14-h1940.bb +++ b/recipes/linux/linux-h1940_2.6.14-h1940.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for h1940 devices." SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_HOST = "arm.*-linux" COMPATIBLE_MACHINE = "h1940" diff --git a/recipes/linux/linux-h1940_2.6.17-h1940.bb b/recipes/linux/linux-h1940_2.6.17-h1940.bb index f7ad0185f3..a82ad8526d 100644 --- a/recipes/linux/linux-h1940_2.6.17-h1940.bb +++ b/recipes/linux/linux-h1940_2.6.17-h1940.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for h1940 devices." SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" diff --git a/recipes/linux/linux-h6300-omap1_2.6.12-rc5.bb b/recipes/linux/linux-h6300-omap1_2.6.12-rc5.bb index 58e85781a3..2bb3300ad1 100644 --- a/recipes/linux/linux-h6300-omap1_2.6.12-rc5.bb +++ b/recipes/linux/linux-h6300-omap1_2.6.12-rc5.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for h6300 devices." SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/linux-2.6.12-rc5.tar.bz2 \ http://www.muru.com/linux/omap/patches/patch-2.6.12-rc5-omap2.bz2;patch=1 \ diff --git a/recipes/linux/linux-h6300-omap1_2.6.14.3.bb b/recipes/linux/linux-h6300-omap1_2.6.14.3.bb index 7726bad494..31ce45dc87 100644 --- a/recipes/linux/linux-h6300-omap1_2.6.14.3.bb +++ b/recipes/linux/linux-h6300-omap1_2.6.14.3.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for h6300 devices." SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.14.tar.bz2 \ http://www.muru.com/linux/omap/patches/patch-2.6.14-omap2.bz2;patch=1 \ diff --git a/recipes/linux/linux-h6300-omap1_2.6.16.16.bb b/recipes/linux/linux-h6300-omap1_2.6.16.16.bb index 8b5f627846..0db8ca2d35 100644 --- a/recipes/linux/linux-h6300-omap1_2.6.16.16.bb +++ b/recipes/linux/linux-h6300-omap1_2.6.16.16.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for HP iPAQ h6300 series OMAP1510 based phones." SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ http://www.muru.com/linux/omap/patches/patch-2.6.16-omap2.bz2;patch=1 \ diff --git a/recipes/linux/linux-hackndev-2.6_git.bb b/recipes/linux/linux-hackndev-2.6_git.bb index 5c093a1674..4c577d247d 100644 --- a/recipes/linux/linux-hackndev-2.6_git.bb +++ b/recipes/linux/linux-hackndev-2.6_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Hack&Dev's Linux kernel for Palm devices." HOMEPAGE = "http://www.hackndev.com/" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r14" COMPATIBLE_MACHINE = "(palmld|palmtc|palmtt3|palmtt5|palmtx|palmz31|palmz72|palmt650)" diff --git a/recipes/linux/linux-handhelds-2.6.inc b/recipes/linux/linux-handhelds-2.6.inc index fe482830f8..4a3ed7d23e 100644 --- a/recipes/linux/linux-handhelds-2.6.inc +++ b/recipes/linux/linux-handhelds-2.6.inc @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_HOST = "arm.*-linux" COMPATIBLE_MACHINE ?= "(asus620|asus730|aximx50|aximx50v|eseries|h1910|h2200|h3600|h3800|h3900|h4000|h5000|htcalpine|htcapache|htcblueangel|htchermes|htchimalaya|htcsable|htcuniversal|htcwallaby|hx4700|ghi270|looxc550|jornada56x|magician|rx1950|rx3000)" diff --git a/recipes/linux/linux-handhelds-2.6_2.6.16-hh9.bb b/recipes/linux/linux-handhelds-2.6_2.6.16-hh9.bb index 8b1f153f11..184464323e 100644 --- a/recipes/linux/linux-handhelds-2.6_2.6.16-hh9.bb +++ b/recipes/linux/linux-handhelds-2.6_2.6.16-hh9.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" # Override where to look for defconfigs and patches, diff --git a/recipes/linux/linux-handhelds-2.6_2.6.17-hh4.bb b/recipes/linux/linux-handhelds-2.6_2.6.17-hh4.bb index c19678efe2..58de694232 100644 --- a/recipes/linux/linux-handhelds-2.6_2.6.17-hh4.bb +++ b/recipes/linux/linux-handhelds-2.6_2.6.17-hh4.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/linux/linux-handhelds-2.6_2.6.18-hh2.bb b/recipes/linux/linux-handhelds-2.6_2.6.18-hh2.bb index 724971cacb..6c93da3598 100644 --- a/recipes/linux/linux-handhelds-2.6_2.6.18-hh2.bb +++ b/recipes/linux/linux-handhelds-2.6_2.6.18-hh2.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/linux/linux-handhelds-2.6_2.6.19-hh13.bb b/recipes/linux/linux-handhelds-2.6_2.6.19-hh13.bb index 77f55415ba..a8d4438fa3 100644 --- a/recipes/linux/linux-handhelds-2.6_2.6.19-hh13.bb +++ b/recipes/linux/linux-handhelds-2.6_2.6.19-hh13.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/linux/linux-handhelds-2.6_2.6.20-hh10.bb b/recipes/linux/linux-handhelds-2.6_2.6.20-hh10.bb index 8e760267f4..4ec2aaedf2 100644 --- a/recipes/linux/linux-handhelds-2.6_2.6.20-hh10.bb +++ b/recipes/linux/linux-handhelds-2.6_2.6.20-hh10.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/linux/linux-handhelds-2.6_2.6.21-hh20.bb b/recipes/linux/linux-handhelds-2.6_2.6.21-hh20.bb index d955c0ab39..c661d7e9b2 100644 --- a/recipes/linux/linux-handhelds-2.6_2.6.21-hh20.bb +++ b/recipes/linux/linux-handhelds-2.6_2.6.21-hh20.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r26" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/linux/linux-handhelds-2.6_cvs.bb b/recipes/linux/linux-handhelds-2.6_cvs.bb index 93e884e994..8ebdb1a994 100644 --- a/recipes/linux/linux-handhelds-2.6_cvs.bb +++ b/recipes/linux/linux-handhelds-2.6_cvs.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." -LICENSE = "GPL" +LICENSE = "GPLv2" PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}" PR = "r1" diff --git a/recipes/linux/linux-jlime-ben_2.6.32.bb b/recipes/linux/linux-jlime-ben_2.6.32.bb index 798fac3f87..c2b1a8e1ac 100644 --- a/recipes/linux/linux-jlime-ben_2.6.32.bb +++ b/recipes/linux/linux-jlime-ben_2.6.32.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux 2.6.32 kernel for the ben nanonote" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" SRCREV = "${AUTOREV}" diff --git a/recipes/linux/linux-jlime-current.bb b/recipes/linux/linux-jlime-current.bb index 21cf1a224b..806fd6102c 100644 --- a/recipes/linux/linux-jlime-current.bb +++ b/recipes/linux/linux-jlime-current.bb @@ -7,7 +7,7 @@ DESCRIPTION = "2.6 Linux Development Kernel for JLime supported Machines." SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_MACHINE = "fillmein" diff --git a/recipes/linux/linux-jlime-jornada6xx_2.6.11.bb b/recipes/linux/linux-jlime-jornada6xx_2.6.11.bb index 654b02788c..43b9e00650 100644 --- a/recipes/linux/linux-jlime-jornada6xx_2.6.11.bb +++ b/recipes/linux/linux-jlime-jornada6xx_2.6.11.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for Hitachi SH3 based Jornada 6xx" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" diff --git a/recipes/linux/linux-jlime-jornada6xx_2.6.17.bb b/recipes/linux/linux-jlime-jornada6xx_2.6.17.bb index 5bd44ecf68..9b61343238 100644 --- a/recipes/linux/linux-jlime-jornada6xx_2.6.17.bb +++ b/recipes/linux/linux-jlime-jornada6xx_2.6.17.bb @@ -1,6 +1,6 @@ DESCRIPTION = "JLime Linux kernel for SuperH based Jornada 6xx" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_MACHINE = "jornada6xx" diff --git a/recipes/linux/linux-jlime-jornada6xx_2.6.21rc5.bb b/recipes/linux/linux-jlime-jornada6xx_2.6.21rc5.bb index c7ebe829c4..c932df901f 100644 --- a/recipes/linux/linux-jlime-jornada6xx_2.6.21rc5.bb +++ b/recipes/linux/linux-jlime-jornada6xx_2.6.21rc5.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "JLime Linux kernel for SuperH based Jornada 6xx" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" COMPATIBLE_HOST = "sh.*-linux" diff --git a/recipes/linux/linux-jlime-jornada6xx_2.6.25.bb b/recipes/linux/linux-jlime-jornada6xx_2.6.25.bb index c55cf1578f..502dc51eb1 100644 --- a/recipes/linux/linux-jlime-jornada6xx_2.6.25.bb +++ b/recipes/linux/linux-jlime-jornada6xx_2.6.25.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "JLime Linux kernel for SuperH based Jornada 6xx" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" SRCREV = "${AUTOREV}" diff --git a/recipes/linux/linux-jlime-jornada6xx_2.6.32.bb b/recipes/linux/linux-jlime-jornada6xx_2.6.32.bb index d3d1625070..c0c258f027 100644 --- a/recipes/linux/linux-jlime-jornada6xx_2.6.32.bb +++ b/recipes/linux/linux-jlime-jornada6xx_2.6.32.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux 2.6.32 kernel for the SuperH-based Jornada 6xx" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" SRCREV = "${AUTOREV}" diff --git a/recipes/linux/linux-jlime-jornada7xx_2.6.17.bb b/recipes/linux/linux-jlime-jornada7xx_2.6.17.bb index 0d95972010..0018fa2aae 100644 --- a/recipes/linux/linux-jlime-jornada7xx_2.6.17.bb +++ b/recipes/linux/linux-jlime-jornada7xx_2.6.17.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "JLime Linux kernel for Arm based Jornada 7xx" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" COMPATIBLE_HOST = "arm.*-linux" diff --git a/recipes/linux/linux-jlime-jornada7xx_2.6.18.bb b/recipes/linux/linux-jlime-jornada7xx_2.6.18.bb index 789dddf9b8..f1d0707b70 100644 --- a/recipes/linux/linux-jlime-jornada7xx_2.6.18.bb +++ b/recipes/linux/linux-jlime-jornada7xx_2.6.18.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "JLime Linux kernel for Arm based Jornada 7xx" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" COMPATIBLE_HOST = "arm.*-linux" diff --git a/recipes/linux/linux-jlime-jornada7xx_2.6.19rc6.bb b/recipes/linux/linux-jlime-jornada7xx_2.6.19rc6.bb index a80f4c91a1..8d688ca54f 100644 --- a/recipes/linux/linux-jlime-jornada7xx_2.6.19rc6.bb +++ b/recipes/linux/linux-jlime-jornada7xx_2.6.19rc6.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "JLime Linux kernel for Arm based Jornada 7xx" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" COMPATIBLE_HOST = "arm.*-linux" diff --git a/recipes/linux/linux-jlime-jornada7xx_2.6.32+git.bb b/recipes/linux/linux-jlime-jornada7xx_2.6.32+git.bb index d8d09ac9c1..cc39c73925 100644 --- a/recipes/linux/linux-jlime-jornada7xx_2.6.32+git.bb +++ b/recipes/linux/linux-jlime-jornada7xx_2.6.32+git.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "JLime Linux kernel for Arm based Jornada 7xx" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" COMPATIBLE_HOST = "arm.*-linux" diff --git a/recipes/linux/linux-kirkwood_2.6.29.5.bb b/recipes/linux/linux-kirkwood_2.6.29.5.bb index f503829211..668c06aa81 100644 --- a/recipes/linux/linux-kirkwood_2.6.29.5.bb +++ b/recipes/linux/linux-kirkwood_2.6.29.5.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for Marvell Kirkwood based devices" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_MACHINE = "sheevaplug" require linux.inc diff --git a/recipes/linux/linux-kirkwood_2.6.30.5.bb b/recipes/linux/linux-kirkwood_2.6.30.5.bb index 84dbb8dbcc..699d973a72 100644 --- a/recipes/linux/linux-kirkwood_2.6.30.5.bb +++ b/recipes/linux/linux-kirkwood_2.6.30.5.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for Marvell Kirkwood based devices" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_MACHINE = "(openrd-base|sheevaplug)" require linux.inc diff --git a/recipes/linux/linux-kirkwood_2.6.31.bb b/recipes/linux/linux-kirkwood_2.6.31.bb index f046feaadd..56d0116bcc 100644 --- a/recipes/linux/linux-kirkwood_2.6.31.bb +++ b/recipes/linux/linux-kirkwood_2.6.31.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for Marvell Kirkwood based devices" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_MACHINE = "openrd-base" diff --git a/recipes/linux/linux-kirkwood_2.6.33-rc1.bb b/recipes/linux/linux-kirkwood_2.6.33-rc1.bb index d65eaf9520..893e349aca 100644 --- a/recipes/linux/linux-kirkwood_2.6.33-rc1.bb +++ b/recipes/linux/linux-kirkwood_2.6.33-rc1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for Marvell Kirkwood based devices" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_MACHINE = "openrd-base|openrd-client|sheevaplug" diff --git a/recipes/linux/linux-kirkwood_2.6.33-rc5.bb b/recipes/linux/linux-kirkwood_2.6.33-rc5.bb index b54add9102..cae7554077 100644 --- a/recipes/linux/linux-kirkwood_2.6.33-rc5.bb +++ b/recipes/linux/linux-kirkwood_2.6.33-rc5.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for Marvell Kirkwood based devices" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_MACHINE = "openrd-base|openrd-client|sheevaplug" diff --git a/recipes/linux/linux-ks8695_2.6.16.bb b/recipes/linux/linux-ks8695_2.6.16.bb index a357443fdb..81a745f526 100644 --- a/recipes/linux/linux-ks8695_2.6.16.bb +++ b/recipes/linux/linux-ks8695_2.6.16.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for Micrel KS8695(P) based devices" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ diff --git a/recipes/linux/linux-leviathan_git.bb b/recipes/linux/linux-leviathan_git.bb index 8ea4bfbb7b..2510a90bdb 100644 --- a/recipes/linux/linux-leviathan_git.bb +++ b/recipes/linux/linux-leviathan_git.bb @@ -1,10 +1,10 @@ require linux.inc +DEPENDS = "android-image-utils-native" PV = "2.6.32+${PR}+gitr${SRCREV}" -PR = "r0" +PR = "r1" COMPATIBLE_MACHINE = "htcdream" -# CMDLINE is irrelevant on this hardware as we need a special userland tool to cook the image CMDLINE = "console=tty0 no_console_suspend=1 root=/dev/mmcblk0p1 rootdelay=8 fbcon=rotate:1 panic=30 mem=110M" SRCREV_LAST_GOOD = "deabc32225429b3c0db44f7e62d95d0d2525290b" @@ -15,3 +15,11 @@ SRC_URI = "\ file://defconfig \ " S = "${WORKDIR}/git" + +do_deploy_append() { + touch -f empty + mkbootimg --kernel ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin \ + --ramdisk empty \ + --cmdline "${CMDLINE}" \ + --output ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.fastboot +} diff --git a/recipes/linux/linux-linkstationppc_2.6.28.4.bb b/recipes/linux/linux-linkstationppc_2.6.28.4.bb index 3c15d78e42..e86886e435 100644 --- a/recipes/linux/linux-linkstationppc_2.6.28.4.bb +++ b/recipes/linux/linux-linkstationppc_2.6.28.4.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for the Buffalo Linkstation HD/HG" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" DEPENDS = "dtc-native u-boot-mkimage-native" diff --git a/recipes/linux/linux-magicbox_2.6.18.6.bb b/recipes/linux/linux-magicbox_2.6.18.6.bb index bd9a1c4060..66c3e12a1e 100644 --- a/recipes/linux/linux-magicbox_2.6.18.6.bb +++ b/recipes/linux/linux-magicbox_2.6.18.6.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for Magicbox ver 1.1 and 2.0 router boards" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r2" DEPENDS = "u-boot" diff --git a/recipes/linux/linux-magicbox_2.6.19.2.bb b/recipes/linux/linux-magicbox_2.6.19.2.bb index 2c79a94e10..f8f967a990 100644 --- a/recipes/linux/linux-magicbox_2.6.19.2.bb +++ b/recipes/linux/linux-magicbox_2.6.19.2.bb @@ -2,7 +2,7 @@ # Released under the MIT license (see packages/COPYING) SECTION = "kernel" DESCRIPTION = "Linux kernel for Magicbox ver 1.1 and 2.0 router boards" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r3" DEPENDS = "u-boot" diff --git a/recipes/linux/linux-mainstone_2.6.25.bb b/recipes/linux/linux-mainstone_2.6.25.bb index f2d972dd78..499a71d09f 100644 --- a/recipes/linux/linux-mainstone_2.6.25.bb +++ b/recipes/linux/linux-mainstone_2.6.25.bb @@ -2,7 +2,7 @@ require linux.inc SECTION = "kernel" DESCRIPTION = "Linux kernel for the Mainstone (PXA270 ref design)" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \ diff --git a/recipes/linux/linux-mini2440_2.6.30+git.bb b/recipes/linux/linux-mini2440_2.6.30+git.bb index 09706e8bb5..9a87c1dfad 100644 --- a/recipes/linux/linux-mini2440_2.6.30+git.bb +++ b/recipes/linux/linux-mini2440_2.6.30+git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for mini2440 development board" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" MACHINE_KERNEL_PR = "r5" GGSRC = "http://www.xora.org.uk/oe/patches/" diff --git a/recipes/linux/linux-mini2440_2.6.31+git.bb b/recipes/linux/linux-mini2440_2.6.31+git.bb index 012fc07dd5..346ec0a6f2 100644 --- a/recipes/linux/linux-mini2440_2.6.31+git.bb +++ b/recipes/linux/linux-mini2440_2.6.31+git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for mini2440 / micro2440 development boards" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" require linux.inc diff --git a/recipes/linux/linux-ml403-mvista-2.6.x_git.bb b/recipes/linux/linux-ml403-mvista-2.6.x_git.bb index 59bcff431e..28b670844c 100644 --- a/recipes/linux/linux-ml403-mvista-2.6.x_git.bb +++ b/recipes/linux/linux-ml403-mvista-2.6.x_git.bb @@ -2,7 +2,7 @@ # Released under the MIT license (see packages/COPYING) SECTION = "kernel" DESCRIPTION = "Linux kernel for Xilinx ML403 Virtex 4 fpga board" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS = "git-native" PR = "r1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/linux/linux-mtx-1_2.4.27.bb b/recipes/linux/linux-mtx-1_2.4.27.bb index 952edb0140..3ed0b22569 100644 --- a/recipes/linux/linux-mtx-1_2.4.27.bb +++ b/recipes/linux/linux-mtx-1_2.4.27.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for MTX-1 (MeshCube)" HOMEPAGE = "http://meshcube.org/meshwiki/" -LICENSE = "GPL" +LICENSE = "GPLv2" KV = "${PV}" PR = "r11" inherit module-base kernel diff --git a/recipes/linux/linux-mtx-2_2.4.27.bb b/recipes/linux/linux-mtx-2_2.4.27.bb index 3379d548a1..4a0c87ecdb 100644 --- a/recipes/linux/linux-mtx-2_2.4.27.bb +++ b/recipes/linux/linux-mtx-2_2.4.27.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for MTX-2 (Surfbox2)" HOMEPAGE = "http://meshcube.org/meshwiki/" -LICENSE = "GPL" +LICENSE = "GPLv2" KV = "${PV}" PR = "r11" inherit module-base kernel diff --git a/recipes/linux/linux-mtx-3_2.6.15.4.bb b/recipes/linux/linux-mtx-3_2.6.15.4.bb index e3b23b1968..40e317a3bd 100644 --- a/recipes/linux/linux-mtx-3_2.6.15.4.bb +++ b/recipes/linux/linux-mtx-3_2.6.15.4.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for MTX-3 (Surfbox3)" HOMEPAGE = "http://meshcube.org/meshwiki/" -LICENSE = "GPL" +LICENSE = "GPLv2" KV = "${PV}" PR = "r11" diff --git a/recipes/linux/linux-mtx-3_2.6.15.bb b/recipes/linux/linux-mtx-3_2.6.15.bb index e1613d6f60..1fc44f4354 100644 --- a/recipes/linux/linux-mtx-3_2.6.15.bb +++ b/recipes/linux/linux-mtx-3_2.6.15.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for MTX-3 (Surfbox3)" HOMEPAGE = "http://meshcube.org/meshwiki/" -LICENSE = "GPL" +LICENSE = "GPLv2" KV = "${PV}" PR = "r11" inherit module-base kernel diff --git a/recipes/linux/linux-n1200_2.6.27-rc9+git.bb b/recipes/linux/linux-n1200_2.6.27-rc9+git.bb index 7674379a6b..cd01720dd0 100644 --- a/recipes/linux/linux-n1200_2.6.27-rc9+git.bb +++ b/recipes/linux/linux-n1200_2.6.27-rc9+git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for the Thecus n1200" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r3" DEPENDS = "u-boot-mkimage-native" COMPATIBLE_MACHINE = "n1200" diff --git a/recipes/linux/linux-navman_2.6.18.bb b/recipes/linux/linux-navman_2.6.18.bb index 2c9aef9e62..edeea9c911 100644 --- a/recipes/linux/linux-navman_2.6.18.bb +++ b/recipes/linux/linux-navman_2.6.18.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for Cirrus Logic ep39xx compatible machines" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" #DEPENDS = "u-boot" diff --git a/recipes/linux/linux-nokia800.inc b/recipes/linux/linux-nokia800.inc index 0f52b7c3b3..f6d14d58b4 100644 --- a/recipes/linux/linux-nokia800.inc +++ b/recipes/linux/linux-nokia800.inc @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for Nokia 770/800" -LICENSE = "GPL" +LICENSE = "GPLv2" inherit kernel diff --git a/recipes/linux/linux-omap-2.6_2.6.9-omap1.bb b/recipes/linux/linux-omap-2.6_2.6.9-omap1.bb index cdcdcdf825..e036cf2b56 100644 --- a/recipes/linux/linux-omap-2.6_2.6.9-omap1.bb +++ b/recipes/linux/linux-omap-2.6_2.6.9-omap1.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for OMAP processors" -LICENSE = "GPL" +LICENSE = "GPLv2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2 \ http://www.muru.com/linux/omap/patches/patch-2.6.9-omap1.bz2;patch=1 \ diff --git a/recipes/linux/linux-orion_2.6.28.4.bb b/recipes/linux/linux-orion_2.6.28.4.bb index c0a7d3c9af..eb27c6a2e4 100644 --- a/recipes/linux/linux-orion_2.6.28.4.bb +++ b/recipes/linux/linux-orion_2.6.28.4.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for Marvell Orion based devices" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" COMPATIBLE_MACHINE = "(dns323|mv2120|kuropro|lspro|tsx09|ts409)" diff --git a/recipes/linux/linux-palm-omap1_2.6.22-omap1.bb b/recipes/linux/linux-palm-omap1_2.6.22-omap1.bb index 16fe38bf5c..e9731734b7 100644 --- a/recipes/linux/linux-palm-omap1_2.6.22-omap1.bb +++ b/recipes/linux/linux-palm-omap1_2.6.22-omap1.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for OMAP1-based Palm devicess" -LICENSE = "GPL" +LICENSE = "GPLv2" COMPATIBLE_MACHINE = "(palmz71|palmtt|palmtt2)" diff --git a/recipes/linux/linux-rp.inc b/recipes/linux/linux-rp.inc index 041a095d91..18a6426c2f 100644 --- a/recipes/linux/linux-rp.inc +++ b/recipes/linux/linux-rp.inc @@ -1,6 +1,6 @@ DESCRIPTION = "2.6 Linux Development Kernel for Zaurus devices and iPAQ hx2750." SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" inherit kernel diff --git a/recipes/linux/linux-sequoia_2.6.21.bb b/recipes/linux/linux-sequoia_2.6.21.bb index 006fd3a51d..121d53035d 100644 --- a/recipes/linux/linux-sequoia_2.6.21.bb +++ b/recipes/linux/linux-sequoia_2.6.21.bb @@ -2,7 +2,7 @@ # Released under the MIT license (see packages/COPYING) SECTION = "kernel" DESCRIPTION = "Linux kernel for AMCC's Sequoia dev board" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" #DEPENDS = "u-boot" diff --git a/recipes/linux/linux-sgh-i900_2.6.32.bb b/recipes/linux/linux-sgh-i900_2.6.32.bb index 4b5df5b7aa..f509d124e6 100644 --- a/recipes/linux/linux-sgh-i900_2.6.32.bb +++ b/recipes/linux/linux-sgh-i900_2.6.32.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux 2.6.32 kernel for the Samsung Omnia SGH-i900." SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" RDEPENDS += "marvell-gspi-fw" diff --git a/recipes/linux/linux-smdk2440_2.6.20+git.bb b/recipes/linux/linux-smdk2440_2.6.20+git.bb index b86d970e50..e90274bc8b 100644 --- a/recipes/linux/linux-smdk2440_2.6.20+git.bb +++ b/recipes/linux/linux-smdk2440_2.6.20+git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for smdk2440 compatible machines" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" GGSRC = "http://www.xora.org.uk/oe/patches/" diff --git a/recipes/linux/linux-smdk2443_2.6.20+git.bb b/recipes/linux/linux-smdk2443_2.6.20+git.bb index 034137e89c..136c2ab0b5 100644 --- a/recipes/linux/linux-smdk2443_2.6.20+git.bb +++ b/recipes/linux/linux-smdk2443_2.6.20+git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for smdk2443 compatible machines" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS += "u-boot-mkimage-openmoko-native" PR = "r1" diff --git a/recipes/linux/linux-storcenter_2.6.27.7.bb b/recipes/linux/linux-storcenter_2.6.27.7.bb index b403cda2ab..a6f4ebc34f 100644 --- a/recipes/linux/linux-storcenter_2.6.27.7.bb +++ b/recipes/linux/linux-storcenter_2.6.27.7.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for the IOMega StorCenter" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r2" DEPENDS = "dtc-native" diff --git a/recipes/linux/linux-sun4cdm_2.4.26.bb b/recipes/linux/linux-sun4cdm_2.4.26.bb index 78a64d7aeb..4bde45fe4a 100644 --- a/recipes/linux/linux-sun4cdm_2.4.26.bb +++ b/recipes/linux/linux-sun4cdm_2.4.26.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for sparc32/sun4c" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" DEPENDS += "elftoaout-native" diff --git a/recipes/linux/linux-sun4cdm_2.6.8.1.bb b/recipes/linux/linux-sun4cdm_2.6.8.1.bb index 7b097a1610..55bf3ae5cf 100644 --- a/recipes/linux/linux-sun4cdm_2.6.8.1.bb +++ b/recipes/linux/linux-sun4cdm_2.6.8.1.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for sparc32/sun4c" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ diff --git a/recipes/linux/linux-titan-sh4_2.6.21.bb b/recipes/linux/linux-titan-sh4_2.6.21.bb index ef5ffad0db..77db8d177e 100644 --- a/recipes/linux/linux-titan-sh4_2.6.21.bb +++ b/recipes/linux/linux-titan-sh4_2.6.21.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for SH4 based TITAN (NP51R/LinkGear Series 100) router appliance" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ diff --git a/recipes/linux/linux-tornado-omap2_2.6.16.16.bb b/recipes/linux/linux-tornado-omap2_2.6.16.16.bb index 9c6e133c28..d7080b0cf3 100644 --- a/recipes/linux/linux-tornado-omap2_2.6.16.16.bb +++ b/recipes/linux/linux-tornado-omap2_2.6.16.16.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for HTC Tornado/Typhoon/Hurricane phones." SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ diff --git a/recipes/linux/linux-turbostation_2.6.20.2.bb b/recipes/linux/linux-turbostation_2.6.20.2.bb index 308c5e7a46..9ba6f38eb4 100644 --- a/recipes/linux/linux-turbostation_2.6.20.2.bb +++ b/recipes/linux/linux-turbostation_2.6.20.2.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for the QNAP TurboStation platform" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS = "u-boot-utils-native" PR = "r2" diff --git a/recipes/linux/linux-wrap-geode_2.6.17.bb b/recipes/linux/linux-wrap-geode_2.6.17.bb index 3d9b81a936..baf82fc216 100644 --- a/recipes/linux/linux-wrap-geode_2.6.17.bb +++ b/recipes/linux/linux-wrap-geode_2.6.17.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for PC-Engines WRAP which are \ Geode SC1100 (i486) based wirless router appliance boards" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ diff --git a/recipes/linux/linux-wrt_2.4.20.bb b/recipes/linux/linux-wrt_2.4.20.bb index 23a5d4f203..8b7450ed10 100644 --- a/recipes/linux/linux-wrt_2.4.20.bb +++ b/recipes/linux/linux-wrt_2.4.20.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the Linksys WRT54 devices" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-2.4.20.tar.bz2 \ diff --git a/recipes/linux/linux-wrt_2.4.30.bb b/recipes/linux/linux-wrt_2.4.30.bb index db285710b2..a2cd7e0e3b 100644 --- a/recipes/linux/linux-wrt_2.4.30.bb +++ b/recipes/linux/linux-wrt_2.4.30.bb @@ -2,7 +2,7 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the Linksys WRT54 devices" HOMEPAGE = "http://openwrt.org" DEPENDS = "lzma-native" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.4/linux-2.4.30.tar.bz2 \ diff --git a/recipes/linux/linux-x86_2.6.17.9.bb b/recipes/linux/linux-x86_2.6.17.9.bb index 829c884560..571492c199 100644 --- a/recipes/linux/linux-x86_2.6.17.9.bb +++ b/recipes/linux/linux-x86_2.6.17.9.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for x86 compatible machines" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ diff --git a/recipes/linux/linux-x86_2.6.20.bb b/recipes/linux/linux-x86_2.6.20.bb index 3872c50cba..bed6e21edf 100644 --- a/recipes/linux/linux-x86_2.6.20.bb +++ b/recipes/linux/linux-x86_2.6.20.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for x86 compatible machines" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r5" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 " diff --git a/recipes/linux/linux-xilinx-slab_git.bb b/recipes/linux/linux-xilinx-slab_git.bb index 2900ad9516..8e9bfba74f 100644 --- a/recipes/linux/linux-xilinx-slab_git.bb +++ b/recipes/linux/linux-xilinx-slab_git.bb @@ -3,7 +3,7 @@ # Released under the MIT license (see packages/COPYING) SECTION = "kernel" DESCRIPTION = "Linux kernel for Xilinx ML403 Virtex 4 fpga board" -LICENSE = "GPL" +LICENSE = "GPLv2" SRCREV = "d7ed933b578d9c4dec0e23a5a6f78c464b31c47c" diff --git a/recipes/linux/linux-xxs1500_2.4.21.bb b/recipes/linux/linux-xxs1500_2.4.21.bb index b4fab93669..ed6b7a0d90 100644 --- a/recipes/linux/linux-xxs1500_2.4.21.bb +++ b/recipes/linux/linux-xxs1500_2.4.21.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for mycable xxs1500" -LICENSE = "GPL" +LICENSE = "GPLv2" KV = "2.4.21" PV = "${KV}" diff --git a/recipes/linux/linux-z_2.6.20.bb b/recipes/linux/linux-z_2.6.20.bb index 8c5c940155..faf4ec37d5 100644 --- a/recipes/linux/linux-z_2.6.20.bb +++ b/recipes/linux/linux-z_2.6.20.bb @@ -1,6 +1,6 @@ DESCRIPTION = "2.6 Linux Development Kernel for the DNARD/Shark, SIMpad." SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" inherit kernel diff --git a/recipes/linux/linux.inc b/recipes/linux/linux.inc index 6c2ce3166a..8f9b323902 100644 --- a/recipes/linux/linux.inc +++ b/recipes/linux/linux.inc @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" inherit kernel @@ -38,6 +38,7 @@ KERNEL_DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts" KERNEL_DEVICETREE_mpc8315e-rdb = "arch/${ARCH}/boot/dts/mpc8315erdb.dts" KERNEL_DEVICETREE_mpc8323e-rdb = "arch/${ARCH}/boot/dts/mpc832x_rdb.dts" KERNEL_DEVICETREE_sequoia = "arch/${ARCH}/boot/dts/sequoia.dts" +KERNEL_DEVICETREE_p2020ds = "arch/${ARCH}/boot/dts/p2020ds.dts" KERNEL_DEVICETREE_FLAGS = "-R 8 -S 0x3000" diff --git a/recipes/linux/linux_2.6.14.bb b/recipes/linux/linux_2.6.14.bb index 702246bd8f..a7f4b0d3cd 100644 --- a/recipes/linux/linux_2.6.14.bb +++ b/recipes/linux/linux_2.6.14.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_acern30 = "1" diff --git a/recipes/linux/linux_2.6.33.bb b/recipes/linux/linux_2.6.33.bb index 589cdeebd2..13a499a4a2 100644 --- a/recipes/linux/linux_2.6.33.bb +++ b/recipes/linux/linux_2.6.33.bb @@ -5,6 +5,7 @@ PR="r1" # Mark archs/machines that this kernel supports DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_ts72xx = "-1" +DEFAULT_PREFERENCE_p2020ds = "1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/${P}.tar.bz2;name=kernel \ file://defconfig" diff --git a/recipes/linux/logicpd-pxa270_2.6.17-rc5.bb b/recipes/linux/logicpd-pxa270_2.6.17-rc5.bb index e7ab462c0b..33521aef9b 100644 --- a/recipes/linux/logicpd-pxa270_2.6.17-rc5.bb +++ b/recipes/linux/logicpd-pxa270_2.6.17-rc5.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the LogicPD Zoom(PXA270 ref design)" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r3" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/linux-2.6.17-rc5.tar.bz2 \ diff --git a/recipes/linux/logicpd-pxa270_2.6.19.2.bb b/recipes/linux/logicpd-pxa270_2.6.19.2.bb index 7a4eaae99b..5c508fd03a 100644 --- a/recipes/linux/logicpd-pxa270_2.6.19.2.bb +++ b/recipes/linux/logicpd-pxa270_2.6.19.2.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the LogicPD Zoom(PXA270 ref design)" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.19.2.tar.bz2 \ diff --git a/recipes/linux/mainstone-kernel_2.6.11.bb b/recipes/linux/mainstone-kernel_2.6.11.bb index cae3bf799c..e4a15b03c6 100644 --- a/recipes/linux/mainstone-kernel_2.6.11.bb +++ b/recipes/linux/mainstone-kernel_2.6.11.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the Mainstone (PXA270 ref design)" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.11.tar.bz2 \ diff --git a/recipes/linux/mainstone-kernel_2.6.18.bb b/recipes/linux/mainstone-kernel_2.6.18.bb index 290bb5911d..b7034f02a5 100644 --- a/recipes/linux/mainstone-kernel_2.6.18.bb +++ b/recipes/linux/mainstone-kernel_2.6.18.bb @@ -2,7 +2,7 @@ require linux.inc SECTION = "kernel" DESCRIPTION = "Linux kernel for the Mainstone (PXA270 ref design)" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ diff --git a/recipes/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb b/recipes/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb index b001763710..02dc68a110 100644 --- a/recipes/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb +++ b/recipes/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for MNCI device" -LICENSE = "GPL" +LICENSE = "GPLv2" DEPENDS = "modutils-cross virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX}" COMPATIBLE_MACHINE = "mnci" KV = "2.4.21" diff --git a/recipes/linux/mx21ads-kernel_2.6.19rc6.bb b/recipes/linux/mx21ads-kernel_2.6.19rc6.bb index bc8e6242a7..392f5e5b71 100644 --- a/recipes/linux/mx21ads-kernel_2.6.19rc6.bb +++ b/recipes/linux/mx21ads-kernel_2.6.19rc6.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the MX21ADS" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r2" PV = "2.6.18+2.6.19-rc6" diff --git a/recipes/linux/netbook-pro-kernel_2.6.17.bb b/recipes/linux/netbook-pro-kernel_2.6.17.bb index 37704dcb64..d95c2b10cc 100644 --- a/recipes/linux/netbook-pro-kernel_2.6.17.bb +++ b/recipes/linux/netbook-pro-kernel_2.6.17.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for Psion/Teklogix netbookpro compatible machines" SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r2" COMPATIBLE_MACHINE = "netbook-pro" diff --git a/recipes/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb b/recipes/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb index 547010996d..36eb4dba99 100644 --- a/recipes/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb +++ b/recipes/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for the SIEMENS SIMpad family of devices." SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" VRSV = "${@bb.data.getVar('PV',d,True).split('-')[1]}" PXAV = "${@bb.data.getVar('PV',d,True).split('-')[2]}" diff --git a/recipes/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb b/recipes/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb index d9324e9883..3ff820a7a9 100644 --- a/recipes/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb +++ b/recipes/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for the SIEMENS SIMpad family of devices." SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" VRSV = "${@bb.data.getVar('PV',d,True).split('-')[1]}" PXAV = "${@bb.data.getVar('PV',d,True).split('-')[2]}" diff --git a/recipes/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb b/recipes/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb index e65f293de8..daedc2c60b 100644 --- a/recipes/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb +++ b/recipes/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Linux kernel 2.4.20-embedix for Sharp Zaurus SL-C1000 and SL-C300 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-pxa27x-2.4.20-rmk2-embedix20050602" SECTION = "kernel" PV = "2.4.20-rmk2-embedix" -LICENSE = "GPL" +LICENSE = "GPLv2" KV = "2.4.20" PR = "r18" diff --git a/recipes/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc b/recipes/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc index 6428629316..2eb111d009 100644 --- a/recipes/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc +++ b/recipes/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc @@ -1,6 +1,6 @@ DESCRIPTION = "Linux kernel for OpenZaurus PXA processor based devices." SECTION = "kernel" -LICENSE = "GPL" +LICENSE = "GPLv2" PV = "2.4.18-rmk7-pxa3-embedix" PR = "r46" KV = "2.4.18" diff --git a/recipes/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb b/recipes/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb index 4c9e9a1840..afb62e3f96 100644 --- a/recipes/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb +++ b/recipes/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Linux kernel for OpenZaurus StrongArm processor based devices." SECTION = "kernel" PV = "2.4.18-rmk7-pxa3-embedix" -LICENSE = "GPL" +LICENSE = "GPLv2" KV = "2.4.18" RMKV = "7" PXAV = "3" diff --git a/recipes/linux/triton-kernel_2.6.11.bb b/recipes/linux/triton-kernel_2.6.11.bb index c580706b25..d51dc63319 100644 --- a/recipes/linux/triton-kernel_2.6.11.bb +++ b/recipes/linux/triton-kernel_2.6.11.bb @@ -1,6 +1,6 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the KARO TRITON XScale Board" -LICENSE = "GPL" +LICENSE = "GPLv2" PR = "r0" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ diff --git a/recipes/linux/xanadux-ba-2.6_2.6.12.bb b/recipes/linux/xanadux-ba-2.6_2.6.12.bb index 1e8274fa11..ecab935092 100644 --- a/recipes/linux/xanadux-ba-2.6_2.6.12.bb +++ b/recipes/linux/xanadux-ba-2.6_2.6.12.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Xanadux Blueangel kernel based on the hh 2.6.12" -LICENSE = "GPL" +LICENSE = "GPLv2" PR ="r0" SRC_URI = "cvs://anonymous@xanadux.cvs.sourceforge.net/cvsroot/xanadux;method=pserver;module=linux-2.6-xda;tag=K2-6-12-hh2-xda0-ba0" diff --git a/recipes/linux/xanadux-un-2.6_2.6.12.bb b/recipes/linux/xanadux-un-2.6_2.6.12.bb index 1cc983aa77..60e50139be 100644 --- a/recipes/linux/xanadux-un-2.6_2.6.12.bb +++ b/recipes/linux/xanadux-un-2.6_2.6.12.bb @@ -1,7 +1,7 @@ ############## /home/jrs/cvs/oe/org.openembedded.dev/packages/linux/xanadux-un-2.6_2.6.12.bb ############### DESCRIPTION = "Xanadux HTC-Universal kernel based on the hh 2.6.12" -LICENSE = "GPL" +LICENSE = "GPLv2" PR ="r2" SRC_URI = "cvs://anonymous@xanadux.cvs.sourceforge.net/cvsroot/xanadux;method=pserver;module=linux-2.6-xda;tag=K2-6-12-hh2-xda0-un0" diff --git a/recipes/lsh/lsh_1.5.5.bb b/recipes/lsh/lsh_2.0.4.bb index 284a0100eb..99d53583a5 100644 --- a/recipes/lsh/lsh_1.5.5.bb +++ b/recipes/lsh/lsh_2.0.4.bb @@ -5,7 +5,9 @@ DESCRIPTION = "lsh is a GNU GPL-licensed implementation of the SSH \ utility programs." DEPENDS = "zlib gmp liboop" -SRC_URI = "http://www.lysator.liu.se/~nisse/archive/lsh-${PV}.tar.gz" +SRC_URI = "http://www.lysator.liu.se/~nisse/archive/lsh-${PV}.tar.gz;name=src" +SRC_URI[src.md5sum] = "621f4442332bb772b92d397d17ccaf02" +SRC_URI[src.sha256sum] = "614b9d63e13ad3e162c82b6405d1f67713fc622a8bc11337e72949d613713091" S = "${WORKDIR}/lsh-${PV}" inherit autotools diff --git a/recipes/module-init-tools/module-init-tools.inc b/recipes/module-init-tools/module-init-tools.inc index 59e93d4533..9ad925f82b 100644 --- a/recipes/module-init-tools/module-init-tools.inc +++ b/recipes/module-init-tools/module-init-tools.inc @@ -1,7 +1,7 @@ DESCRIPTION = "This package contains a set of programs for loading, inserting, and \ removing kernel modules for Linux (versions 2.5.48 and above). It serves \ the same function that the modutils package serves for Linux 2.4." -LICENSE = "GPL" +LICENSE = "GPLv2" SECTION = "base" PR = "r5" diff --git a/recipes/mplayer/mplayer_svn.bb b/recipes/mplayer/mplayer_svn.bb index 1d7f30d4f4..dd94767167 100644 --- a/recipes/mplayer/mplayer_svn.bb +++ b/recipes/mplayer/mplayer_svn.bb @@ -39,7 +39,7 @@ RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" PV = "0.0+1.0rc3+svnr${SRCPV}" -PR = "r18" +PR = "r19" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_angstrom = "1" DEFAULT_PREFERENCE_shr = "1" diff --git a/recipes/musicbrainz/files/libmusicbrainz-3.0.2-gcc-4.4-fix.patch b/recipes/musicbrainz/files/libmusicbrainz-3.0.2-gcc-4.4-fix.patch new file mode 100644 index 0000000000..9500340479 --- /dev/null +++ b/recipes/musicbrainz/files/libmusicbrainz-3.0.2-gcc-4.4-fix.patch @@ -0,0 +1,12 @@ +upstream: http://bugs.musicbrainz.org/ticket/4301 + +--- libmusicbrainz-3.0.2/src/utils_private.cpp.orig 2008-07-02 08:57:10.000000000 +0200 ++++ libmusicbrainz-3.0.2/src/utils_private.cpp 2010-03-14 22:50:02.000000000 +0100 +@@ -20,6 +20,7 @@ + * $Id: utils_private.cpp 9934 2008-07-02 06:57:10Z luks $ + */ + ++#include <cstdio> + #include <cstdlib> + #include <cstring> + #include <cstdarg> diff --git a/recipes/musicbrainz/libmusicbrainz_3.0.2.bb b/recipes/musicbrainz/libmusicbrainz_3.0.2.bb index bd54419686..f7231a25b7 100644 --- a/recipes/musicbrainz/libmusicbrainz_3.0.2.bb +++ b/recipes/musicbrainz/libmusicbrainz_3.0.2.bb @@ -1 +1,6 @@ require ${PN}.inc + +PR = "r1" + +SRC_URI_append = " file://libmusicbrainz-3.0.2-gcc-4.4-fix.patch;patch=1" + diff --git a/recipes/mythtv/mythplugins_0.22+fixes.bb b/recipes/mythtv/mythplugins_0.22+fixes.bb index 7161ef3b08..eaf4fff132 100644 --- a/recipes/mythtv/mythplugins_0.22+fixes.bb +++ b/recipes/mythtv/mythplugins_0.22+fixes.bb @@ -11,10 +11,10 @@ DEPENDS_mythweb_lighttpd = "mythweb" RDEPENDS_mythweb_lighttpd = "lighttpd lighttpd-module-cgi lighttpd-module-fastcgi \ lighttpd-module-rewrite php-cgi lighttpd-module-auth" -PR = "svnr${SRCPV}+r2" +PR = "svnr${SRCPV}+r0" PV = "0.22" -SRCREV = "23565" +SRCREV = "23710" SRC_URI = "svn://svn.mythtv.org/svn/branches/release-0-22-fixes;module=mythplugins;proto=http \ file://sysroot.patch;patch=1 \ file://mythplugins_wo_qtopengl.diff;patch=1 \ diff --git a/recipes/mythtv/myththemes_0.22+fixes.bb b/recipes/mythtv/myththemes_0.22+fixes.bb index 53464c126d..2b4d8de943 100644 --- a/recipes/mythtv/myththemes_0.22+fixes.bb +++ b/recipes/mythtv/myththemes_0.22+fixes.bb @@ -1,10 +1,10 @@ DEPENDS = "mythtv" inherit qmake2 -PR = "svnr${SRCPV}+r2" +PR = "svnr${SRCPV}+r0" PV = "0.22" -SRCREV = "23565" +SRCREV = "23710" SRC_URI = \ "svn://svn.mythtv.org/svn/branches/release-0-22-fixes;module=myththemes;proto=http" diff --git a/recipes/mythtv/mythtv_0.22+fixes.bb b/recipes/mythtv/mythtv_0.22+fixes.bb index b4575b5ffc..35b884b2b1 100644 --- a/recipes/mythtv/mythtv_0.22+fixes.bb +++ b/recipes/mythtv/mythtv_0.22+fixes.bb @@ -8,7 +8,7 @@ RDEPENDS_${PN} = "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mytht mysql5-server mysql5-client libmysqlclient qt4-plugin-sqldriver-sqlmysql xmltv" RDEPENDS_${PN}_append_libc-glibc = " glibc-gconv-utf-16" -PR = "svnr${SRCPV}+r8" +PR = "svnr${SRCPV}+r0" PV = "0.22" # REALPV is here to support release candidates @@ -16,7 +16,7 @@ PV = "0.22" # but for packaging the real PV is needed REALPV = "0.22" -SRCREV = "23565" +SRCREV = "23710" SRC_URI = "svn://svn.mythtv.org/svn/branches/release-0-22-fixes;module=mythtv;proto=http" S = "${WORKDIR}/mythtv" diff --git a/recipes/netbase/netbase/bug20/hosts b/recipes/netbase/netbase/bug20/hosts new file mode 100644 index 0000000000..789d660fa7 --- /dev/null +++ b/recipes/netbase/netbase/bug20/hosts @@ -0,0 +1,3 @@ +127.0.0.1 localhost.localdomain localhost bug +10.10.10.1 bughost + diff --git a/recipes/netbase/netbase/bug20/interfaces b/recipes/netbase/netbase/bug20/interfaces new file mode 100644 index 0000000000..6e5f74eb45 --- /dev/null +++ b/recipes/netbase/netbase/bug20/interfaces @@ -0,0 +1,29 @@ +# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) + +# The loopback interface +auto lo +iface lo inet loopback + +# Ethernet/RNDIS gadget (g_ether) +# usbnet and static hwaddr for mac users +auto usb0 +iface usb0 inet static + hwaddress ether A2:80:F4:8A:3C:91 + address 10.10.10.10 + netmask 255.255.255.0 + gateway 10.10.10.1 + +# Wired interface +# BUGbase Ethernet which is built into kernel +# It is on USB but we rename it by udev rule +auto eth0 +iface eth0 inet dhcp + +# +# wireless interface +auto eth1 +iface eth1 inet dhcp + wireless_mode managed + wireless_essid any + wpa-driver wext + wpa-conf /etc/wpa_supplicant.conf diff --git a/recipes/netbase/netbase_4.21.bb b/recipes/netbase/netbase_4.21.bb index c8b4d19869..bb94399e86 100644 --- a/recipes/netbase/netbase_4.21.bb +++ b/recipes/netbase/netbase_4.21.bb @@ -1,8 +1,8 @@ DESCRIPTION = "This package provides the necessary \ infrastructure for basic TCP/IP based networking." SECTION = "base" -LICENSE = "GPL" -PR = "r40" +LICENSE = "GPLv2" +PR = "r41" inherit update-rc.d diff --git a/recipes/opkg/opkg.inc b/recipes/opkg/opkg.inc index b317de4cc3..9a3d3dc71b 100644 --- a/recipes/opkg/opkg.inc +++ b/recipes/opkg/opkg.inc @@ -1,10 +1,10 @@ DESCRIPTION = "Opkg Package Manager" DESCRIPTION_libopkg = "Opkg Package Manager Library" SECTION = "base" -LICENSE = "GPL" -DEPENDS = "curl gpgme" +LICENSE = "GPLv2" +DEPENDS = "curl gpgme openssl" PV = "0.1.6+svnr${SRCPV}" -INC_PR = "r20" +INC_PR = "r21" FILESPATHPKG =. "opkg:" diff --git a/recipes/opkg/opkg_svn.bb b/recipes/opkg/opkg_svn.bb index 4945260065..5138458498 100644 --- a/recipes/opkg/opkg_svn.bb +++ b/recipes/opkg/opkg_svn.bb @@ -1,7 +1,5 @@ require opkg.inc -DEPENDS_append = " openssl" - PR = "${INC_PR}" PROVIDES =+ "virtual/update-alternatives" diff --git a/recipes/orc/files/03_orcutils.patch b/recipes/orc/files/03_orcutils.patch new file mode 100644 index 0000000000..9d298a9578 --- /dev/null +++ b/recipes/orc/files/03_orcutils.patch @@ -0,0 +1,185 @@ +--- /dev/null 2010-02-01 20:37:03.729168572 +0100 ++++ b/orc/orcutils.c 2010-02-02 12:12:07.071430049 +0100 +@@ -0,0 +1,172 @@ ++/* ++ * ORC - Library of Optimized Inner Loops ++ * Copyright (c) 2003,2004 David A. Schleef <ds@schleef.org> ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR ++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED ++ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, ++ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES ++ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR ++ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, ++ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING ++ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE ++ * POSSIBILITY OF SUCH DAMAGE. ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++#include <orc/orcdebug.h> ++#include <orc/orcutils.h> ++ ++#include <fcntl.h> ++#include <stdlib.h> ++#include <string.h> ++ ++/** ++ * SECTION:orcutils ++ * @title: Utility functions ++ * @short_description: Orc utility functions ++ */ ++ ++int ++get_file_int (const char *file, int *value) ++{ ++ char buffer[20]; ++ char *endptr; ++ int fd; ++ int n; ++ ++ fd = open (file, O_RDONLY); ++ if (fd < 0) return 0; ++ ++ n = read(fd, buffer, 19); ++ close(fd); ++ if (n < 0) { ++ return 0; ++ } ++ buffer[n] = 0; ++ ++ *value = strtol (buffer, &endptr, 0); ++ ++ if (endptr[0] == 0 || endptr[0] == '\n') return 1; ++ return 0; ++} ++ ++char * ++get_file (const char *filename) ++{ ++ char *cpuinfo; ++ int fd; ++ int n; ++ ++ cpuinfo = malloc(4096); ++ if (cpuinfo == NULL) return NULL; ++ ++ fd = open(filename, O_RDONLY); ++ if (fd < 0) { ++ free (cpuinfo); ++ return NULL; ++ } ++ ++ n = read(fd, cpuinfo, 4095); ++ if (n < 0) { ++ free (cpuinfo); ++ close (fd); ++ return NULL; ++ } ++ cpuinfo[n] = 0; ++ ++ close (fd); ++ ++ return cpuinfo; ++} ++ ++char * ++get_cpuinfo_line (char *cpuinfo, const char *tag) ++{ ++ char *flags; ++ char *end; ++ char *colon; ++ ++ flags = strstr(cpuinfo,tag); ++ if (flags == NULL) return NULL; ++ ++ end = strchr(flags, '\n'); ++ if (end == NULL) return NULL; ++ colon = strchr (flags, ':'); ++ if (colon == NULL) return NULL; ++ colon++; ++ if(colon >= end) return NULL; ++ ++ return _strndup (colon, end-colon); ++} ++ ++char * ++_strndup (const char *s, int n) ++{ ++ char *r; ++ r = malloc (n+1); ++ memcpy(r,s,n); ++ r[n]=0; ++ ++ return r; ++} ++ ++char ** ++strsplit (char *s) ++{ ++ char **list = NULL; ++ char *tok; ++ int n = 0; ++ ++ while (*s == ' ') s++; ++ ++ list = malloc (1 * sizeof(char *)); ++ while (*s) { ++ tok = s; ++ while (*s && *s != ' ') s++; ++ ++ list[n] = _strndup (tok, s - tok); ++ while (*s && *s == ' ') s++; ++ list = realloc (list, (n + 2) * sizeof(char *)); ++ n++; ++ } ++ ++ list[n] = NULL; ++ return list; ++} ++ ++char * ++get_tag_value (char *s, const char *tag) ++{ ++ char *flags; ++ char *end; ++ char *colon; ++ ++ flags = strstr(s,tag); ++ if (flags == NULL) return NULL; ++ ++ end = strchr(flags, '\n'); ++ if (end == NULL) return NULL; ++ colon = strchr (flags, ':'); ++ if (colon == NULL) return NULL; ++ colon++; ++ if(colon >= end) return NULL; ++ ++ return _strndup (colon, end-colon); ++} ++ ++ +--- a/orc/Makefile.am 2010-02-02 12:13:47.091383078 +0100 ++++ b/orc/Makefile.am 2010-02-02 12:13:53.087383965 +0100 +@@ -13,6 +13,7 @@ + orc.c \ + orcexecutor.c \ + orcfunctions.c \ ++ orcutils.c \ + orcrule.c \ + orccodemem.c \ + orcprogram.c \ diff --git a/recipes/orc/files/99_autoreconf.patch b/recipes/orc/files/99_autoreconf.patch new file mode 100644 index 0000000000..7a2de2033c --- /dev/null +++ b/recipes/orc/files/99_autoreconf.patch @@ -0,0 +1,20549 @@ +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/aclocal.m4 orc-0.4.3/aclocal.m4 +--- orc-0.4.3.old/aclocal.m4 2009-12-14 02:20:07.000000000 +0100 ++++ orc-0.4.3/aclocal.m4 2010-02-02 12:18:12.191382009 +0100 +@@ -1,7 +1,7 @@ +-# generated automatically by aclocal 1.10.2 -*- Autoconf -*- ++# generated automatically by aclocal 1.11.1 -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -13,8 +13,8 @@ + + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, +-[m4_warning([this file was generated for autoconf 2.63. ++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, ++[m4_warning([this file was generated for autoconf 2.65. + You have another version of autoconf. It may work, but is not guaranteed to. + If you have problems, you may need to regenerate the build system entirely. + To do so, use the procedure documented by the package, typically `autoreconf'.])]) +@@ -31,10 +31,10 @@ + # generated from the m4 files accompanying Automake X.Y. + # (This private macro should not be called outside this file.) + AC_DEFUN([AM_AUTOMAKE_VERSION], +-[am__api_version='1.10' ++[am__api_version='1.11' + dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to + dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.10.2], [], ++m4_if([$1], [1.11.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl + ]) + +@@ -50,7 +50,7 @@ + # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. + # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.10.2])dnl ++[AM_AUTOMAKE_VERSION([1.11.1])dnl + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl + _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +@@ -132,14 +132,14 @@ + + # AM_CONDITIONAL -*- Autoconf -*- + +-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 ++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 + # 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. + +-# serial 8 ++# serial 9 + + # AM_CONDITIONAL(NAME, SHELL-CONDITION) + # ------------------------------------- +@@ -152,6 +152,7 @@ + AC_SUBST([$1_FALSE])dnl + _AM_SUBST_NOTMAKE([$1_TRUE])dnl + _AM_SUBST_NOTMAKE([$1_FALSE])dnl ++m4_define([_AM_COND_VALUE_$1], [$2])dnl + if $2; then + $1_TRUE= + $1_FALSE='#' +@@ -165,14 +166,14 @@ + Usually this means the macro was only invoked conditionally.]]) + fi])]) + +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 9 ++# serial 10 + + # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be + # written in clear, in which case automake, when reading aclocal.m4, +@@ -229,6 +230,16 @@ + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi ++ am__universal=false ++ m4_case([$1], [CC], ++ [case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac], ++ [CXX], ++ [case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac]) ++ + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and +@@ -246,7 +257,17 @@ + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs ++ am__obj=sub/conftest.${OBJEXT-o} ++ am__minus_obj="-o $am__obj" + case $depmode in ++ gcc) ++ # This depmode causes a compiler race in universal mode. ++ test "$am__universal" = false || continue ++ ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested +@@ -256,19 +277,23 @@ + break + fi + ;; ++ msvisualcpp | msvcmsys) ++ # This compiler won't grok `-c -o', but also, the minuso test has ++ # not run yet. These depmodes are late enough in the game, and ++ # so weak that their functioning should not be impacted. ++ am__obj=conftest.${OBJEXT-o} ++ am__minus_obj= ++ ;; + none) break ;; + esac +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. + if depmode=$depmode \ +- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message +@@ -418,13 +443,13 @@ + # Do all the work for Automake. -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005, 2006, 2008 Free Software Foundation, Inc. ++# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 13 ++# serial 16 + + # 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. +@@ -441,7 +466,7 @@ + # arguments mandatory, and then we can depend on a new Autoconf + # release and drop the old call support. + AC_DEFUN([AM_INIT_AUTOMAKE], +-[AC_PREREQ([2.60])dnl ++[AC_PREREQ([2.62])dnl + dnl Autoconf wants to disallow AM_ names. We explicitly allow + dnl the ones we care about. + m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +@@ -492,8 +517,8 @@ + AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) + AM_MISSING_PROG(AUTOHEADER, autoheader) + AM_MISSING_PROG(MAKEINFO, makeinfo) +-AM_PROG_INSTALL_SH +-AM_PROG_INSTALL_STRIP ++AC_REQUIRE([AM_PROG_INSTALL_SH])dnl ++AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl + AC_REQUIRE([AM_PROG_MKDIR_P])dnl + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. +@@ -501,24 +526,37 @@ + AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AM_SET_LEADING_DOT])dnl + _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], +- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], +- [_AM_PROG_TAR([v7])])]) ++ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], ++ [_AM_PROG_TAR([v7])])]) + _AM_IF_OPTION([no-dependencies],, + [AC_PROVIDE_IFELSE([AC_PROG_CC], +- [_AM_DEPENDENCIES(CC)], +- [define([AC_PROG_CC], +- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl ++ [_AM_DEPENDENCIES(CC)], ++ [define([AC_PROG_CC], ++ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [_AM_DEPENDENCIES(CXX)], +- [define([AC_PROG_CXX], +- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ++ [_AM_DEPENDENCIES(CXX)], ++ [define([AC_PROG_CXX], ++ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + AC_PROVIDE_IFELSE([AC_PROG_OBJC], +- [_AM_DEPENDENCIES(OBJC)], +- [define([AC_PROG_OBJC], +- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ++ [_AM_DEPENDENCIES(OBJC)], ++ [define([AC_PROG_OBJC], ++ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + ]) ++_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl ++dnl The `parallel-tests' driver may need to know about EXEEXT, so add the ++dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro ++dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. ++AC_CONFIG_COMMANDS_PRE(dnl ++[m4_provide_if([_AM_COMPILER_EXEEXT], ++ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + ]) + ++dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not ++dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further ++dnl mangled by Autoconf and run in a shell conditional statement. ++m4_define([_AC_COMPILER_EXEEXT], ++m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) ++ + + # When config.status generates a header, we must update the stamp-h file. + # This file resides in the same directory as the config header +@@ -541,7 +579,7 @@ + done + echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -552,7 +590,14 @@ + # Define $install_sh. + AC_DEFUN([AM_PROG_INSTALL_SH], + [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} ++if test x"${install_sh}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; ++ *) ++ install_sh="\${SHELL} $am_aux_dir/install-sh" ++ esac ++fi + AC_SUBST(install_sh)]) + + # Copyright (C) 2003, 2005 Free Software Foundation, Inc. +@@ -579,27 +624,38 @@ + # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- + # From Jim Meyering + +-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 ++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 + # 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. + +-# serial 4 ++# serial 5 + ++# AM_MAINTAINER_MODE([DEFAULT-MODE]) ++# ---------------------------------- ++# Control maintainer-specific portions of Makefiles. ++# Default is to disable them, unless `enable' is passed literally. ++# For symmetry, `disable' may be passed as well. Anyway, the user ++# can override the default with the --enable/--disable switch. + AC_DEFUN([AM_MAINTAINER_MODE], +-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) +- dnl maintainer-mode is disabled by default +- AC_ARG_ENABLE(maintainer-mode, +-[ --enable-maintainer-mode enable make rules and dependencies not useful ++[m4_case(m4_default([$1], [disable]), ++ [enable], [m4_define([am_maintainer_other], [disable])], ++ [disable], [m4_define([am_maintainer_other], [enable])], ++ [m4_define([am_maintainer_other], [enable]) ++ m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) ++AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) ++ dnl maintainer-mode's default is 'disable' unless 'enable' is passed ++ AC_ARG_ENABLE([maintainer-mode], ++[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful + (and sometimes confusing) to the casual installer], +- USE_MAINTAINER_MODE=$enableval, +- USE_MAINTAINER_MODE=no) ++ [USE_MAINTAINER_MODE=$enableval], ++ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) +- AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) ++ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE +- AC_SUBST(MAINT)dnl ++ AC_SUBST([MAINT])dnl + ] + ) + +@@ -607,13 +663,13 @@ + + # Check to see how 'make' treats includes. -*- Autoconf -*- + +-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. ++# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 3 ++# serial 4 + + # AM_MAKE_INCLUDE() + # ----------------- +@@ -622,7 +678,7 @@ + [am_make=${MAKE-make} + cat > confinc << 'END' + am__doit: +- @echo done ++ @echo this is the am__doit target + .PHONY: am__doit + END + # If we don't find an include directive, just comment out the code. +@@ -632,24 +688,24 @@ + _am_result=none + # First try GNU make style include. + echo "include confinc" > confmf +-# We grep out `Entering directory' and `Leaving directory' +-# messages which can occur if `w' ends up in MAKEFLAGS. +-# In particular we don't look at `^make:' because GNU make might +-# be invoked under some other name (usually "gmake"), in which +-# case it prints its new name instead of `make'. +-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then +- am__include=include +- am__quote= +- _am_result=GNU +-fi ++# Ignore all kinds of additional output from `make'. ++case `$am_make -s -f confmf 2> /dev/null` in #( ++*the\ am__doit\ target*) ++ am__include=include ++ am__quote= ++ _am_result=GNU ++ ;; ++esac + # Now try BSD make style include. + if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf +- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then +- am__include=.include +- am__quote="\"" +- _am_result=BSD +- fi ++ case `$am_make -s -f confmf 2> /dev/null` in #( ++ *the\ am__doit\ target*) ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ ;; ++ esac + fi + AC_SUBST([am__include]) + AC_SUBST([am__quote]) +@@ -659,14 +715,14 @@ + + # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 ++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 + # 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. + +-# serial 5 ++# serial 6 + + # AM_MISSING_PROG(NAME, PROGRAM) + # ------------------------------ +@@ -683,7 +739,14 @@ + AC_DEFUN([AM_MISSING_HAS_RUN], + [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl + AC_REQUIRE_AUX_FILE([missing])dnl +-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" ++if test x"${MISSING+set}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; ++ *) ++ MISSING="\${SHELL} $am_aux_dir/missing" ;; ++ esac ++fi + # Use eval to expand $SHELL + if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +@@ -754,14 +817,14 @@ + + # Check to make sure that the build environment is sane. -*- Autoconf -*- + +-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 ++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 + # 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. + +-# serial 4 ++# serial 5 + + # AM_SANITY_CHECK + # --------------- +@@ -770,16 +833,29 @@ + # Just in case + sleep 1 + echo timestamp > conftest.file ++# Reject unsafe characters in $srcdir or the absolute working directory ++# name. Accept space and tab only in the latter. ++am_lf=' ++' ++case `pwd` in ++ *[[\\\"\#\$\&\'\`$am_lf]]*) ++ AC_MSG_ERROR([unsafe absolute working directory name]);; ++esac ++case $srcdir in ++ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) ++ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; ++esac ++ + # 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 conftest.file 2> /dev/null` ++ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. +- set X `ls -t $srcdir/configure conftest.file` ++ set X `ls -t "$srcdir/configure" conftest.file` + fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ +@@ -832,18 +908,25 @@ + INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +-# Copyright (C) 2006 Free Software Foundation, Inc. ++# Copyright (C) 2006, 2008 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. + ++# serial 2 ++ + # _AM_SUBST_NOTMAKE(VARIABLE) + # --------------------------- + # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. + # This macro is traced by Automake. + AC_DEFUN([_AM_SUBST_NOTMAKE]) + ++# AM_SUBST_NOTMAKE(VARIABLE) ++# --------------------------- ++# Public sister of _AM_SUBST_NOTMAKE. ++AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) ++ + # Check how to create a tarball. -*- Autoconf -*- + + # Copyright (C) 2004, 2005 Free Software Foundation, Inc. +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/config.h.in orc-0.4.3/config.h.in +--- orc-0.4.3.old/config.h.in 2009-12-14 02:20:10.000000000 +0100 ++++ orc-0.4.3/config.h.in 2010-02-02 12:18:13.000000000 +0100 +@@ -69,6 +69,9 @@ + /* Define to 1 if you have the <string.h> header file. */ + #undef HAVE_STRING_H + ++/* Define to 1 if you have the <sys/param.h> header file. */ ++#undef HAVE_SYS_PARAM_H ++ + /* Define to 1 if you have the <sys/stat.h> header file. */ + #undef HAVE_SYS_STAT_H + +@@ -109,6 +112,9 @@ + /* Define to the one symbol short name of this package. */ + #undef PACKAGE_TARNAME + ++/* Define to the home page for this package. */ ++#undef PACKAGE_URL ++ + /* Define to the version of this package. */ + #undef PACKAGE_VERSION + +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/configure orc-0.4.3/configure +--- orc-0.4.3.old/configure 2009-12-14 02:20:09.000000000 +0100 ++++ orc-0.4.3/configure 2010-02-02 12:18:13.131377589 +0100 +@@ -1,18 +1,22 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.63 for orc 0.4.3. ++# Generated by GNU Autoconf 2.65 for orc 0.4.3. ++# + # + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. ++# ++# + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. +-## --------------------- ## +-## M4sh Initialization. ## +-## --------------------- ## ++## -------------------- ## ++## M4sh Initialization. ## ++## -------------------- ## + + # Be more Bourne compatible + DUALCASE=1; export DUALCASE # for MKS sh +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which +@@ -20,23 +24,15 @@ + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; ++ case `(set -o) 2>/dev/null` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; + esac +- + fi + + +- +- +-# PATH needs CR +-# Avoid depending upon Character Ranges. +-as_cr_letters='abcdefghijklmnopqrstuvwxyz' +-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +-as_cr_Letters=$as_cr_letters$as_cr_LETTERS +-as_cr_digits='0123456789' +-as_cr_alnum=$as_cr_Letters$as_cr_digits +- + as_nl=' + ' + export as_nl +@@ -44,7 +40,13 @@ + as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo + as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then ++# Prefer a ksh shell builtin over an external printf program on Solaris, ++# but without wasting forks for bash or zsh. ++if test -z "$BASH_VERSION$ZSH_VERSION" \ ++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='print -r --' ++ as_echo_n='print -rn --' ++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' + else +@@ -55,7 +57,7 @@ + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; +- case $arg in ++ case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; +@@ -78,13 +80,6 @@ + } + fi + +-# Support unset when possible. +-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +- as_unset=unset +-else +- as_unset=false +-fi +- + + # IFS + # We need space, tab and new line, in precisely that order. Quoting is +@@ -94,15 +89,15 @@ + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +-case $0 in ++case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +-done ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++ done + IFS=$as_save_IFS + + ;; +@@ -114,12 +109,16 @@ + fi + if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 +- { (exit 1); exit 1; } ++ exit 1 + fi + +-# Work around bugs in pre-3.0 UWIN ksh. +-for as_var in ENV MAIL MAILPATH +-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++# Unset variables that we do not need and which cause bugs (e.g. in ++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" ++# suppresses any "Segmentation fault" message there. '((' could ++# trigger a bug in pdksh 5.2.14. ++for as_var in BASH_ENV ENV MAIL MAILPATH ++do eval test x\${$as_var+set} = xset \ ++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : + done + PS1='$ ' + PS2='> ' +@@ -131,330 +130,299 @@ + LANGUAGE=C + export LANGUAGE + +-# Required to use basename. +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi +- +-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then +- as_basename=basename +-else +- as_basename=false +-fi +- +- +-# Name of the executable. +-as_me=`$as_basename -- "$0" || +-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ +- X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X/"$0" | +- sed '/^.*\/\([^/][^/]*\)\/*$/{ +- s//\1/ +- q +- } +- /^X\/\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\/\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- + # CDPATH. +-$as_unset CDPATH +- ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + if test "x$CONFIG_SHELL" = x; then +- if (eval ":") 2>/dev/null; then +- as_have_required=yes ++ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : ++ emulate sh ++ NULLCMD=: ++ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '\${1+\"\$@\"}'='\"\$@\"' ++ setopt NO_GLOB_SUBST + else +- as_have_required=no ++ case \`(set -o) 2>/dev/null\` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; ++esac + fi +- +- if test $as_have_required = yes && (eval ": +-(as_func_return () { +- (exit \$1) +-} +-as_func_success () { +- as_func_return 0 +-} +-as_func_failure () { +- as_func_return 1 +-} +-as_func_ret_success () { +- return 0 +-} +-as_func_ret_failure () { +- return 1 +-} ++" ++ as_required="as_fn_return () { (exit \$1); } ++as_fn_success () { as_fn_return 0; } ++as_fn_failure () { as_fn_return 1; } ++as_fn_ret_success () { return 0; } ++as_fn_ret_failure () { return 1; } + + exitcode=0 +-if as_func_success; then +- : +-else +- exitcode=1 +- echo as_func_success failed. +-fi +- +-if as_func_failure; then +- exitcode=1 +- echo as_func_failure succeeded. +-fi +- +-if as_func_ret_success; then +- : +-else +- exitcode=1 +- echo as_func_ret_success failed. +-fi +- +-if as_func_ret_failure; then +- exitcode=1 +- echo as_func_ret_failure succeeded. +-fi +- +-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then +- : ++as_fn_success || { exitcode=1; echo as_fn_success failed.; } ++as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } ++as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } ++as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } ++if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : ++ ++else ++ exitcode=1; echo positional parameters were not saved. ++fi ++test x\$exitcode = x0 || exit 1" ++ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO ++ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO ++ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && ++ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 ++test \$(( 1 + 1 )) = 2 || exit 1" ++ if (eval "$as_required") 2>/dev/null; then : ++ as_have_required=yes + else +- exitcode=1 +- echo positional parameters were not saved. ++ as_have_required=no + fi ++ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + +-test \$exitcode = 0) || { (exit 1); exit 1; } +- +-( +- as_lineno_1=\$LINENO +- as_lineno_2=\$LINENO +- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && +- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +-") 2> /dev/null; then +- : + else +- as_candidate_shells= +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++as_found=false + for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- case $as_dir in ++ as_found=: ++ case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do +- as_candidate_shells="$as_candidate_shells $as_dir/$as_base" ++ # Try only shells that exist, to save several forks. ++ as_shell=$as_dir/$as_base ++ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && ++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : ++ CONFIG_SHELL=$as_shell as_have_required=yes ++ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : ++ break 2 ++fi ++fi + done;; + esac ++ as_found=false + done ++$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && ++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : ++ CONFIG_SHELL=$SHELL as_have_required=yes ++fi; } + IFS=$as_save_IFS + + +- for as_shell in $as_candidate_shells $SHELL; do +- # Try only shells that exist, to save several forks. +- if { test -f "$as_shell" || test -f "$as_shell.exe"; } && +- { ("$as_shell") 2> /dev/null <<\_ASEOF +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +- emulate sh +- NULLCMD=: +- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which +- # is contrary to our usage. Disable this feature. +- alias -g '${1+"$@"}'='"$@"' +- setopt NO_GLOB_SUBST +-else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; +-esac +- +-fi +- +- +-: +-_ASEOF +-}; then +- CONFIG_SHELL=$as_shell +- as_have_required=yes +- if { "$as_shell" 2> /dev/null <<\_ASEOF +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +- emulate sh +- NULLCMD=: +- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which +- # is contrary to our usage. Disable this feature. +- alias -g '${1+"$@"}'='"$@"' +- setopt NO_GLOB_SUBST +-else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; +-esac +- +-fi +- +- +-: +-(as_func_return () { +- (exit $1) +-} +-as_func_success () { +- as_func_return 0 +-} +-as_func_failure () { +- as_func_return 1 +-} +-as_func_ret_success () { +- return 0 +-} +-as_func_ret_failure () { +- return 1 +-} +- +-exitcode=0 +-if as_func_success; then +- : +-else +- exitcode=1 +- echo as_func_success failed. +-fi +- +-if as_func_failure; then +- exitcode=1 +- echo as_func_failure succeeded. +-fi +- +-if as_func_ret_success; then +- : +-else +- exitcode=1 +- echo as_func_ret_success failed. +-fi +- +-if as_func_ret_failure; then +- exitcode=1 +- echo as_func_ret_failure succeeded. +-fi +- +-if ( set x; as_func_ret_success y && test x = "$1" ); then +- : +-else +- exitcode=1 +- echo positional parameters were not saved. +-fi +- +-test $exitcode = 0) || { (exit 1); exit 1; } +- +-( +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } +- +-_ASEOF +-}; then +- break +-fi +- +-fi +- +- done +- +- if test "x$CONFIG_SHELL" != x; then +- for as_var in BASH_ENV ENV +- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +- done ++ if test "x$CONFIG_SHELL" != x; then : ++ # We cannot yet assume a decent shell, so we have to provide a ++ # neutralization value for shells without unset; and this also ++ # works around shells that cannot unset nonexistent variables. ++ BASH_ENV=/dev/null ++ ENV=/dev/null ++ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + fi + +- +- if test $as_have_required = no; then +- echo This script requires a shell more modern than all the +- echo shells that I found on your system. Please install a +- echo modern shell, or manually run the script under such a +- echo shell if you do have one. +- { (exit 1); exit 1; } ++ if test x$as_have_required = xno; then : ++ $as_echo "$0: This script requires a shell more modern than all" ++ $as_echo "$0: the shells that I found on your system." ++ if test x${ZSH_VERSION+set} = xset ; then ++ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" ++ $as_echo "$0: be upgraded to zsh 4.3.4 or later." ++ else ++ $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, ++$0: including any error possibly output before this ++$0: message. Then install a modern shell, or manually run ++$0: the script under such a shell if you do have one." ++ fi ++ exit 1 + fi +- +- + fi +- + fi ++SHELL=${CONFIG_SHELL-/bin/sh} ++export SHELL ++# Unset more variables known to interfere with behavior of common tools. ++CLICOLOR_FORCE= GREP_OPTIONS= ++unset CLICOLOR_FORCE GREP_OPTIONS ++ ++## --------------------- ## ++## M4sh Shell Functions. ## ++## --------------------- ## ++# as_fn_unset VAR ++# --------------- ++# Portably unset VAR. ++as_fn_unset () ++{ ++ { eval $1=; unset $1;} ++} ++as_unset=as_fn_unset ++ ++# as_fn_set_status STATUS ++# ----------------------- ++# Set $? to STATUS, without forking. ++as_fn_set_status () ++{ ++ return $1 ++} # as_fn_set_status ++ ++# as_fn_exit STATUS ++# ----------------- ++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. ++as_fn_exit () ++{ ++ set +e ++ as_fn_set_status $1 ++ exit $1 ++} # as_fn_exit ++ ++# as_fn_mkdir_p ++# ------------- ++# Create "$as_dir" as a directory, including parents if necessary. ++as_fn_mkdir_p () ++{ + ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || eval $as_mkdir_p || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ test -d "$as_dir" && break ++ done ++ test -z "$as_dirs" || eval "mkdir $as_dirs" ++ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + + +-(eval "as_func_return () { +- (exit \$1) +-} +-as_func_success () { +- as_func_return 0 +-} +-as_func_failure () { +- as_func_return 1 +-} +-as_func_ret_success () { +- return 0 +-} +-as_func_ret_failure () { +- return 1 +-} ++} # as_fn_mkdir_p ++# as_fn_append VAR VALUE ++# ---------------------- ++# Append the text in VALUE to the end of the definition contained in VAR. Take ++# advantage of any shell optimizations that allow amortized linear growth over ++# repeated appends, instead of the typical quadratic growth present in naive ++# implementations. ++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ++ eval 'as_fn_append () ++ { ++ eval $1+=\$2 ++ }' ++else ++ as_fn_append () ++ { ++ eval $1=\$$1\$2 ++ } ++fi # as_fn_append + +-exitcode=0 +-if as_func_success; then +- : ++# as_fn_arith ARG... ++# ------------------ ++# Perform arithmetic evaluation on the ARGs, and store the result in the ++# global $as_val. Take advantage of shells that can avoid forks. The arguments ++# must be portable across $(()) and expr. ++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ++ eval 'as_fn_arith () ++ { ++ as_val=$(( $* )) ++ }' + else +- exitcode=1 +- echo as_func_success failed. +-fi ++ as_fn_arith () ++ { ++ as_val=`expr "$@" || test $? -eq 1` ++ } ++fi # as_fn_arith + +-if as_func_failure; then +- exitcode=1 +- echo as_func_failure succeeded. +-fi + +-if as_func_ret_success; then +- : ++# as_fn_error ERROR [LINENO LOG_FD] ++# --------------------------------- ++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are ++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the ++# script with status $?, using 1 if that was 0. ++as_fn_error () ++{ ++ as_status=$?; test $as_status -eq 0 && as_status=1 ++ if test "$3"; then ++ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ fi ++ $as_echo "$as_me: error: $1" >&2 ++ as_fn_exit $as_status ++} # as_fn_error ++ ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then ++ as_expr=expr + else +- exitcode=1 +- echo as_func_ret_success failed. ++ as_expr=false + fi + +-if as_func_ret_failure; then +- exitcode=1 +- echo as_func_ret_failure succeeded. ++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then ++ as_basename=basename ++else ++ as_basename=false + fi + +-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then +- : ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname + else +- exitcode=1 +- echo positional parameters were not saved. ++ as_dirname=false + fi + +-test \$exitcode = 0") || { +- echo No shell found that supports shell functions. +- echo Please tell bug-autoconf@gnu.org about your system, +- echo including any error possibly output before this message. +- echo This can help us improve future autoconf versions. +- echo Configuration will now proceed without shell functions. +-} ++as_me=`$as_basename -- "$0" || ++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X/"$0" | ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` + ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits + + +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { +- +- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO +- # uniformly replaced by the line number. The first 'sed' inserts a +- # line-number line after each line using $LINENO; the second 'sed' +- # does the real work. The second script uses 'N' to pair each +- # line-number line with the line containing $LINENO, and appends +- # trailing '-' during substitution so that $LINENO is not a special +- # case at line end. +- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +- # scripts with optimization help from Paolo Bonzini. Blame Lee +- # E. McMahon (1931-1989) for sed's syntax. :-) ++ as_lineno_1=$LINENO as_lineno_1a=$LINENO ++ as_lineno_2=$LINENO as_lineno_2a=$LINENO ++ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && ++ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { ++ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= +@@ -471,8 +439,7 @@ + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || +- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 +- { (exit 1); exit 1; }; } ++ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the +@@ -482,29 +449,18 @@ + exit + } + +- +-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then +- as_dirname=dirname +-else +- as_dirname=false +-fi +- + ECHO_C= ECHO_N= ECHO_T= +-case `echo -n x` in ++case `echo -n x` in #((((( + -n*) +- case `echo 'x\c'` in ++ case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. +- *) ECHO_C='\c';; ++ xy) ECHO_C='\c';; ++ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null ++ ECHO_T=' ';; + esac;; + *) + ECHO_N='-n';; + esac +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi + + rm -f conf$$ conf$$.exe conf$$.file + if test -d conf$$.dir; then +@@ -534,7 +490,7 @@ + rmdir conf$$.dir 2>/dev/null + + if mkdir -p . 2>/dev/null; then +- as_mkdir_p=: ++ as_mkdir_p='mkdir -p "$as_dir"' + else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +@@ -553,10 +509,10 @@ + if test -d "$1"; then + test -d "$1/."; + else +- case $1 in ++ case $1 in #( + -*)set "./$1";; + esac; +- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +@@ -571,7 +527,6 @@ + + + +- + # Check that we are running under the correct shell. + SHELL=${CONFIG_SHELL-/bin/sh} + +@@ -720,7 +675,8 @@ + + + +-exec 7<&0 </dev/null 6>&1 ++test -n "$DJDIR" || exec 7<&0 </dev/null ++exec 6>&1 + + # Name of the host. + # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +@@ -738,7 +694,6 @@ + subdirs= + MFLAGS= + MAKEFLAGS= +-SHELL=${CONFIG_SHELL-/bin/sh} + + # Identity of this package. + PACKAGE_NAME='orc' +@@ -746,6 +701,7 @@ + PACKAGE_VERSION='0.4.3' + PACKAGE_STRING='orc 0.4.3' + PACKAGE_BUGREPORT='' ++PACKAGE_URL='' + + # Factoring default headers for most tests. + ac_includes_default="\ +@@ -784,7 +740,10 @@ + #endif" + + ac_unique_file="orc/orc.h" +-ac_subst_vars='LTLIBOBJS ++ac_header_list= ++ac_subst_vars='am__EXEEXT_FALSE ++am__EXEEXT_TRUE ++LTLIBOBJS + LIBOBJS + orcbindir + pkgconfigdir +@@ -922,6 +881,7 @@ + program_transform_name + prefix + exec_prefix ++PACKAGE_URL + PACKAGE_BUGREPORT + PACKAGE_STRING + PACKAGE_VERSION +@@ -1063,8 +1023,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1090,8 +1049,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1295,8 +1253,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1312,8 +1269,7 @@ + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in +@@ -1343,17 +1299,17 @@ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + +- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option +-Try \`$0 --help' for more information." >&2 +- { (exit 1); exit 1; }; } ++ -*) as_fn_error "unrecognized option: \`$ac_option' ++Try \`$0 --help' for more information." + ;; + + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. +- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 +- { (exit 1); exit 1; }; } ++ case $ac_envvar in #( ++ '' | [0-9]* | *[!_$as_cr_alnum]* ) ++ as_fn_error "invalid variable name: \`$ac_envvar'" ;; ++ esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + +@@ -1370,15 +1326,13 @@ + + if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` +- { $as_echo "$as_me: error: missing argument to $ac_option" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "missing argument to $ac_option" + fi + + if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; +- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 +- { (exit 1); exit 1; }; } ;; ++ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac + fi +@@ -1401,8 +1355,7 @@ + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac +- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + done + + # There might be people who depend on the old broken behavior: `$host' +@@ -1432,11 +1385,9 @@ + ac_pwd=`pwd` && test -n "$ac_pwd" && + ac_ls_di=`ls -di .` && + ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || +- { $as_echo "$as_me: error: working directory cannot be determined" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "working directory cannot be determined" + test "X$ac_ls_di" = "X$ac_pwd_ls_di" || +- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "pwd does not report name of working directory" + + + # Find the source files, if location was not specified. +@@ -1475,13 +1426,11 @@ + fi + if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." +- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 +- { (exit 1); exit 1; }; } ++ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + fi + ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" + ac_abs_confdir=`( +- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 +- { (exit 1); exit 1; }; } ++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + pwd)` + # When building in place, set srcdir=. + if test "$ac_abs_confdir" = "$ac_pwd"; then +@@ -1594,7 +1543,7 @@ + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors + --disable-libtool-lock avoid locking (might break parallel builds) +- --enable-gtk-doc use gtk-doc to build documentation [default=no] ++ --enable-gtk-doc use gtk-doc to build documentation [[default=no]] + + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] +@@ -1610,7 +1559,7 @@ + LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a + nonstandard directory <lib dir> + LIBS libraries to pass to the linker, e.g. -l<library> +- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if ++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if + you have headers in a nonstandard directory <include dir> + CPP C preprocessor + CCAS assembler compiler command (defaults to CC) +@@ -1620,6 +1569,7 @@ + Use these variables to override the choices made by `configure' or to help + it to find libraries and programs with nonstandard names/locations. + ++Report bugs to the package provider. + _ACEOF + ac_status=$? + fi +@@ -1683,427 +1633,984 @@ + if $ac_init_version; then + cat <<\_ACEOF + orc configure 0.4.3 +-generated by GNU Autoconf 2.63 ++generated by GNU Autoconf 2.65 + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++Copyright (C) 2009 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + _ACEOF + exit + fi +-cat >config.log <<_ACEOF +-This file contains any messages produced by compilers while +-running configure, to aid debugging if configure makes a mistake. + +-It was created by orc $as_me 0.4.3, which was +-generated by GNU Autoconf 2.63. Invocation command line was ++## ------------------------ ## ++## Autoconf initialization. ## ++## ------------------------ ## ++ ++# ac_fn_c_try_compile LINENO ++# -------------------------- ++# Try to compile conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext ++ if { { ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compile") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +- $ $0 $@ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval + +-_ACEOF +-exec 5>>config.log ++} # ac_fn_c_try_compile ++ ++# ac_fn_c_try_link LINENO ++# ----------------------- ++# Try to link conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_link () + { +-cat <<_ASUNAME +-## --------- ## +-## Platform. ## +-## --------- ## ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext conftest$ac_exeext ++ if { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +-uname -m = `(uname -m) 2>/dev/null || echo unknown` +-uname -r = `(uname -r) 2>/dev/null || echo unknown` +-uname -s = `(uname -s) 2>/dev/null || echo unknown` +-uname -v = `(uname -v) 2>/dev/null || echo unknown` ++ ac_retval=1 ++fi ++ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information ++ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would ++ # interfere with the next link command; also delete a directory that is ++ # left behind by Apple's compiler. We do this before executing the actions. ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval + +-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` ++} # ac_fn_c_try_link + +-/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +-/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +-/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +-/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` ++# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES ++# ------------------------------------------------------- ++# Tests whether HEADER exists and can be compiled using the include files in ++# INCLUDES, setting the cache variable VAR accordingly. ++ac_fn_c_check_header_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++#include <$2> ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +-_ASUNAME ++} # ac_fn_c_check_header_compile + +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- $as_echo "PATH: $as_dir" +-done +-IFS=$as_save_IFS ++# ac_fn_c_try_cpp LINENO ++# ---------------------- ++# Try to preprocess conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_cpp () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { { ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-} >&5 ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval + +-cat >&5 <<_ACEOF ++} # ac_fn_c_try_cpp + ++# ac_fn_c_try_run LINENO ++# ---------------------- ++# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes ++# that executables *can* be run. ++ac_fn_c_try_run () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: program exited with status $ac_status" >&5 ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-## ----------- ## +-## Core tests. ## +-## ----------- ## ++ ac_retval=$ac_status ++fi ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval + +-_ACEOF ++} # ac_fn_c_try_run + ++# ac_fn_c_check_func LINENO FUNC VAR ++# ---------------------------------- ++# Tests whether FUNC exists, setting the cache variable VAR accordingly ++ac_fn_c_check_func () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++/* Define $2 to an innocuous variant, in case <limits.h> declares $2. ++ For example, HP-UX 11i <limits.h> declares gettimeofday. */ ++#define $2 innocuous_$2 + +-# Keep a trace of the command line. +-# Strip out --no-create and --no-recursion so they do not pile up. +-# Strip out --silent because we don't want to record it for future runs. +-# Also quote any args containing shell meta-characters. +-# Make two passes to allow for proper duplicate-argument suppression. +-ac_configure_args= +-ac_configure_args0= +-ac_configure_args1= +-ac_must_keep_next=false +-for ac_pass in 1 2 +-do +- for ac_arg +- do +- case $ac_arg in +- -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; +- -q | -quiet | --quiet | --quie | --qui | --qu | --q \ +- | -silent | --silent | --silen | --sile | --sil) +- continue ;; +- *\'*) +- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; +- esac +- case $ac_pass in +- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; +- 2) +- ac_configure_args1="$ac_configure_args1 '$ac_arg'" +- if test $ac_must_keep_next = true; then +- ac_must_keep_next=false # Got value, back to normal. +- else +- case $ac_arg in +- *=* | --config-cache | -C | -disable-* | --disable-* \ +- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ +- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ +- | -with-* | --with-* | -without-* | --without-* | --x) +- case "$ac_configure_args0 " in +- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; +- esac +- ;; +- -* ) ac_must_keep_next=true ;; +- esac +- fi +- ac_configure_args="$ac_configure_args '$ac_arg'" +- ;; +- esac +- done +-done +-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $2 (); below. ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ <limits.h> exists even on freestanding compilers. */ + +-# When interrupted or exit'd, cleanup temporary files, and complete +-# config.log. We remove comments because anyway the quotes in there +-# would cause problems or look ugly. +-# WARNING: Use '\'' to represent an apostrophe within the trap. +-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +-trap 'exit_status=$? +- # Save into config.log some information that might help in debugging. +- { +- echo ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif + +- cat <<\_ASBOX +-## ---------------- ## +-## Cache variables. ## +-## ---------------- ## +-_ASBOX +- echo +- # The following way of writing the cache mishandles newlines in values, +-( +- for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do +- eval ac_val=\$$ac_var +- case $ac_val in #( +- *${as_nl}*) +- case $ac_var in #( +- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 +-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; +- esac +- case $ac_var in #( +- _ | IFS | as_nl) ;; #( +- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( +- *) $as_unset $ac_var ;; +- esac ;; +- esac +- done +- (set) 2>&1 | +- case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( +- *${as_nl}ac_space=\ *) +- sed -n \ +- "s/'\''/'\''\\\\'\'''\''/g; +- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" +- ;; #( +- *) +- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" +- ;; +- esac | +- sort +-) +- echo ++#undef $2 + +- cat <<\_ASBOX +-## ----------------- ## +-## Output variables. ## +-## ----------------- ## +-_ASBOX +- echo +- for ac_var in $ac_subst_vars +- do +- eval ac_val=\$$ac_var +- case $ac_val in +- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; +- esac +- $as_echo "$ac_var='\''$ac_val'\''" +- done | sort +- echo ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $2 (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_$2 || defined __stub___$2 ++choke me ++#endif + +- if test -n "$ac_subst_files"; then +- cat <<\_ASBOX +-## ------------------- ## +-## File substitutions. ## +-## ------------------- ## +-_ASBOX +- echo +- for ac_var in $ac_subst_files +- do +- eval ac_val=\$$ac_var +- case $ac_val in +- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; +- esac +- $as_echo "$ac_var='\''$ac_val'\''" +- done | sort +- echo +- fi ++int ++main () ++{ ++return $2 (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +- if test -s confdefs.h; then +- cat <<\_ASBOX +-## ----------- ## +-## confdefs.h. ## +-## ----------- ## +-_ASBOX +- echo +- cat confdefs.h +- echo +- fi +- test "$ac_signal" != 0 && +- $as_echo "$as_me: caught signal $ac_signal" +- $as_echo "$as_me: exit $exit_status" +- } >&5 +- rm -f core *.core core.conftest.* && +- rm -f -r conftest* confdefs* conf$$* $ac_clean_files && +- exit $exit_status +-' 0 +-for ac_signal in 1 2 13 15; do +- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal +-done +-ac_signal=0 ++} # ac_fn_c_check_func + +-# confdefs.h avoids OS command line length limits that DEFS can exceed. +-rm -f -r conftest* confdefs.h ++# ac_fn_c_check_type LINENO TYPE VAR INCLUDES ++# ------------------------------------------- ++# Tests whether TYPE exists after having included INCLUDES, setting cache ++# variable VAR accordingly. ++ac_fn_c_check_type () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++else ++ eval "$3=no" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++if (sizeof ($2)) ++ return 0; ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++if (sizeof (($2))) ++ return 0; ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : + +-# Predefined preprocessor variables. ++else ++ eval "$3=yes" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_NAME "$PACKAGE_NAME" +-_ACEOF ++} # ac_fn_c_check_type + ++# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES ++# -------------------------------------------- ++# Tries to find the compile-time value of EXPR in a program that includes ++# INCLUDES, setting VAR accordingly. Returns whether the value could be ++# computed ++ac_fn_c_compute_int () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if test "$cross_compiling" = yes; then ++ # Depending upon the size, compute the lo and hi bounds. ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++static int test_array [1 - 2 * !(($2) >= 0)]; ++test_array [0] = 0 + +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_TARNAME "$PACKAGE_TARNAME" ++ ; ++ return 0; ++} + _ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_lo=0 ac_mid=0 ++ while :; do ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++static int test_array [1 - 2 * !(($2) <= $ac_mid)]; ++test_array [0] = 0 + ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_hi=$ac_mid; break ++else ++ as_fn_arith $ac_mid + 1 && ac_lo=$as_val ++ if test $ac_lo -le $ac_mid; then ++ ac_lo= ac_hi= ++ break ++ fi ++ as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ done ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++static int test_array [1 - 2 * !(($2) < 0)]; ++test_array [0] = 0 + +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_VERSION "$PACKAGE_VERSION" ++ ; ++ return 0; ++} + _ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_hi=-1 ac_mid=-1 ++ while :; do ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++static int test_array [1 - 2 * !(($2) >= $ac_mid)]; ++test_array [0] = 0 + ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_lo=$ac_mid; break ++else ++ as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val ++ if test $ac_mid -le $ac_hi; then ++ ac_lo= ac_hi= ++ break ++ fi ++ as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ done ++else ++ ac_lo= ac_hi= ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++# Binary search between lo and hi bounds. ++while test "x$ac_lo" != "x$ac_hi"; do ++ as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++static int test_array [1 - 2 * !(($2) <= $ac_mid)]; ++test_array [0] = 0 + +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_STRING "$PACKAGE_STRING" ++ ; ++ return 0; ++} + _ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_hi=$ac_mid ++else ++ as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++done ++case $ac_lo in #(( ++?*) eval "$3=\$ac_lo"; ac_retval=0 ;; ++'') ac_retval=1 ;; ++esac ++ else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++static long int longval () { return $2; } ++static unsigned long int ulongval () { return $2; } ++#include <stdio.h> ++#include <stdlib.h> ++int ++main () ++{ + ++ FILE *f = fopen ("conftest.val", "w"); ++ if (! f) ++ return 1; ++ if (($2) < 0) ++ { ++ long int i = longval (); ++ if (i != ($2)) ++ return 1; ++ fprintf (f, "%ld", i); ++ } ++ else ++ { ++ unsigned long int i = ulongval (); ++ if (i != ($2)) ++ return 1; ++ fprintf (f, "%lu", i); ++ } ++ /* Do not output a trailing newline, as this causes \r\n confusion ++ on some platforms. */ ++ return ferror (f) || fclose (f) != 0; + +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" ++ ; ++ return 0; ++} + _ACEOF ++if ac_fn_c_try_run "$LINENO"; then : ++ echo >>conftest.val; read $3 <conftest.val; ac_retval=0 ++else ++ ac_retval=1 ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext ++rm -f conftest.val ++ ++ fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval + ++} # ac_fn_c_compute_int + +-# Let the site file select an alternate cache file if it wants to. +-# Prefer an explicitly selected file to automatically selected ones. +-ac_site_file1=NONE +-ac_site_file2=NONE +-if test -n "$CONFIG_SITE"; then +- ac_site_file1=$CONFIG_SITE +-elif test "x$prefix" != xNONE; then +- ac_site_file1=$prefix/share/config.site +- ac_site_file2=$prefix/etc/config.site ++# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES ++# ------------------------------------------------------- ++# Tests whether HEADER exists, giving a warning if it cannot be compiled using ++# the include files in INCLUDES and setting the cache variable VAR ++# accordingly. ++ac_fn_c_check_header_mongrel () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } + else +- ac_site_file1=$ac_default_prefix/share/config.site +- ac_site_file2=$ac_default_prefix/etc/config.site ++ # Is the header compilable? ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 ++$as_echo_n "checking $2 usability... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++#include <$2> ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_header_compiler=yes ++else ++ ac_header_compiler=no + fi +-for ac_site_file in "$ac_site_file1" "$ac_site_file2" +-do +- test "x$ac_site_file" = xNONE && continue +- if test -r "$ac_site_file"; then +- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +-$as_echo "$as_me: loading site script $ac_site_file" >&6;} +- sed 's/^/| /' "$ac_site_file" >&5 +- . "$ac_site_file" +- fi +-done ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 ++$as_echo "$ac_header_compiler" >&6; } + +-if test -r "$cache_file"; then +- # Some versions of bash will fail to source /dev/null (special +- # files actually), so we avoid doing that. +- if test -f "$cache_file"; then +- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 +-$as_echo "$as_me: loading cache $cache_file" >&6;} +- case $cache_file in +- [\\/]* | ?:[\\/]* ) . "$cache_file";; +- *) . "./$cache_file";; +- esac +- fi ++# Is the header present? ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 ++$as_echo_n "checking $2 presence... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <$2> ++_ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : ++ ac_header_preproc=yes + else +- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 +-$as_echo "$as_me: creating cache $cache_file" >&6;} +- >$cache_file ++ ac_header_preproc=no + fi ++rm -f conftest.err conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 ++$as_echo "$ac_header_preproc" >&6; } + +-# Check that the precious variables saved in the cache have kept the same +-# value. +-ac_cache_corrupted=false +-for ac_var in $ac_precious_vars; do +- eval ac_old_set=\$ac_cv_env_${ac_var}_set +- eval ac_new_set=\$ac_env_${ac_var}_set +- eval ac_old_val=\$ac_cv_env_${ac_var}_value +- eval ac_new_val=\$ac_env_${ac_var}_value +- case $ac_old_set,$ac_new_set in +- set,) +- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} +- ac_cache_corrupted=: ;; +- ,set) +- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} +- ac_cache_corrupted=: ;; +- ,);; +- *) +- if test "x$ac_old_val" != "x$ac_new_val"; then +- # differences in whitespace do not lead to failure. +- ac_old_val_w=`echo x $ac_old_val` +- ac_new_val_w=`echo x $ac_new_val` +- if test "$ac_old_val_w" != "$ac_new_val_w"; then +- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} +- ac_cache_corrupted=: +- else +- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} +- eval $ac_var=\$ac_old_val +- fi +- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 +-$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} +- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 +-$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} +- fi;; +- esac +- # Pass precious variables to config.status. +- if test "$ac_new_set" = set; then +- case $ac_new_val in +- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; +- *) ac_arg=$ac_var=$ac_new_val ;; +- esac +- case " $ac_configure_args " in +- *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. +- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; +- esac +- fi +-done +-if $ac_cache_corrupted; then +- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} +- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} +- { (exit 1); exit 1; }; } ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( ++ yes:no: ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 ++$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 ++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} ++ ;; ++ no:yes:* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 ++$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 ++$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 ++$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 ++$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 ++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} ++ ;; ++esac ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++else ++ eval "$3=\$ac_header_compiler" + fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + ++} # ac_fn_c_check_header_mongrel ++cat >config.log <<_ACEOF ++This file contains any messages produced by compilers while ++running configure, to aid debugging if configure makes a mistake. + ++It was created by orc $as_me 0.4.3, which was ++generated by GNU Autoconf 2.65. Invocation command line was + ++ $ $0 $@ + ++_ACEOF ++exec 5>>config.log ++{ ++cat <<_ASUNAME ++## --------- ## ++## Platform. ## ++## --------- ## + ++hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` ++uname -m = `(uname -m) 2>/dev/null || echo unknown` ++uname -r = `(uname -r) 2>/dev/null || echo unknown` ++uname -s = `(uname -s) 2>/dev/null || echo unknown` ++uname -v = `(uname -v) 2>/dev/null || echo unknown` + ++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` ++/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + ++/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` ++/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` ++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` ++/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` ++/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` ++/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` ++/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + ++_ASUNAME + ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ $as_echo "PATH: $as_dir" ++ done ++IFS=$as_save_IFS + ++} >&5 + ++cat >&5 <<_ACEOF + + ++## ----------- ## ++## Core tests. ## ++## ----------- ## + ++_ACEOF + + ++# Keep a trace of the command line. ++# Strip out --no-create and --no-recursion so they do not pile up. ++# Strip out --silent because we don't want to record it for future runs. ++# Also quote any args containing shell meta-characters. ++# Make two passes to allow for proper duplicate-argument suppression. ++ac_configure_args= ++ac_configure_args0= ++ac_configure_args1= ++ac_must_keep_next=false ++for ac_pass in 1 2 ++do ++ for ac_arg ++ do ++ case $ac_arg in ++ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; ++ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ ++ | -silent | --silent | --silen | --sile | --sil) ++ continue ;; ++ *\'*) ++ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ esac ++ case $ac_pass in ++ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; ++ 2) ++ as_fn_append ac_configure_args1 " '$ac_arg'" ++ if test $ac_must_keep_next = true; then ++ ac_must_keep_next=false # Got value, back to normal. ++ else ++ case $ac_arg in ++ *=* | --config-cache | -C | -disable-* | --disable-* \ ++ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ ++ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ ++ | -with-* | --with-* | -without-* | --without-* | --x) ++ case "$ac_configure_args0 " in ++ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; ++ esac ++ ;; ++ -* ) ac_must_keep_next=true ;; ++ esac ++ fi ++ as_fn_append ac_configure_args " '$ac_arg'" ++ ;; ++ esac ++ done ++done ++{ ac_configure_args0=; unset ac_configure_args0;} ++{ ac_configure_args1=; unset ac_configure_args1;} + ++# When interrupted or exit'd, cleanup temporary files, and complete ++# config.log. We remove comments because anyway the quotes in there ++# would cause problems or look ugly. ++# WARNING: Use '\'' to represent an apostrophe within the trap. ++# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. ++trap 'exit_status=$? ++ # Save into config.log some information that might help in debugging. ++ { ++ echo + ++ cat <<\_ASBOX ++## ---------------- ## ++## Cache variables. ## ++## ---------------- ## ++_ASBOX ++ echo ++ # The following way of writing the cache mishandles newlines in values, ++( ++ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; unset $ac_var;} ;; ++ esac ;; ++ esac ++ done ++ (set) 2>&1 | ++ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ sed -n \ ++ "s/'\''/'\''\\\\'\'''\''/g; ++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" ++ ;; #( ++ *) ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) ++ echo + ++ cat <<\_ASBOX ++## ----------------- ## ++## Output variables. ## ++## ----------------- ## ++_ASBOX ++ echo ++ for ac_var in $ac_subst_vars ++ do ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ esac ++ $as_echo "$ac_var='\''$ac_val'\''" ++ done | sort ++ echo + ++ if test -n "$ac_subst_files"; then ++ cat <<\_ASBOX ++## ------------------- ## ++## File substitutions. ## ++## ------------------- ## ++_ASBOX ++ echo ++ for ac_var in $ac_subst_files ++ do ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ esac ++ $as_echo "$ac_var='\''$ac_val'\''" ++ done | sort ++ echo ++ fi + ++ if test -s confdefs.h; then ++ cat <<\_ASBOX ++## ----------- ## ++## confdefs.h. ## ++## ----------- ## ++_ASBOX ++ echo ++ cat confdefs.h ++ echo ++ fi ++ test "$ac_signal" != 0 && ++ $as_echo "$as_me: caught signal $ac_signal" ++ $as_echo "$as_me: exit $exit_status" ++ } >&5 ++ rm -f core *.core core.conftest.* && ++ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && ++ exit $exit_status ++' 0 ++for ac_signal in 1 2 13 15; do ++ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal ++done ++ac_signal=0 + ++# confdefs.h avoids OS command line length limits that DEFS can exceed. ++rm -f -r conftest* confdefs.h + ++$as_echo "/* confdefs.h */" > confdefs.h + ++# Predefined preprocessor variables. + +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +- ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_NAME "$PACKAGE_NAME" ++_ACEOF + ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_TARNAME "$PACKAGE_TARNAME" ++_ACEOF + +- { $as_echo "$as_me:$LINENO: checking nano version" >&5 +-$as_echo_n "checking nano version... " >&6; } ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_VERSION "$PACKAGE_VERSION" ++_ACEOF + +- NANO=$(echo 0.4.3 | sed 's/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.*//') ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_STRING "$PACKAGE_STRING" ++_ACEOF + ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" ++_ACEOF + +- if test x"$NANO" = x || test "x$NANO" = "x0" ; then +- { $as_echo "$as_me:$LINENO: result: 0 (release)" >&5 +-$as_echo "0 (release)" >&6; } +- NANO=0 +- ORC_CVS=no +- else +- { $as_echo "$as_me:$LINENO: result: $NANO" >&5 +-$as_echo "$NANO" >&6; } +- ORC_CVS=yes +- fi ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_URL "$PACKAGE_URL" ++_ACEOF + + +-ac_aux_dir= +-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do +- if test -f "$ac_dir/install-sh"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/install-sh -c" +- break +- elif test -f "$ac_dir/install.sh"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/install.sh -c" +- break +- elif test -f "$ac_dir/shtool"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/shtool install -c" +- break ++# Let the site file select an alternate cache file if it wants to. ++# Prefer an explicitly selected file to automatically selected ones. ++ac_site_file1=NONE ++ac_site_file2=NONE ++if test -n "$CONFIG_SITE"; then ++ ac_site_file1=$CONFIG_SITE ++elif test "x$prefix" != xNONE; then ++ ac_site_file1=$prefix/share/config.site ++ ac_site_file2=$prefix/etc/config.site ++else ++ ac_site_file1=$ac_default_prefix/share/config.site ++ ac_site_file2=$ac_default_prefix/etc/config.site ++fi ++for ac_site_file in "$ac_site_file1" "$ac_site_file2" ++do ++ test "x$ac_site_file" = xNONE && continue ++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 ++$as_echo "$as_me: loading site script $ac_site_file" >&6;} ++ sed 's/^/| /' "$ac_site_file" >&5 ++ . "$ac_site_file" ++ fi ++done ++ ++if test -r "$cache_file"; then ++ # Some versions of bash will fail to source /dev/null (special files ++ # actually), so we avoid doing that. DJGPP emulates it as a regular file. ++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 ++$as_echo "$as_me: loading cache $cache_file" >&6;} ++ case $cache_file in ++ [\\/]* | ?:[\\/]* ) . "$cache_file";; ++ *) . "./$cache_file";; ++ esac ++ fi ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 ++$as_echo "$as_me: creating cache $cache_file" >&6;} ++ >$cache_file ++fi ++ ++as_fn_append ac_header_list " stdlib.h" ++as_fn_append ac_header_list " unistd.h" ++as_fn_append ac_header_list " sys/param.h" ++# Check that the precious variables saved in the cache have kept the same ++# value. ++ac_cache_corrupted=false ++for ac_var in $ac_precious_vars; do ++ eval ac_old_set=\$ac_cv_env_${ac_var}_set ++ eval ac_new_set=\$ac_env_${ac_var}_set ++ eval ac_old_val=\$ac_cv_env_${ac_var}_value ++ eval ac_new_val=\$ac_env_${ac_var}_value ++ case $ac_old_set,$ac_new_set in ++ set,) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 ++$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ++ ac_cache_corrupted=: ;; ++ ,set) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 ++$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ++ ac_cache_corrupted=: ;; ++ ,);; ++ *) ++ if test "x$ac_old_val" != "x$ac_new_val"; then ++ # differences in whitespace do not lead to failure. ++ ac_old_val_w=`echo x $ac_old_val` ++ ac_new_val_w=`echo x $ac_new_val` ++ if test "$ac_old_val_w" != "$ac_new_val_w"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 ++$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ++ ac_cache_corrupted=: ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 ++$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} ++ eval $ac_var=\$ac_old_val ++ fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 ++$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 ++$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} ++ fi;; ++ esac ++ # Pass precious variables to config.status. ++ if test "$ac_new_set" = set; then ++ case $ac_new_val in ++ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; ++ *) ac_arg=$ac_var=$ac_new_val ;; ++ esac ++ case " $ac_configure_args " in ++ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. ++ *) as_fn_append ac_configure_args " '$ac_arg'" ;; ++ esac ++ fi ++done ++if $ac_cache_corrupted; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 ++$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} ++ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 ++fi ++## -------------------- ## ++## Main body of script. ## ++## -------------------- ## ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking nano version" >&5 ++$as_echo_n "checking nano version... " >&6; } ++ ++ NANO=$(echo 0.4.3 | sed 's/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.*//') ++ ++ ++ if test x"$NANO" = x || test "x$NANO" = "x0" ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 0 (release)" >&5 ++$as_echo "0 (release)" >&6; } ++ NANO=0 ++ ORC_CVS=no ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NANO" >&5 ++$as_echo "$NANO" >&6; } ++ ORC_CVS=yes + fi ++ ++ ++ac_aux_dir= ++for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do ++ for ac_t in install-sh install.sh shtool; do ++ if test -f "$ac_dir/$ac_t"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/$ac_t -c" ++ break 2 ++ fi ++ done + done + if test -z "$ac_aux_dir"; then +- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + fi + + # These three variables are undocumented and unsupported, +@@ -2117,35 +2624,27 @@ + + # Make sure we can run config.sub. + $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || +- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +-{ $as_echo "$as_me:$LINENO: checking build system type" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 + $as_echo_n "checking build system type... " >&6; } +-if test "${ac_cv_build+set}" = set; then ++if test "${ac_cv_build+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_build_alias=$build_alias + test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + test "x$ac_build_alias" = x && +- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 + ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || +- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 + $as_echo "$ac_cv_build" >&6; } + case $ac_cv_build in + *-*-*) ;; +-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +-$as_echo "$as_me: error: invalid value of canonical build" >&2;} +- { (exit 1); exit 1; }; };; ++*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; + esac + build=$ac_cv_build + ac_save_IFS=$IFS; IFS='-' +@@ -2161,28 +2660,24 @@ + case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +-{ $as_echo "$as_me:$LINENO: checking host system type" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 + $as_echo_n "checking host system type... " >&6; } +-if test "${ac_cv_host+set}" = set; then ++if test "${ac_cv_host+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build + else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || +- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 + $as_echo "$ac_cv_host" >&6; } + case $ac_cv_host in + *-*-*) ;; +-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +-$as_echo "$as_me: error: invalid value of canonical host" >&2;} +- { (exit 1); exit 1; }; };; ++*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; + esac + host=$ac_cv_host + ac_save_IFS=$IFS; IFS='-' +@@ -2198,7 +2693,7 @@ + case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + +-am__api_version='1.10' ++am__api_version='1.11' + + # Find a good install program. We prefer a C program (faster), + # so one script is as good as another. But avoid the broken or +@@ -2214,10 +2709,10 @@ + # OS/2's system install, which has a completely different semantic + # ./install, which can be erroneously created by make from ./install.sh. + # Reject install programs that cannot install multiple files. +-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 + $as_echo_n "checking for a BSD-compatible install... " >&6; } + if test -z "$INSTALL"; then +-if test "${ac_cv_path_install+set}" = set; then ++if test "${ac_cv_path_install+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -2225,11 +2720,11 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- # Account for people who put trailing slashes in PATH elements. +-case $as_dir/ in +- ./ | .// | /cC/* | \ ++ # Account for people who put trailing slashes in PATH elements. ++case $as_dir/ in #(( ++ ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ +- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ ++ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. +@@ -2266,7 +2761,7 @@ + ;; + esac + +-done ++ done + IFS=$as_save_IFS + + rm -rf conftest.one conftest.two conftest.dir +@@ -2282,7 +2777,7 @@ + INSTALL=$ac_install_sh + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 + $as_echo "$INSTALL" >&6; } + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. +@@ -2293,21 +2788,34 @@ + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 + $as_echo_n "checking whether build environment is sane... " >&6; } + # Just in case + sleep 1 + echo timestamp > conftest.file ++# Reject unsafe characters in $srcdir or the absolute working directory ++# name. Accept space and tab only in the latter. ++am_lf=' ++' ++case `pwd` in ++ *[\\\"\#\$\&\'\`$am_lf]*) ++ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; ++esac ++case $srcdir in ++ *[\\\"\#\$\&\'\`$am_lf\ \ ]*) ++ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; ++esac ++ + # 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 conftest.file 2> /dev/null` ++ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. +- set X `ls -t $srcdir/configure conftest.file` ++ set X `ls -t "$srcdir/configure" conftest.file` + fi + rm -f conftest.file + if test "$*" != "X $srcdir/configure conftest.file" \ +@@ -2317,11 +2825,8 @@ + # 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". +- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken +-alias in your environment" >&5 +-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken +-alias in your environment" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "ls -t appears to fail. Make sure there is not a broken ++alias in your environment" "$LINENO" 5 + fi + + test "$2" = conftest.file +@@ -2330,13 +2835,10 @@ + # Ok. + : + else +- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! +-Check your system clock" >&5 +-$as_echo "$as_me: error: newly created file is older than distributed files! +-Check your system clock" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "newly created file is older than distributed files! ++Check your system clock" "$LINENO" 5 + fi +-{ $as_echo "$as_me:$LINENO: result: yes" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" +@@ -2351,20 +2853,136 @@ + # expand $ac_aux_dir to an absolute path + am_aux_dir=`cd $ac_aux_dir && pwd` + +-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" ++if test x"${MISSING+set}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; ++ *) ++ MISSING="\${SHELL} $am_aux_dir/missing" ;; ++ esac ++fi + # Use eval to expand $SHELL + if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " + else + am_missing_run= +- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 + $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + fi + +-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 ++if test x"${install_sh}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; ++ *) ++ install_sh="\${SHELL} $am_aux_dir/install-sh" ++ esac ++fi ++ ++# Installed binaries are usually stripped using `strip' when the user ++# run `make install-strip'. However `strip' might not be the right ++# tool to use in cross-compilation environments, therefore Automake ++# will honor the `STRIP' environment variable to overrule this program. ++if test "$cross_compiling" != no; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. ++set dummy ${ac_tool_prefix}strip; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_STRIP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$STRIP"; then ++ ac_cv_prog_STRIP="$STRIP" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_STRIP="${ac_tool_prefix}strip" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++STRIP=$ac_cv_prog_STRIP ++if test -n "$STRIP"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 ++$as_echo "$STRIP" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_STRIP"; then ++ ac_ct_STRIP=$STRIP ++ # Extract the first word of "strip", so it can be a program name with args. ++set dummy strip; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_STRIP"; then ++ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_STRIP="strip" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP ++if test -n "$ac_ct_STRIP"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 ++$as_echo "$ac_ct_STRIP" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_STRIP" = x; then ++ STRIP=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ STRIP=$ac_ct_STRIP ++ fi ++else ++ STRIP="$ac_cv_prog_STRIP" ++fi ++ ++fi ++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 + $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } + if test -z "$MKDIR_P"; then +- if test "${ac_cv_path_mkdir+set}" = set; then ++ if test "${ac_cv_path_mkdir+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -2372,7 +2990,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in mkdir gmkdir; do ++ for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( +@@ -2384,11 +3002,12 @@ + esac + done + done +-done ++ done + IFS=$as_save_IFS + + fi + ++ test -d ./--version && rmdir ./--version + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else +@@ -2396,11 +3015,10 @@ + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. +- test -d ./--version && rmdir ./--version + MKDIR_P="$ac_install_sh -d" + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 + $as_echo "$MKDIR_P" >&6; } + + mkdir_p="$MKDIR_P" +@@ -2413,9 +3031,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_AWK+set}" = set; then ++if test "${ac_cv_prog_AWK+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$AWK"; then +@@ -2426,24 +3044,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AWK="$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +- { $as_echo "$as_me:$LINENO: result: $AWK" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 + $as_echo "$AWK" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2451,11 +3069,11 @@ + test -n "$AWK" && break + done + +-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 + $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } + set x ${MAKE-make} + ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then ++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 + else + cat >conftest.make <<\_ACEOF +@@ -2473,11 +3091,11 @@ + rm -f conftest.make + fi + if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + SET_MAKE= + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" + fi +@@ -2497,9 +3115,7 @@ + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then +- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + fi + fi + +@@ -2543,113 +3159,11 @@ + + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} ++# We need awk for the "check" target. The system "awk" is bad on ++# some platforms. ++# Always define AMTAR for backward compatibility. + +-# Installed binaries are usually stripped using `strip' when the user +-# run `make install-strip'. However `strip' might not be the right +-# tool to use in cross-compilation environments, therefore Automake +-# will honor the `STRIP' environment variable to overrule this program. +-if test "$cross_compiling" != no; then +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +-set dummy ${ac_tool_prefix}strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_STRIP+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$STRIP"; then +- ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_STRIP="${ac_tool_prefix}strip" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +-fi +-fi +-STRIP=$ac_cv_prog_STRIP +-if test -n "$STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 +-$as_echo "$STRIP" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-fi +-if test -z "$ac_cv_prog_STRIP"; then +- ac_ct_STRIP=$STRIP +- # Extract the first word of "strip", so it can be a program name with args. +-set dummy strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_STRIP"; then +- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_STRIP="strip" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +-fi +-fi +-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +-if test -n "$ac_ct_STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +-$as_echo "$ac_ct_STRIP" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- if test "x$ac_ct_STRIP" = x; then +- STRIP=":" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- STRIP=$ac_ct_STRIP +- fi +-else +- STRIP="$ac_cv_prog_STRIP" +-fi +- +-fi +-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +- +-# We need awk for the "check" target. The system "awk" is bad on +-# some platforms. +-# Always define AMTAR for backward compatibility. +- +-AMTAR=${AMTAR-"${am_missing_run}tar"} ++AMTAR=${AMTAR-"${am_missing_run}tar"} + + am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' + +@@ -2658,16 +3172,17 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 + $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } + # Check whether --enable-maintainer-mode was given. +-if test "${enable_maintainer_mode+set}" = set; then ++if test "${enable_maintainer_mode+set}" = set; then : + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval + else + USE_MAINTAINER_MODE=no + fi + +- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 + $as_echo "$USE_MAINTAINER_MODE" >&6; } + if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= +@@ -2696,9 +3211,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. + set dummy ${ac_tool_prefix}as; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_AS+set}" = set; then ++if test "${ac_cv_prog_AS+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$AS"; then +@@ -2709,24 +3224,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AS="${ac_tool_prefix}as" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + AS=$ac_cv_prog_AS + if test -n "$AS"; then +- { $as_echo "$as_me:$LINENO: result: $AS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5 + $as_echo "$AS" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2736,9 +3251,9 @@ + ac_ct_AS=$AS + # Extract the first word of "as", so it can be a program name with args. + set dummy as; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_AS+set}" = set; then ++if test "${ac_cv_prog_ac_ct_AS+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_AS"; then +@@ -2749,24 +3264,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_AS="as" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_AS=$ac_cv_prog_ac_ct_AS + if test -n "$ac_ct_AS"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5 + $as_echo "$ac_ct_AS" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2775,7 +3290,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -2788,9 +3303,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. + set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_DLLTOOL+set}" = set; then ++if test "${ac_cv_prog_DLLTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$DLLTOOL"; then +@@ -2801,24 +3316,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + DLLTOOL=$ac_cv_prog_DLLTOOL + if test -n "$DLLTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 + $as_echo "$DLLTOOL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2828,9 +3343,9 @@ + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. + set dummy dlltool; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then ++if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_DLLTOOL"; then +@@ -2841,24 +3356,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL + if test -n "$ac_ct_DLLTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 + $as_echo "$ac_ct_DLLTOOL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2867,7 +3382,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -2880,9 +3395,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. + set dummy ${ac_tool_prefix}objdump; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_OBJDUMP+set}" = set; then ++if test "${ac_cv_prog_OBJDUMP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$OBJDUMP"; then +@@ -2893,24 +3408,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + OBJDUMP=$ac_cv_prog_OBJDUMP + if test -n "$OBJDUMP"; then +- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 + $as_echo "$OBJDUMP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2920,9 +3435,9 @@ + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. + set dummy objdump; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then ++if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OBJDUMP"; then +@@ -2933,24 +3448,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP + if test -n "$ac_ct_OBJDUMP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 + $as_echo "$ac_ct_OBJDUMP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2959,7 +3474,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -2996,7 +3511,7 @@ + + case `pwd` in + *\ * | *\ *) +- { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 + $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; + esac + +@@ -3027,44 +3542,44 @@ + am_make=${MAKE-make} + cat > confinc << 'END' + am__doit: +- @echo done ++ @echo this is the am__doit target + .PHONY: am__doit + END + # If we don't find an include directive, just comment out the code. +-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 + $as_echo_n "checking for style of include used by $am_make... " >&6; } + am__include="#" + am__quote= + _am_result=none + # First try GNU make style include. + echo "include confinc" > confmf +-# We grep out `Entering directory' and `Leaving directory' +-# messages which can occur if `w' ends up in MAKEFLAGS. +-# In particular we don't look at `^make:' because GNU make might +-# be invoked under some other name (usually "gmake"), in which +-# case it prints its new name instead of `make'. +-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then +- am__include=include +- am__quote= +- _am_result=GNU +-fi ++# Ignore all kinds of additional output from `make'. ++case `$am_make -s -f confmf 2> /dev/null` in #( ++*the\ am__doit\ target*) ++ am__include=include ++ am__quote= ++ _am_result=GNU ++ ;; ++esac + # Now try BSD make style include. + if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf +- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then +- am__include=.include +- am__quote="\"" +- _am_result=BSD +- fi ++ case `$am_make -s -f confmf 2> /dev/null` in #( ++ *the\ am__doit\ target*) ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ ;; ++ esac + fi + + +-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 + $as_echo "$_am_result" >&6; } + rm -f confinc confmf + + # Check whether --enable-dependency-tracking was given. +-if test "${enable_dependency_tracking+set}" = set; then ++if test "${enable_dependency_tracking+set}" = set; then : + enableval=$enable_dependency_tracking; + fi + +@@ -3089,9 +3604,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. + set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3102,24 +3617,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -3129,9 +3644,9 @@ + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -3142,24 +3657,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 + $as_echo "$ac_ct_CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -3168,7 +3683,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -3182,9 +3697,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + set dummy ${ac_tool_prefix}cc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3195,24 +3710,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -3222,9 +3737,9 @@ + if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3236,18 +3751,18 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + if test $ac_prog_rejected = yes; then +@@ -3266,10 +3781,10 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -3281,9 +3796,9 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CC+set}" = set; then ++if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC"; then +@@ -3294,24 +3809,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 + $as_echo "$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -3325,9 +3840,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_CC"; then +@@ -3338,24 +3853,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 + $as_echo "$ac_ct_CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -3368,7 +3883,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -3379,57 +3894,37 @@ + fi + + +-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error "no acceptable C compiler found in \$PATH ++See \`config.log' for more details." "$LINENO" 5; } + + # Provide some information about the compiler. +-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 + set X $ac_compile + ac_compiler=$2 +-{ (ac_try="$ac_compiler --version >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler --version >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -v >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -v >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -V >&5" ++for ac_option in --version -v -V -qversion; do ++ { { ac_try="$ac_compiler $ac_option >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -V >&5") 2>&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ fi ++ rm -f conftest.er1 conftest.err ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done + +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3445,8 +3940,8 @@ + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +-$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 ++$as_echo_n "checking whether the C compiler works... " >&6; } + ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + + # The possible output files: +@@ -3462,17 +3957,17 @@ + done + rm -f $ac_rmfiles + +-if { (ac_try="$ac_link_default" ++if { { ac_try="$ac_link_default" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. + # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' + # in a Makefile. We should not override ac_cv_exeext if it was cached, +@@ -3489,7 +3984,7 @@ + # certainly right. + break;; + *.* ) +- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; ++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi +@@ -3508,84 +4003,42 @@ + else + ac_file='' + fi +- +-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 +-$as_echo "$ac_file" >&6; } +-if test -z "$ac_file"; then +- $as_echo "$as_me: failed program was:" >&5 ++if test -z "$ac_file"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++$as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: C compiler cannot create executables +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } ++{ as_fn_set_status 77 ++as_fn_error "C compiler cannot create executables ++See \`config.log' for more details." "$LINENO" 5; }; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } + fi +- ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 ++$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 ++$as_echo "$ac_file" >&6; } + ac_exeext=$ac_cv_exeext + +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +-$as_echo_n "checking whether the C compiler works... " >&6; } +-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 +-# If not cross compiling, check that we can run a simple program. +-if test "$cross_compiling" != yes; then +- if { ac_try='./$ac_file' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- cross_compiling=no +- else +- if test "$cross_compiling" = maybe; then +- cross_compiling=yes +- else +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } +- fi +- fi +-fi +-{ $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- + rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out + ac_clean_files=$ac_clean_files_save +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +-$as_echo_n "checking whether we are cross compiling... " >&6; } +-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 +-$as_echo "$cross_compiling" >&6; } +- +-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 + $as_echo_n "checking for suffix of executables... " >&6; } +-if { (ac_try="$ac_link" ++if { { ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) + # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will + # work properly (i.e., refer to `conftest.exe'), while it won't with +@@ -3600,32 +4053,83 @@ + esac + done + else +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error "cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details." "$LINENO" 5; } + fi +- +-rm -f conftest$ac_cv_exeext +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 ++rm -f conftest conftest$ac_cv_exeext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 + $as_echo "$ac_cv_exeext" >&6; } + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT +-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <stdio.h> ++int ++main () ++{ ++FILE *f = fopen ("conftest.out", "w"); ++ return ferror (f) || fclose (f) != 0; ++ ++ ; ++ return 0; ++} ++_ACEOF ++ac_clean_files="$ac_clean_files conftest.out" ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 ++$as_echo_n "checking whether we are cross compiling... " >&6; } ++if test "$cross_compiling" != yes; then ++ { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if { ac_try='./conftest$ac_cv_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then ++ cross_compiling=no ++ else ++ if test "$cross_compiling" = maybe; then ++ cross_compiling=yes ++ else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error "cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details." "$LINENO" 5; } ++ fi ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 ++$as_echo "$cross_compiling" >&6; } ++ ++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ++ac_clean_files=$ac_clean_files_save ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 + $as_echo_n "checking for suffix of object files... " >&6; } +-if test "${ac_cv_objext+set}" = set; then ++if test "${ac_cv_objext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3637,17 +4141,17 @@ + } + _ACEOF + rm -f conftest.o conftest.obj +-if { (ac_try="$ac_compile" ++if { { ac_try="$ac_compile" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in +@@ -3660,31 +4164,23 @@ + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error "cannot compute suffix of object files: cannot compile ++See \`config.log' for more details." "$LINENO" 5; } + fi +- + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 + $as_echo "$ac_cv_objext" >&6; } + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 + $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +-if test "${ac_cv_c_compiler_gnu+set}" = set; then ++if test "${ac_cv_c_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3698,37 +4194,16 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_compiler_gnu=no ++ ac_compiler_gnu=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 + $as_echo "$ac_cv_c_compiler_gnu" >&6; } + if test $ac_compiler_gnu = yes; then + GCC=yes +@@ -3737,20 +4212,16 @@ + fi + ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS +-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 + $as_echo_n "checking whether $CC accepts -g... " >&6; } +-if test "${ac_cv_prog_cc_g+set}" = set; then ++if test "${ac_cv_prog_cc_g+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3761,35 +4232,11 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- CFLAGS="" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ CFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3800,36 +4247,12 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_compile "$LINENO"; then : + +- ac_c_werror_flag=$ac_save_c_werror_flag ++else ++ ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -3840,42 +4263,17 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 + $as_echo "$ac_cv_prog_cc_g" >&6; } + if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +@@ -3892,18 +4290,14 @@ + CFLAGS= + fi + fi +-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 + $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +-if test "${ac_cv_prog_cc_c89+set}" = set; then ++if test "${ac_cv_prog_cc_c89+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_cv_prog_cc_c89=no + ac_save_CC=$CC +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <stdarg.h> + #include <stdio.h> +@@ -3960,32 +4354,9 @@ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" + do + CC="$ac_save_CC $ac_arg" +- rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++ if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break + done +@@ -3996,17 +4367,19 @@ + # AC_CACHE_VAL + case "x$ac_cv_prog_cc_c89" in + x) +- { $as_echo "$as_me:$LINENO: result: none needed" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 + $as_echo "none needed" >&6; } ;; + xno) +- { $as_echo "$as_me:$LINENO: result: unsupported" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 + $as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" +- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 + $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; + esac ++if test "x$ac_cv_prog_cc_c89" != xno; then : + ++fi + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -4016,9 +4389,9 @@ + + depcc="$CC" am_compiler_list= + +-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 + $as_echo_n "checking dependency style of $depcc... " >&6; } +-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then ++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +@@ -4044,6 +4417,11 @@ + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi ++ am__universal=false ++ case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac ++ + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and +@@ -4061,7 +4439,17 @@ + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs ++ am__obj=sub/conftest.${OBJEXT-o} ++ am__minus_obj="-o $am__obj" + case $depmode in ++ gcc) ++ # This depmode causes a compiler race in universal mode. ++ test "$am__universal" = false || continue ++ ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested +@@ -4071,19 +4459,23 @@ + break + fi + ;; ++ msvisualcpp | msvcmsys) ++ # This compiler won't grok `-c -o', but also, the minuso test has ++ # not run yet. These depmodes are late enough in the game, and ++ # so weak that their functioning should not be impacted. ++ am__obj=conftest.${OBJEXT-o} ++ am__minus_obj= ++ ;; + none) break ;; + esac +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. + if depmode=$depmode \ +- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message +@@ -4107,7 +4499,7 @@ + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 + $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + +@@ -4122,9 +4514,9 @@ + fi + + +-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 + $as_echo_n "checking for a sed that does not truncate output... " >&6; } +-if test "${ac_cv_path_SED+set}" = set; then ++if test "${ac_cv_path_SED+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ +@@ -4132,7 +4524,7 @@ + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed +- $as_unset ac_script || ac_script= ++ { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST +@@ -4141,7 +4533,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in sed gsed; do ++ for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue +@@ -4161,7 +4553,7 @@ + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` ++ as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" +@@ -4176,19 +4568,17 @@ + $ac_path_SED_found && break 3 + done + done +-done ++ done + IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5 +-$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi + else + ac_cv_path_SED=$SED + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 + $as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed +@@ -4206,9 +4596,9 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 + $as_echo_n "checking for grep that handles long lines and -e... " >&6; } +-if test "${ac_cv_path_GREP+set}" = set; then ++if test "${ac_cv_path_GREP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$GREP"; then +@@ -4219,7 +4609,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in grep ggrep; do ++ for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +@@ -4239,7 +4629,7 @@ + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` ++ as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" +@@ -4254,26 +4644,24 @@ + $ac_path_GREP_found && break 3 + done + done +-done ++ done + IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_GREP=$GREP + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 + $as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 + $as_echo_n "checking for egrep... " >&6; } +-if test "${ac_cv_path_EGREP+set}" = set; then ++if test "${ac_cv_path_EGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 +@@ -4287,7 +4675,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in egrep; do ++ for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +@@ -4307,7 +4695,7 @@ + $as_echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` ++ as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" +@@ -4322,12 +4710,10 @@ + $ac_path_EGREP_found && break 3 + done + done +-done ++ done + IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_EGREP=$EGREP +@@ -4335,14 +4721,14 @@ + + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 + $as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +-{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 + $as_echo_n "checking for fgrep... " >&6; } +-if test "${ac_cv_path_FGREP+set}" = set; then ++if test "${ac_cv_path_FGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 +@@ -4356,7 +4742,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_prog in fgrep; do ++ for ac_prog in fgrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue +@@ -4376,7 +4762,7 @@ + $as_echo 'FGREP' >> "conftest.nl" + "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` ++ as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_FGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_FGREP="$ac_path_FGREP" +@@ -4391,12 +4777,10 @@ + $ac_path_FGREP_found && break 3 + done + done +-done ++ done + IFS=$as_save_IFS + if test -z "$ac_cv_path_FGREP"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi + else + ac_cv_path_FGREP=$FGREP +@@ -4404,7 +4788,7 @@ + + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 + $as_echo "$ac_cv_path_FGREP" >&6; } + FGREP="$ac_cv_path_FGREP" + +@@ -4430,7 +4814,7 @@ + + + # Check whether --with-gnu-ld was given. +-if test "${with_gnu_ld+set}" = set; then ++if test "${with_gnu_ld+set}" = set; then : + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + else + with_gnu_ld=no +@@ -4439,7 +4823,7 @@ + ac_prog=ld + if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. +- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 + $as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) +@@ -4469,13 +4853,13 @@ + ;; + esac + elif test "$with_gnu_ld" = yes; then +- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 + $as_echo_n "checking for GNU ld... " >&6; } + else +- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 + $as_echo_n "checking for non-GNU ld... " >&6; } + fi +-if test "${lt_cv_path_LD+set}" = set; then ++if test "${lt_cv_path_LD+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$LD"; then +@@ -4506,18 +4890,16 @@ + + LD="$lt_cv_path_LD" + if test -n "$LD"; then +- { $as_echo "$as_me:$LINENO: result: $LD" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 + $as_echo "$LD" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi +-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} +- { (exit 1); exit 1; }; } +-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 ++test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 + $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +-if test "${lt_cv_prog_gnu_ld+set}" = set; then ++if test "${lt_cv_prog_gnu_ld+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +@@ -4530,7 +4912,7 @@ + ;; + esac + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 + $as_echo "$lt_cv_prog_gnu_ld" >&6; } + with_gnu_ld=$lt_cv_prog_gnu_ld + +@@ -4542,9 +4924,9 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 + $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +-if test "${lt_cv_path_NM+set}" = set; then ++if test "${lt_cv_path_NM+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$NM"; then +@@ -4591,7 +4973,7 @@ + : ${lt_cv_path_NM=no} + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 + $as_echo "$lt_cv_path_NM" >&6; } + if test "$lt_cv_path_NM" != "no"; then + NM="$lt_cv_path_NM" +@@ -4602,9 +4984,9 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_DUMPBIN+set}" = set; then ++if test "${ac_cv_prog_DUMPBIN+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$DUMPBIN"; then +@@ -4615,24 +4997,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + DUMPBIN=$ac_cv_prog_DUMPBIN + if test -n "$DUMPBIN"; then +- { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 + $as_echo "$DUMPBIN" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -4646,9 +5028,9 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then ++if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_DUMPBIN"; then +@@ -4659,24 +5041,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN + if test -n "$ac_ct_DUMPBIN"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 + $as_echo "$ac_ct_DUMPBIN" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -4689,7 +5071,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -4709,44 +5091,44 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 + $as_echo_n "checking the name lister ($NM) interface... " >&6; } +-if test "${lt_cv_nm_interface+set}" = set; then ++if test "${lt_cv_nm_interface+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:4719: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:5101: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:4722: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:5104: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:4725: output\"" >&5) ++ (eval echo "\"\$as_me:5107: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest* + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 + $as_echo "$lt_cv_nm_interface" >&6; } + +-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 + $as_echo_n "checking whether ln -s works... " >&6; } + LN_S=$as_ln_s + if test "$LN_S" = "ln -s"; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 + $as_echo "no, using $LN_S" >&6; } + fi + + # find the maximum length of command line arguments +-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 + $as_echo_n "checking the maximum length of command line arguments... " >&6; } +-if test "${lt_cv_sys_max_cmd_len+set}" = set; then ++if test "${lt_cv_sys_max_cmd_len+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + i=0 +@@ -4864,10 +5246,10 @@ + fi + + if test -n $lt_cv_sys_max_cmd_len ; then +- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 + $as_echo "$lt_cv_sys_max_cmd_len" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: none" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 + $as_echo "none" >&6; } + fi + max_cmd_len=$lt_cv_sys_max_cmd_len +@@ -4881,7 +5263,7 @@ + : ${MV="mv -f"} + : ${RM="rm -f"} + +-{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 + $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } + # Try some XSI features + xsi_shell=no +@@ -4891,17 +5273,17 @@ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +-{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 + $as_echo "$xsi_shell" >&6; } + + +-{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 + $as_echo_n "checking whether the shell understands \"+=\"... " >&6; } + lt_shell_append=no + ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ + >/dev/null 2>&1 \ + && lt_shell_append=yes +-{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 + $as_echo "$lt_shell_append" >&6; } + + +@@ -4936,14 +5318,14 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 + $as_echo_n "checking for $LD option to reload object files... " >&6; } +-if test "${lt_cv_ld_reload_flag+set}" = set; then ++if test "${lt_cv_ld_reload_flag+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_ld_reload_flag='-r' + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 + $as_echo "$lt_cv_ld_reload_flag" >&6; } + reload_flag=$lt_cv_ld_reload_flag + case $reload_flag in +@@ -4972,9 +5354,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. + set dummy ${ac_tool_prefix}objdump; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_OBJDUMP+set}" = set; then ++if test "${ac_cv_prog_OBJDUMP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$OBJDUMP"; then +@@ -4985,24 +5367,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + OBJDUMP=$ac_cv_prog_OBJDUMP + if test -n "$OBJDUMP"; then +- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 + $as_echo "$OBJDUMP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -5012,9 +5394,9 @@ + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. + set dummy objdump; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then ++if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OBJDUMP"; then +@@ -5025,24 +5407,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP + if test -n "$ac_ct_OBJDUMP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 + $as_echo "$ac_ct_OBJDUMP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -5051,7 +5433,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -5068,9 +5450,9 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 + $as_echo_n "checking how to recognize dependent libraries... " >&6; } +-if test "${lt_cv_deplibs_check_method+set}" = set; then ++if test "${lt_cv_deplibs_check_method+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_file_magic_cmd='$MAGIC_CMD' +@@ -5185,11 +5567,11 @@ + ;; + + # This must be Linux ELF. +-linux* | k*bsd*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) ++netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else +@@ -5264,7 +5646,7 @@ + esac + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 + $as_echo "$lt_cv_deplibs_check_method" >&6; } + file_magic_cmd=$lt_cv_file_magic_cmd + deplibs_check_method=$lt_cv_deplibs_check_method +@@ -5284,9 +5666,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. + set dummy ${ac_tool_prefix}ar; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_AR+set}" = set; then ++if test "${ac_cv_prog_AR+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$AR"; then +@@ -5297,24 +5679,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AR="${ac_tool_prefix}ar" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- { $as_echo "$as_me:$LINENO: result: $AR" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 + $as_echo "$AR" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -5324,9 +5706,9 @@ + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then ++if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_AR"; then +@@ -5337,24 +5719,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_AR="ar" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 + $as_echo "$ac_ct_AR" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -5363,7 +5745,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -5389,9 +5771,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_STRIP+set}" = set; then ++if test "${ac_cv_prog_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$STRIP"; then +@@ -5402,24 +5784,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 + $as_echo "$STRIP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -5429,9 +5811,9 @@ + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. + set dummy strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then ++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_STRIP"; then +@@ -5442,24 +5824,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 + $as_echo "$ac_ct_STRIP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -5468,7 +5850,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -5488,9 +5870,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. + set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_RANLIB+set}" = set; then ++if test "${ac_cv_prog_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$RANLIB"; then +@@ -5501,24 +5883,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then +- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 + $as_echo "$RANLIB" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -5528,9 +5910,9 @@ + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then ++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_RANLIB"; then +@@ -5541,24 +5923,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_RANLIB="ranlib" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB + if test -n "$ac_ct_RANLIB"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 + $as_echo "$ac_ct_RANLIB" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -5567,7 +5949,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -5645,9 +6027,9 @@ + + + # Check for command to grab the raw symbol name followed by C symbol from nm. +-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 + $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } +-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then ++if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + +@@ -5763,18 +6145,18 @@ + int main(){nm_test_var='a';nm_test_func();return(0);} + _LT_EOF + +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + # Now try to grab the symbols. + nlist=conftest.nm +- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 + (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s "$nlist"; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" +@@ -5827,11 +6209,11 @@ + lt_save_CFLAGS="$CFLAGS" + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext}; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s conftest${ac_exeext}; then + pipe_works=yes + fi + LIBS="$lt_save_LIBS" +@@ -5865,10 +6247,10 @@ + lt_cv_sys_global_symbol_to_cdecl= + fi + if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then +- { $as_echo "$as_me:$LINENO: result: failed" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 + $as_echo "failed" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: ok" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 + $as_echo "ok" >&6; } + fi + +@@ -5895,7 +6277,7 @@ + + + # Check whether --enable-libtool-lock was given. +-if test "${enable_libtool_lock+set}" = set; then ++if test "${enable_libtool_lock+set}" = set; then : + enableval=$enable_libtool_lock; + fi + +@@ -5907,11 +6289,11 @@ + ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" +@@ -5925,12 +6307,12 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 5928 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ echo '#line 6310 "configure"' > conftest.$ac_ext ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) +@@ -5964,11 +6346,11 @@ + s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in +@@ -6017,9 +6399,9 @@ + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" +- { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 + $as_echo_n "checking whether the C compiler needs -belf... " >&6; } +-if test "${lt_cv_cc_needs_belf+set}" = set; then ++if test "${lt_cv_cc_needs_belf+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_ext=c +@@ -6028,11 +6410,7 @@ + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -6043,38 +6421,13 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + lt_cv_cc_needs_belf=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- lt_cv_cc_needs_belf=no ++ lt_cv_cc_needs_belf=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -6082,7 +6435,7 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 + $as_echo "$lt_cv_cc_needs_belf" >&6; } + 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 +@@ -6092,11 +6445,11 @@ + sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in +@@ -6122,9 +6475,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. + set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then ++if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$DSYMUTIL"; then +@@ -6135,24 +6488,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + DSYMUTIL=$ac_cv_prog_DSYMUTIL + if test -n "$DSYMUTIL"; then +- { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 + $as_echo "$DSYMUTIL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6162,9 +6515,9 @@ + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. + set dummy dsymutil; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then ++if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_DSYMUTIL"; then +@@ -6175,24 +6528,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL + if test -n "$ac_ct_DSYMUTIL"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 + $as_echo "$ac_ct_DSYMUTIL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6201,7 +6554,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -6214,9 +6567,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. + set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_NMEDIT+set}" = set; then ++if test "${ac_cv_prog_NMEDIT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$NMEDIT"; then +@@ -6227,24 +6580,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + NMEDIT=$ac_cv_prog_NMEDIT + if test -n "$NMEDIT"; then +- { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 + $as_echo "$NMEDIT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6254,9 +6607,9 @@ + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. + set dummy nmedit; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then ++if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_NMEDIT"; then +@@ -6267,24 +6620,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_NMEDIT="nmedit" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT + if test -n "$ac_ct_NMEDIT"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 + $as_echo "$ac_ct_NMEDIT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6293,7 +6646,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -6306,9 +6659,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. + set dummy ${ac_tool_prefix}lipo; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_LIPO+set}" = set; then ++if test "${ac_cv_prog_LIPO+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$LIPO"; then +@@ -6319,24 +6672,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_LIPO="${ac_tool_prefix}lipo" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + LIPO=$ac_cv_prog_LIPO + if test -n "$LIPO"; then +- { $as_echo "$as_me:$LINENO: result: $LIPO" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 + $as_echo "$LIPO" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6346,9 +6699,9 @@ + ac_ct_LIPO=$LIPO + # Extract the first word of "lipo", so it can be a program name with args. + set dummy lipo; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then ++if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_LIPO"; then +@@ -6359,24 +6712,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_LIPO="lipo" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO + if test -n "$ac_ct_LIPO"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 + $as_echo "$ac_ct_LIPO" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6385,7 +6738,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -6398,9 +6751,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. + set dummy ${ac_tool_prefix}otool; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_OTOOL+set}" = set; then ++if test "${ac_cv_prog_OTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$OTOOL"; then +@@ -6411,24 +6764,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OTOOL="${ac_tool_prefix}otool" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + OTOOL=$ac_cv_prog_OTOOL + if test -n "$OTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 + $as_echo "$OTOOL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6438,9 +6791,9 @@ + ac_ct_OTOOL=$OTOOL + # Extract the first word of "otool", so it can be a program name with args. + set dummy otool; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then ++if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OTOOL"; then +@@ -6451,24 +6804,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OTOOL="otool" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL + if test -n "$ac_ct_OTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 + $as_echo "$ac_ct_OTOOL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6477,7 +6830,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -6490,9 +6843,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. + set dummy ${ac_tool_prefix}otool64; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_OTOOL64+set}" = set; then ++if test "${ac_cv_prog_OTOOL64+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$OTOOL64"; then +@@ -6503,24 +6856,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + OTOOL64=$ac_cv_prog_OTOOL64 + if test -n "$OTOOL64"; then +- { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 + $as_echo "$OTOOL64" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6530,9 +6883,9 @@ + ac_ct_OTOOL64=$OTOOL64 + # Extract the first word of "otool64", so it can be a program name with args. + set dummy otool64; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then ++if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_OTOOL64"; then +@@ -6543,24 +6896,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OTOOL64="otool64" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 + if test -n "$ac_ct_OTOOL64"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 + $as_echo "$ac_ct_OTOOL64" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -6569,7 +6922,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -6605,9 +6958,9 @@ + + + +- { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 + $as_echo_n "checking for -single_module linker flag... " >&6; } +-if test "${lt_cv_apple_cc_single_mod+set}" = set; then ++if test "${lt_cv_apple_cc_single_mod+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_apple_cc_single_mod=no +@@ -6632,22 +6985,18 @@ + rm -f conftest.* + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 + $as_echo "$lt_cv_apple_cc_single_mod" >&6; } +- { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 + $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } +-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then ++if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -6658,42 +7007,17 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + lt_cv_ld_exported_symbols_list=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- lt_cv_ld_exported_symbols_list=no ++ lt_cv_ld_exported_symbols_list=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 + $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + case $host_os in + rhapsody* | darwin1.[012]) +@@ -6735,14 +7059,14 @@ + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu +-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 + $as_echo_n "checking how to run the C preprocessor... " >&6; } + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= + fi + if test -z "$CPP"; then +- if test "${ac_cv_prog_CPP+set}" = set; then ++ if test "${ac_cv_prog_CPP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + # Double quotes because CPP needs to be expanded +@@ -6757,11 +7081,7 @@ + # <limits.h> exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __STDC__ + # include <limits.h> +@@ -6770,78 +7090,34 @@ + #endif + Syntax error + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_cpp "$LINENO"; then : + ++else + # Broken: fails on valid input. + continue + fi +- + rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <ac_nonexistent.h> + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then ++if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + # Passes both tests. + ac_preproc_ok=: + break + fi +- + rm -f conftest.err conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then ++if $ac_preproc_ok; then : + break + fi + +@@ -6853,7 +7129,7 @@ + else + ac_cv_prog_CPP=$CPP + fi +-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 + $as_echo "$CPP" >&6; } + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes +@@ -6864,11 +7140,7 @@ + # <limits.h> exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __STDC__ + # include <limits.h> +@@ -6877,87 +7149,40 @@ + #endif + Syntax error + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_cpp "$LINENO"; then : + ++else + # Broken: fails on valid input. + continue + fi +- + rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <ac_nonexistent.h> + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then ++if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- + # Passes both tests. + ac_preproc_ok=: + break + fi +- + rm -f conftest.err conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. + rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then +- : ++if $ac_preproc_ok; then : ++ + else +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++as_fn_error "C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details." "$LINENO" 5; } + fi + + ac_ext=c +@@ -6967,16 +7192,12 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 + $as_echo_n "checking for ANSI C header files... " >&6; } +-if test "${ac_cv_header_stdc+set}" = set; then ++if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <stdlib.h> + #include <stdarg.h> +@@ -6991,48 +7212,23 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_header_stdc=no ++ ac_cv_header_stdc=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <string.h> + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "memchr" >/dev/null 2>&1; then +- : ++ $EGREP "memchr" >/dev/null 2>&1; then : ++ + else + ac_cv_header_stdc=no + fi +@@ -7042,18 +7238,14 @@ + + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <stdlib.h> + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "free" >/dev/null 2>&1; then +- : ++ $EGREP "free" >/dev/null 2>&1; then : ++ + else + ac_cv_header_stdc=no + fi +@@ -7063,14 +7255,10 @@ + + if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +- if test "$cross_compiling" = yes; then ++ if test "$cross_compiling" = yes; then : + : + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include <ctype.h> + #include <stdlib.h> +@@ -7097,192 +7285,59 @@ + return 0; + } + _ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : +-else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_run "$LINENO"; then : + +-( exit $ac_status ) +-ac_cv_header_stdc=no ++else ++ ac_cv_header_stdc=no + fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + +- + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 + $as_echo "$ac_cv_header_stdc" >&6; } + if test $ac_cv_header_stdc = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define STDC_HEADERS 1 +-_ACEOF ++$as_echo "#define STDC_HEADERS 1" >>confdefs.h + + fi + + # On IRIX 5.3, sys/types and inttypes.h are conflicting. ++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ ++ inttypes.h stdint.h unistd.h ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default ++" ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF + ++fi + ++done + + ++for ac_header in dlfcn.h ++do : ++ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default ++" ++if test "x$ac_cv_header_dlfcn_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DLFCN_H 1 ++_ACEOF + ++fi + ++done + + + +-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ +- inttypes.h stdint.h unistd.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +- +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- eval "$as_ac_Header=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Header=no" +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +- +-done +- +- +- +-for ac_header in dlfcn.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +- +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- eval "$as_ac_Header=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Header=no" +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +- +-done +- +- +- +-# Set options ++# Set options + + + +@@ -7291,7 +7346,7 @@ + + + # Check whether --enable-shared was given. +-if test "${enable_shared+set}" = set; then ++if test "${enable_shared+set}" = set; then : + enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; +@@ -7322,7 +7377,7 @@ + + + # Check whether --enable-static was given. +-if test "${enable_static+set}" = set; then ++if test "${enable_static+set}" = set; then : + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; +@@ -7354,7 +7409,7 @@ + + + # Check whether --with-pic was given. +-if test "${with_pic+set}" = set; then ++if test "${with_pic+set}" = set; then : + withval=$with_pic; pic_mode="$withval" + else + pic_mode=default +@@ -7370,7 +7425,7 @@ + + + # Check whether --enable-fast-install was given. +-if test "${enable_fast_install+set}" = set; then ++if test "${enable_fast_install+set}" = set; then : + enableval=$enable_fast_install; p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; +@@ -7451,9 +7506,9 @@ + setopt NO_GLOB_SUBST + fi + +-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 + $as_echo_n "checking for objdir... " >&6; } +-if test "${lt_cv_objdir+set}" = set; then ++if test "${lt_cv_objdir+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + rm -f .libs 2>/dev/null +@@ -7466,7 +7521,7 @@ + fi + rmdir .libs 2>/dev/null + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 + $as_echo "$lt_cv_objdir" >&6; } + objdir=$lt_cv_objdir + +@@ -7559,9 +7614,9 @@ + case $deplibs_check_method in + file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then +- { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 + $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } +-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then ++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $MAGIC_CMD in +@@ -7612,10 +7667,10 @@ + + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if test -n "$MAGIC_CMD"; then +- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 + $as_echo "$MAGIC_CMD" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -7625,9 +7680,9 @@ + + if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then +- { $as_echo "$as_me:$LINENO: checking for file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 + $as_echo_n "checking for file... " >&6; } +-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then ++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + case $MAGIC_CMD in +@@ -7678,10 +7733,10 @@ + + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if test -n "$MAGIC_CMD"; then +- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 + $as_echo "$MAGIC_CMD" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -7762,9 +7817,9 @@ + if test "$GCC" = yes; then + lt_prog_compiler_no_builtin_flag=' -fno-builtin' + +- { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then ++if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_rtti_exceptions=no +@@ -7780,11 +7835,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7783: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7838: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7787: \$? = $ac_status" >&5 ++ echo "$as_me:7842: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -7797,7 +7852,7 @@ + $RM conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 + $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } + + if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then +@@ -7817,7 +7872,7 @@ + lt_prog_compiler_pic= + lt_prog_compiler_static= + +-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 + $as_echo_n "checking for $compiler option to produce PIC... " >&6; } + + if test "$GCC" = yes; then +@@ -7949,7 +8004,7 @@ + lt_prog_compiler_static='-non_shared' + ;; + +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. + ecc*) +@@ -8089,7 +8144,7 @@ + lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 + $as_echo "$lt_prog_compiler_pic" >&6; } + + +@@ -8101,9 +8156,9 @@ + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic"; then +- { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 + $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then ++if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_pic_works=no +@@ -8119,11 +8174,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8122: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8177: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8126: \$? = $ac_status" >&5 ++ echo "$as_me:8181: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -8136,7 +8191,7 @@ + $RM conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 + $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } + + if test x"$lt_cv_prog_compiler_pic_works" = xyes; then +@@ -8160,9 +8215,9 @@ + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" +-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +-if test "${lt_cv_prog_compiler_static_works+set}" = set; then ++if test "${lt_cv_prog_compiler_static_works+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_static_works=no +@@ -8188,7 +8243,7 @@ + LDFLAGS="$save_LDFLAGS" + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 + $as_echo "$lt_cv_prog_compiler_static_works" >&6; } + + if test x"$lt_cv_prog_compiler_static_works" = xyes; then +@@ -8203,9 +8258,9 @@ + + + +- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 + $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +-if test "${lt_cv_prog_compiler_c_o+set}" = set; then ++if test "${lt_cv_prog_compiler_c_o+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o=no +@@ -8224,11 +8279,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8227: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8282: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8231: \$? = $ac_status" >&5 ++ echo "$as_me:8286: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -8250,7 +8305,7 @@ + $RM conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 + $as_echo "$lt_cv_prog_compiler_c_o" >&6; } + + +@@ -8258,9 +8313,9 @@ + + + +- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 + $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +-if test "${lt_cv_prog_compiler_c_o+set}" = set; then ++if test "${lt_cv_prog_compiler_c_o+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_prog_compiler_c_o=no +@@ -8279,11 +8334,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8282: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8337: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8286: \$? = $ac_status" >&5 ++ echo "$as_me:8341: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -8305,7 +8360,7 @@ + $RM conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 + $as_echo "$lt_cv_prog_compiler_c_o" >&6; } + + +@@ -8314,7 +8369,7 @@ + hard_links="nottested" + if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user +- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 + $as_echo_n "checking if we can lock with hard links... " >&6; } + hard_links=yes + $RM conftest* +@@ -8322,10 +8377,10 @@ + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no +- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 + $as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then +- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi +@@ -8338,7 +8393,7 @@ + + + +- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 + $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + + runpath_var= +@@ -8398,6 +8453,9 @@ + openbsd*) + with_gnu_ld=no + ;; ++ linux* | k*bsd*-gnu) ++ link_all_deplibs=no ++ ;; + esac + + ld_shlibs=yes +@@ -8419,6 +8477,7 @@ + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in ++ *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +@@ -8510,7 +8569,7 @@ + archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- gnu* | linux* | tpf* | k*bsd*-gnu) ++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in +@@ -8580,7 +8639,7 @@ + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -8755,6 +8814,7 @@ + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi ++ link_all_deplibs=no + else + # not using gcc + if test "$host_cpu" = ia64; then +@@ -8780,11 +8840,7 @@ + allow_undefined_flag='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -8795,27 +8851,7 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -8829,16 +8865,9 @@ + if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" +@@ -8851,11 +8880,7 @@ + else + # Determine the default libpath from the value encoded in an + # empty executable. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -8866,27 +8891,7 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -8900,16 +8905,9 @@ + if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" +@@ -8961,7 +8959,8 @@ + # The linker will automatically build a .lib file if we build a DLL. + old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. +- fix_srcfile_path= ++ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ fix_srcfile_path='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes=yes + ;; + +@@ -9120,42 +9119,16 @@ + # implicitly export all symbols. + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" +- cat >conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ + int foo(void) {} + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + else + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' +@@ -9168,7 +9141,7 @@ + link_all_deplibs=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -9411,7 +9384,7 @@ + fi + fi + +-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 + $as_echo "$ld_shlibs" >&6; } + test "$ld_shlibs" = no && can_build_shared=no + +@@ -9448,16 +9421,16 @@ + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. +- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 + $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } 2>conftest.err; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext +@@ -9471,11 +9444,11 @@ + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= +- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } + then + archive_cmds_need_lc=no + else +@@ -9486,7 +9459,7 @@ + cat conftest.err 1>&5 + fi + $RM conftest* +- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 + $as_echo "$archive_cmds_need_lc" >&6; } + ;; + esac +@@ -9650,7 +9623,7 @@ + + + +- { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 + $as_echo_n "checking dynamic linker characteristics... " >&6; } + + if test "$GCC" = yes; then +@@ -9867,7 +9840,7 @@ + ;; + + *) +- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} ${libname}${versuffix}.lib' ++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; + esac + dynamic_linker='Win32 ld.exe' +@@ -10058,7 +10031,7 @@ + ;; + + # This must be Linux ELF. +-linux* | k*bsd*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -10072,11 +10045,7 @@ + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -10087,41 +10056,13 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then ++if ac_fn_c_try_link "$LINENO"; then : ++ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + shlibpath_overrides_runpath=yes + fi +- +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + +@@ -10145,6 +10086,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -10333,7 +10286,7 @@ + dynamic_linker=no + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 + $as_echo "$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + +@@ -10435,7 +10388,7 @@ + + + +- { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 + $as_echo_n "checking how to hardcode library paths into programs... " >&6; } + hardcode_action= + if test -n "$hardcode_libdir_flag_spec" || +@@ -10460,7 +10413,7 @@ + # directories. + hardcode_action=unsupported + fi +-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 + $as_echo "$hardcode_action" >&6; } + + if test "$hardcode_action" = relink || +@@ -10505,18 +10458,14 @@ + + darwin*) + # if libdl is installed we need to link against it +- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 + $as_echo_n "checking for dlopen in -ldl... " >&6; } +-if test "${ac_cv_lib_dl_dlopen+set}" = set; then ++if test "${ac_cv_lib_dl_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -10534,43 +10483,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dl_dlopen=no ++ ac_cv_lib_dl_dlopen=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 + $as_echo "$ac_cv_lib_dl_dlopen" >&6; } +-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then ++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + else + +@@ -10583,33 +10507,19 @@ + ;; + + *) +- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 +-$as_echo_n "checking for shl_load... " >&6; } +-if test "${ac_cv_func_shl_load+set}" = set; then ++ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" ++if test "x$ac_cv_func_shl_load" = x""yes; then : ++ lt_cv_dlopen="shl_load" ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 ++$as_echo_n "checking for shl_load in -ldld... " >&6; } ++if test "${ac_cv_lib_dld_shl_load+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldld $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define shl_load innocuous_shl_load +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char shl_load (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- +-#undef shl_load + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -10618,13 +10528,6 @@ + extern "C" + #endif + char shl_load (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_shl_load || defined __stub___shl_load +-choke me +-#endif +- + int + main () + { +@@ -10633,56 +10536,32 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_shl_load=yes ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_dld_shl_load=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_shl_load=no ++ ac_cv_lib_dld_shl_load=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +-$as_echo "$ac_cv_func_shl_load" >&6; } +-if test "x$ac_cv_func_shl_load" = x""yes; then +- lt_cv_dlopen="shl_load" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 ++$as_echo "$ac_cv_lib_dld_shl_load" >&6; } ++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : ++ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + else +- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +-$as_echo_n "checking for shl_load in -ldld... " >&6; } +-if test "${ac_cv_lib_dld_shl_load+set}" = set; then ++ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" ++if test "x$ac_cv_func_dlopen" = x""yes; then : ++ lt_cv_dlopen="dlopen" ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 ++$as_echo_n "checking for dlopen in -ldl... " >&6; } ++if test "${ac_cv_lib_dl_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++LIBS="-ldl $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -10691,222 +10570,37 @@ + #ifdef __cplusplus + extern "C" + #endif +-char shl_load (); ++char dlopen (); + int + main () + { +-return shl_load (); ++return dlopen (); + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_dld_shl_load=yes ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_dl_dlopen=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dld_shl_load=no ++ ac_cv_lib_dl_dlopen=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +-$as_echo "$ac_cv_lib_dld_shl_load" >&6; } +-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then +- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 ++$as_echo "$ac_cv_lib_dl_dlopen" >&6; } ++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : ++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + else +- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 +-$as_echo_n "checking for dlopen... " >&6; } +-if test "${ac_cv_func_dlopen+set}" = set; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 ++$as_echo_n "checking for dlopen in -lsvld... " >&6; } ++if test "${ac_cv_lib_svld_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define dlopen innocuous_dlopen +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char dlopen (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- +-#undef dlopen +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char dlopen (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_dlopen || defined __stub___dlopen +-choke me +-#endif +- +-int +-main () +-{ +-return dlopen (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_dlopen=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_dlopen=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +-$as_echo "$ac_cv_func_dlopen" >&6; } +-if test "x$ac_cv_func_dlopen" = x""yes; then +- lt_cv_dlopen="dlopen" +-else +- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +-$as_echo_n "checking for dlopen in -ldl... " >&6; } +-if test "${ac_cv_lib_dl_dlopen+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char dlopen (); +-int +-main () +-{ +-return dlopen (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_dl_dlopen=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dl_dlopen=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +-$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +-else +- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +-$as_echo_n "checking for dlopen in -lsvld... " >&6; } +-if test "${ac_cv_lib_svld_dlopen+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lsvld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lsvld $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -10924,57 +10618,28 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_svld_dlopen=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_svld_dlopen=no ++ ac_cv_lib_svld_dlopen=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 + $as_echo "$ac_cv_lib_svld_dlopen" >&6; } +-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then ++if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + else +- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 + $as_echo_n "checking for dld_link in -ldld... " >&6; } +-if test "${ac_cv_lib_dld_dld_link+set}" = set; then ++if test "${ac_cv_lib_dld_dld_link+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -10992,43 +10657,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_dld_link=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dld_dld_link=no ++ ac_cv_lib_dld_dld_link=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 + $as_echo "$ac_cv_lib_dld_dld_link" >&6; } +-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then ++if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + fi + +@@ -11067,9 +10707,9 @@ + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + +- { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 + $as_echo_n "checking whether a program can dlopen itself... " >&6; } +-if test "${lt_cv_dlopen_self+set}" = set; then ++if test "${lt_cv_dlopen_self+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -11078,7 +10718,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11081 "configure" ++#line 10721 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11137,11 +10777,11 @@ + return status; + } + _LT_EOF +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in +@@ -11158,14 +10798,14 @@ + + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 + $as_echo "$lt_cv_dlopen_self" >&6; } + + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" +- { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 + $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } +-if test "${lt_cv_dlopen_self_static+set}" = set; then ++if test "${lt_cv_dlopen_self_static+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : +@@ -11174,7 +10814,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11177 "configure" ++#line 10817 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11233,11 +10873,11 @@ + return status; + } + _LT_EOF +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in +@@ -11254,7 +10894,7 @@ + + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 + $as_echo "$lt_cv_dlopen_self_static" >&6; } + fi + +@@ -11293,12 +10933,12 @@ + + striplib= + old_striplib= +-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 + $as_echo_n "checking whether stripping libraries is possible... " >&6; } + if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else + # FIXME - insert some real tests, host_os isn't really good enough +@@ -11307,15 +10947,15 @@ + if test -n "$STRIP" ; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" +- { $as_echo "$as_me:$LINENO: result: yes" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + ;; + *) +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + ;; + esac +@@ -11333,12 +10973,12 @@ + + + # Report which library types will actually be built +- { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 + $as_echo_n "checking if libtool supports shared libraries... " >&6; } +- { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 + $as_echo "$can_build_shared" >&6; } + +- { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 + $as_echo_n "checking whether to build shared libraries... " >&6; } + test "$can_build_shared" = "no" && enable_shared=no + +@@ -11359,14 +10999,14 @@ + fi + ;; + esac +- { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 + $as_echo "$enable_shared" >&6; } + +- { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 + $as_echo_n "checking whether to build static libraries... " >&6; } + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes +- { $as_echo "$as_me:$LINENO: result: $enable_static" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 + $as_echo "$enable_static" >&6; } + + +@@ -11410,9 +11050,9 @@ + + depcc="$CCAS" am_compiler_list= + +-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 + $as_echo_n "checking dependency style of $depcc... " >&6; } +-if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then ++if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +@@ -11438,6 +11078,9 @@ + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi ++ am__universal=false ++ ++ + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and +@@ -11455,7 +11098,17 @@ + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs ++ am__obj=sub/conftest.${OBJEXT-o} ++ am__minus_obj="-o $am__obj" + case $depmode in ++ gcc) ++ # This depmode causes a compiler race in universal mode. ++ test "$am__universal" = false || continue ++ ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested +@@ -11465,4509 +11118,1091 @@ + break + fi + ;; ++ msvisualcpp | msvcmsys) ++ # This compiler won't grok `-c -o', but also, the minuso test has ++ # not run yet. These depmodes are late enough in the game, and ++ # so weak that their functioning should not be impacted. ++ am__obj=conftest.${OBJEXT-o} ++ am__minus_obj= ++ ;; + none) break ;; + esac +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. + if depmode=$depmode \ +- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required +- # The diagnosis changed in icc 8.0: +- # icc: Command line remark: option '-MP' not supported +- if (grep 'ignoring option' conftest.err || +- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else +- am_cv_CCAS_dependencies_compiler_type=$depmode +- break +- fi +- fi +- done +- +- cd .. +- rm -rf conftest.dir +-else +- am_cv_CCAS_dependencies_compiler_type=none +-fi +- +-fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_CCAS_dependencies_compiler_type" >&5 +-$as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; } +-CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type +- +- if +- test "x$enable_dependency_tracking" != xno \ +- && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3; then +- am__fastdepCCAS_TRUE= +- am__fastdepCCAS_FALSE='#' +-else +- am__fastdepCCAS_TRUE='#' +- am__fastdepCCAS_FALSE= +-fi +- +- +- +- +- +-ACLOCAL_AMFLAGS="-I m4 $ACLOCAL_AMFLAGS" +- +- +-################################################## +-# Check for gtk-doc. +-################################################## +- +-if test "x$cross_compiling" = "xyes" ; then +- enable_gtk_doc=no +-fi +- +- +-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- case $PKG_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- ;; +-esac +-fi +-PKG_CONFIG=$ac_cv_path_PKG_CONFIG +-if test -n "$PKG_CONFIG"; then +- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +-$as_echo "$PKG_CONFIG" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-fi +-if test -z "$ac_cv_path_PKG_CONFIG"; then +- ac_pt_PKG_CONFIG=$PKG_CONFIG +- # Extract the first word of "pkg-config", so it can be a program name with args. +-set dummy pkg-config; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- case $ac_pt_PKG_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- ;; +-esac +-fi +-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +-if test -n "$ac_pt_PKG_CONFIG"; then +- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +-$as_echo "$ac_pt_PKG_CONFIG" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- if test "x$ac_pt_PKG_CONFIG" = x; then +- PKG_CONFIG="" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- PKG_CONFIG=$ac_pt_PKG_CONFIG +- fi +-else +- PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +-fi +- +-fi +-if test -n "$PKG_CONFIG"; then +- _pkg_min_version=0.9.0 +- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } +- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +- PKG_CONFIG="" +- fi +- +-fi +- +- +-# Check whether --with-html-dir was given. +-if test "${with_html_dir+set}" = set; then +- withval=$with_html_dir; +-else +- with_html_dir='${datadir}/gtk-doc/html' +-fi +- +- HTML_DIR="$with_html_dir" +- +- +- # Check whether --enable-gtk-doc was given. +-if test "${enable_gtk_doc+set}" = set; then +- enableval=$enable_gtk_doc; +-else +- enable_gtk_doc=no +-fi +- +- +- if test x$enable_gtk_doc = xyes; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.0\"") >&5 +- ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.0") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- : +-else +- { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.0 installed to build gtk-doc" >&5 +-$as_echo "$as_me: error: You need to have gtk-doc >= 1.0 installed to build gtk-doc" >&2;} +- { (exit 1); exit 1; }; } +-fi +- fi +- +- { $as_echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5 +-$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } +- { $as_echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5 +-$as_echo "$enable_gtk_doc" >&6; } +- +- for ac_prog in gtkdoc-check +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- case $GTKDOC_CHECK in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- ;; +-esac +-fi +-GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK +-if test -n "$GTKDOC_CHECK"; then +- { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5 +-$as_echo "$GTKDOC_CHECK" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- test -n "$GTKDOC_CHECK" && break +-done +- +- +- if test x$enable_gtk_doc = xyes; then +- ENABLE_GTK_DOC_TRUE= +- ENABLE_GTK_DOC_FALSE='#' +-else +- ENABLE_GTK_DOC_TRUE='#' +- ENABLE_GTK_DOC_FALSE= +-fi +- +- if test -n "$LIBTOOL"; then +- GTK_DOC_USE_LIBTOOL_TRUE= +- GTK_DOC_USE_LIBTOOL_FALSE='#' +-else +- GTK_DOC_USE_LIBTOOL_TRUE='#' +- GTK_DOC_USE_LIBTOOL_FALSE= +-fi +- +- +- +- +- +- case "x${host_cpu}" in +- xi?86 | k?) +- HAVE_I386=yes +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_I386 1 +-_ACEOF +- +- ;; +- xx86_64|xamd64) +- HAVE_AMD64=yes +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_AMD64 1 +-_ACEOF +- +- ;; +- xpowerpc|xppc|xpowerpc64|xppc64) +- HAVE_POWERPC=yes +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_POWERPC 1 +-_ACEOF +- +- ;; +- xarm) +- HAVE_ARM=yes +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_ARM 1 +-_ACEOF +- +- ;; +- esac +- +- if test "x$HAVE_I386" = "xyes"; then +- HAVE_I386_TRUE= +- HAVE_I386_FALSE='#' +-else +- HAVE_I386_TRUE='#' +- HAVE_I386_FALSE= +-fi +- +- if test "x$HAVE_AMD64" = "xyes"; then +- HAVE_AMD64_TRUE= +- HAVE_AMD64_FALSE='#' +-else +- HAVE_AMD64_TRUE='#' +- HAVE_AMD64_FALSE= +-fi +- +- if test "x$HAVE_POWERPC" = "xyes"; then +- HAVE_POWERPC_TRUE= +- HAVE_POWERPC_FALSE='#' +-else +- HAVE_POWERPC_TRUE='#' +- HAVE_POWERPC_FALSE= +-fi +- +- if test "x$HAVE_ARM" = "xyes"; then +- HAVE_ARM_TRUE= +- HAVE_ARM_FALSE='#' +-else +- HAVE_ARM_TRUE='#' +- HAVE_ARM_FALSE= +-fi +- +- +- case "${host_os}" in +- mingw*) +- HAVE_OS_WIN32=yes +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_OS_WIN32 1 +-_ACEOF +- +- ;; +- linux*) +- HAVE_OS_LINUX=yes +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_OS_LINUX 1 +-_ACEOF +- +- ;; +- esac +- +- if test "$HAVE_OS_WIN32" = "yes"; then +- HAVE_OS_WIN32_TRUE= +- HAVE_OS_WIN32_FALSE='#' +-else +- HAVE_OS_WIN32_TRUE='#' +- HAVE_OS_WIN32_FALSE= +-fi +- +- if test "$HAVE_OS_LINUX" = "yes"; then +- HAVE_OS_LINUX_TRUE= +- HAVE_OS_LINUX_FALSE='#' +-else +- HAVE_OS_LINUX_TRUE='#' +- HAVE_OS_LINUX_FALSE= +-fi +- +- +- +- +- +- { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 +-$as_echo_n "checking whether byte ordering is bigendian... " >&6; } +-if test "${ac_cv_c_bigendian+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_c_bigendian=unknown +- # See if we're dealing with a universal compiler. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#ifndef __APPLE_CC__ +- not a universal capable compiler +- #endif +- typedef int dummy; +- +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- +- # Check for potential -arch flags. It is not universal unless +- # there are some -arch flags. Note that *ppc* also matches +- # ppc64. This check is also rather less than ideal. +- case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #( +- *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;; +- esac +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- if test $ac_cv_c_bigendian = unknown; then +- # See if sys/param.h defines the BYTE_ORDER macro. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <sys/types.h> +- #include <sys/param.h> +- +-int +-main () +-{ +-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ +- && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ +- && LITTLE_ENDIAN) +- bogus endian macros +- #endif +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- # It does; now see whether it defined to BIG_ENDIAN or not. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <sys/types.h> +- #include <sys/param.h> +- +-int +-main () +-{ +-#if BYTE_ORDER != BIG_ENDIAN +- not big endian +- #endif +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_cv_c_bigendian=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_c_bigendian=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- fi +- if test $ac_cv_c_bigendian = unknown; then +- # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <limits.h> +- +-int +-main () +-{ +-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) +- bogus endian macros +- #endif +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- # It does; now see whether it defined to _BIG_ENDIAN or not. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <limits.h> +- +-int +-main () +-{ +-#ifndef _BIG_ENDIAN +- not big endian +- #endif +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_cv_c_bigendian=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_c_bigendian=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- fi +- if test $ac_cv_c_bigendian = unknown; then +- # Compile a test program. +- if test "$cross_compiling" = yes; then +- # Try to guess by grepping values from an object file. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-short int ascii_mm[] = +- { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; +- short int ascii_ii[] = +- { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; +- int use_ascii (int i) { +- return ascii_mm[i] + ascii_ii[i]; +- } +- short int ebcdic_ii[] = +- { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; +- short int ebcdic_mm[] = +- { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; +- int use_ebcdic (int i) { +- return ebcdic_mm[i] + ebcdic_ii[i]; +- } +- extern int foo; +- +-int +-main () +-{ +-return use_ascii (foo) == use_ebcdic (foo); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then +- ac_cv_c_bigendian=yes +- fi +- if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then +- if test "$ac_cv_c_bigendian" = unknown; then +- ac_cv_c_bigendian=no +- else +- # finding both strings is unlikely to happen, but who knows? +- ac_cv_c_bigendian=unknown +- fi +- fi +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +- +- /* Are we little or big endian? From Harbison&Steele. */ +- union +- { +- long int l; +- char c[sizeof (long int)]; +- } u; +- u.l = 1; +- return u.c[sizeof (long int) - 1] == 1; +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_c_bigendian=no +-else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-ac_cv_c_bigendian=yes +-fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +- +- +- fi +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 +-$as_echo "$ac_cv_c_bigendian" >&6; } +- case $ac_cv_c_bigendian in #( +- yes) +- cat >>confdefs.h <<\_ACEOF +-#define WORDS_BIGENDIAN 1 +-_ACEOF +-;; #( +- no) +- ;; #( +- universal) +- +-cat >>confdefs.h <<\_ACEOF +-#define AC_APPLE_UNIVERSAL_BUILD 1 +-_ACEOF +- +- ;; #( +- *) +- { { $as_echo "$as_me:$LINENO: error: unknown endianness +- presetting ac_cv_c_bigendian=no (or yes) will help" >&5 +-$as_echo "$as_me: error: unknown endianness +- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} +- { (exit 1); exit 1; }; } ;; +- esac +- +- +-# ------ AX CREATE STDINT H ------------------------------------- +-{ $as_echo "$as_me:$LINENO: checking for stdint types" >&5 +-$as_echo_n "checking for stdint types... " >&6; } +-ac_stdint_h=`echo orc/orc-stdint.h` +-# try to shortcircuit - if the default include path of the compiler +-# can find a "stdint.h" header then we assume that all compilers can. +-if test "${ac_cv_header_stdint_t+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- +-old_CXXFLAGS="$CXXFLAGS" ; CXXFLAGS="" +-old_CPPFLAGS="$CPPFLAGS" ; CPPFLAGS="" +-old_CFLAGS="$CFLAGS" ; CFLAGS="" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <stdint.h> +-int +-main () +-{ +-int_least32_t v = 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_cv_stdint_result="(assuming C99 compatible system)" +- ac_cv_header_stdint_t="stdint.h"; +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_header_stdint_t="" +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-if test "$GCC" = "yes" && test ".$ac_cv_header_stdint_t" = "."; then +-CFLAGS="-std=c99" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <stdint.h> +-int +-main () +-{ +-int_least32_t v = 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- { $as_echo "$as_me:$LINENO: WARNING: your GCC compiler has a defunct stdint.h for its default-mode" >&5 +-$as_echo "$as_me: WARNING: your GCC compiler has a defunct stdint.h for its default-mode" >&2;} +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-CXXFLAGS="$old_CXXFLAGS" +-CPPFLAGS="$old_CPPFLAGS" +-CFLAGS="$old_CFLAGS" +-fi +- +- +-v="... $ac_cv_header_stdint_h" +-if test "$ac_stdint_h" = "stdint.h" ; then +- { $as_echo "$as_me:$LINENO: result: (are you sure you want them in ./stdint.h?)" >&5 +-$as_echo "(are you sure you want them in ./stdint.h?)" >&6; } +-elif test "$ac_stdint_h" = "inttypes.h" ; then +- { $as_echo "$as_me:$LINENO: result: (are you sure you want them in ./inttypes.h?)" >&5 +-$as_echo "(are you sure you want them in ./inttypes.h?)" >&6; } +-elif test "_$ac_cv_header_stdint_t" = "_" ; then +- { $as_echo "$as_me:$LINENO: result: (putting them into $ac_stdint_h)$v" >&5 +-$as_echo "(putting them into $ac_stdint_h)$v" >&6; } +-else +- ac_cv_header_stdint="$ac_cv_header_stdint_t" +- { $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdint (shortcircuit)" >&5 +-$as_echo "$ac_cv_header_stdint (shortcircuit)" >&6; } +-fi +- +-if test "_$ac_cv_header_stdint_t" = "_" ; then # can not shortcircuit.. +- +- +-inttype_headers=`echo | sed -e 's/,/ /g'` +- +-ac_cv_stdint_result="(no helpful system typedefs seen)" +- +-{ $as_echo "$as_me:$LINENO: checking for stdint uintptr_t" >&5 +-$as_echo_n "checking for stdint uintptr_t... " >&6; } +-if test "${ac_cv_header_stdint_x+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- +- ac_cv_header_stdint_x="" # the 1997 typedefs (inttypes.h) +- { $as_echo "$as_me:$LINENO: result: (..)" >&5 +-$as_echo "(..)" >&6; } +- for i in stdint.h inttypes.h sys/inttypes.h $inttype_headers +- do +- unset ac_cv_type_uintptr_t +- unset ac_cv_type_uint64_t +- { $as_echo "$as_me:$LINENO: checking for uintptr_t" >&5 +-$as_echo_n "checking for uintptr_t... " >&6; } +-if test "${ac_cv_type_uintptr_t+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_type_uintptr_t=no +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$i> +- +-int +-main () +-{ +-if (sizeof (uintptr_t)) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$i> +- +-int +-main () +-{ +-if (sizeof ((uintptr_t))) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_type_uintptr_t=yes +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uintptr_t" >&5 +-$as_echo "$ac_cv_type_uintptr_t" >&6; } +-if test "x$ac_cv_type_uintptr_t" = x""yes; then +- ac_cv_header_stdint_x=$i +-else +- continue +-fi +- +- { $as_echo "$as_me:$LINENO: checking for uint64_t" >&5 +-$as_echo_n "checking for uint64_t... " >&6; } +-if test "${ac_cv_type_uint64_t+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_type_uint64_t=no +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include<$i> +- +-int +-main () +-{ +-if (sizeof (uint64_t)) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include<$i> +- +-int +-main () +-{ +-if (sizeof ((uint64_t))) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_type_uint64_t=yes +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5 +-$as_echo "$ac_cv_type_uint64_t" >&6; } +-if test "x$ac_cv_type_uint64_t" = x""yes; then +- and64="/uint64_t" +-else +- and64="" +-fi +- +- ac_cv_stdint_result="(seen uintptr_t$and64 in $i)" +- break +- done +- { $as_echo "$as_me:$LINENO: checking for stdint uintptr_t" >&5 +-$as_echo_n "checking for stdint uintptr_t... " >&6; } +- +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdint_x" >&5 +-$as_echo "$ac_cv_header_stdint_x" >&6; } +- +- +-if test "_$ac_cv_header_stdint_x" = "_" ; then +- +-{ $as_echo "$as_me:$LINENO: checking for stdint uint32_t" >&5 +-$as_echo_n "checking for stdint uint32_t... " >&6; } +-if test "${ac_cv_header_stdint_o+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- +- ac_cv_header_stdint_o="" # the 1995 typedefs (sys/inttypes.h) +- { $as_echo "$as_me:$LINENO: result: (..)" >&5 +-$as_echo "(..)" >&6; } +- for i in inttypes.h sys/inttypes.h stdint.h $inttype_headers +- do +- unset ac_cv_type_uint32_t +- unset ac_cv_type_uint64_t +- { $as_echo "$as_me:$LINENO: checking for uint32_t" >&5 +-$as_echo_n "checking for uint32_t... " >&6; } +-if test "${ac_cv_type_uint32_t+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_type_uint32_t=no +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$i> +- +-int +-main () +-{ +-if (sizeof (uint32_t)) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$i> +- +-int +-main () +-{ +-if (sizeof ((uint32_t))) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_type_uint32_t=yes +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5 +-$as_echo "$ac_cv_type_uint32_t" >&6; } +-if test "x$ac_cv_type_uint32_t" = x""yes; then +- ac_cv_header_stdint_o=$i +-else +- continue +-fi +- +- { $as_echo "$as_me:$LINENO: checking for uint64_t" >&5 +-$as_echo_n "checking for uint64_t... " >&6; } +-if test "${ac_cv_type_uint64_t+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_type_uint64_t=no +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include<$i> +- +-int +-main () +-{ +-if (sizeof (uint64_t)) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include<$i> +- +-int +-main () +-{ +-if (sizeof ((uint64_t))) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_type_uint64_t=yes +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5 +-$as_echo "$ac_cv_type_uint64_t" >&6; } +-if test "x$ac_cv_type_uint64_t" = x""yes; then +- and64="/uint64_t" +-else +- and64="" +-fi +- +- ac_cv_stdint_result="(seen uint32_t$and64 in $i)" +- break +- break; +- done +- { $as_echo "$as_me:$LINENO: checking for stdint uint32_t" >&5 +-$as_echo_n "checking for stdint uint32_t... " >&6; } +- +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdint_o" >&5 +-$as_echo "$ac_cv_header_stdint_o" >&6; } +- +-fi +- +-if test "_$ac_cv_header_stdint_x" = "_" ; then +-if test "_$ac_cv_header_stdint_o" = "_" ; then +- +-{ $as_echo "$as_me:$LINENO: checking for stdint u_int32_t" >&5 +-$as_echo_n "checking for stdint u_int32_t... " >&6; } +-if test "${ac_cv_header_stdint_u+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- +- ac_cv_header_stdint_u="" # the BSD typedefs (sys/types.h) +- { $as_echo "$as_me:$LINENO: result: (..)" >&5 +-$as_echo "(..)" >&6; } +- for i in sys/types.h inttypes.h sys/inttypes.h $inttype_headers ; do +- unset ac_cv_type_u_int32_t +- unset ac_cv_type_u_int64_t +- { $as_echo "$as_me:$LINENO: checking for u_int32_t" >&5 +-$as_echo_n "checking for u_int32_t... " >&6; } +-if test "${ac_cv_type_u_int32_t+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_type_u_int32_t=no +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$i> +- +-int +-main () +-{ +-if (sizeof (u_int32_t)) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$i> +- +-int +-main () +-{ +-if (sizeof ((u_int32_t))) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_type_u_int32_t=yes +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_u_int32_t" >&5 +-$as_echo "$ac_cv_type_u_int32_t" >&6; } +-if test "x$ac_cv_type_u_int32_t" = x""yes; then +- ac_cv_header_stdint_u=$i +-else +- continue +-fi +- +- { $as_echo "$as_me:$LINENO: checking for u_int64_t" >&5 +-$as_echo_n "checking for u_int64_t... " >&6; } +-if test "${ac_cv_type_u_int64_t+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_type_u_int64_t=no +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include<$i> +- +-int +-main () +-{ +-if (sizeof (u_int64_t)) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include<$i> +- +-int +-main () +-{ +-if (sizeof ((u_int64_t))) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_type_u_int64_t=yes +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_u_int64_t" >&5 +-$as_echo "$ac_cv_type_u_int64_t" >&6; } +-if test "x$ac_cv_type_u_int64_t" = x""yes; then +- and64="/u_int64_t" +-else +- and64="" +-fi +- +- ac_cv_stdint_result="(seen u_int32_t$and64 in $i)" +- break +- break; +- done +- { $as_echo "$as_me:$LINENO: checking for stdint u_int32_t" >&5 +-$as_echo_n "checking for stdint u_int32_t... " >&6; } +- +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdint_u" >&5 +-$as_echo "$ac_cv_header_stdint_u" >&6; } +- +-fi fi +- +-if test "_$ac_cv_header_stdint_x" = "_" ; then +- { $as_echo "$as_me:$LINENO: checking for stdint datatype model" >&5 +-$as_echo_n "checking for stdint datatype model... " >&6; } +- { $as_echo "$as_me:$LINENO: result: (..)" >&5 +-$as_echo "(..)" >&6; } +- +- # The cast to long int works around a bug in the HP C Compiler +-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +-# This bug is HP SR number 8606223364. +-{ $as_echo "$as_me:$LINENO: checking size of char" >&5 +-$as_echo_n "checking size of char... " >&6; } +-if test "${ac_cv_sizeof_char+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test "$cross_compiling" = yes; then +- # Depending upon the size, compute the lo and hi bounds. +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_lo=0 ac_mid=0 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=$ac_mid; break +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_lo=`expr $ac_mid + 1` +- if test $ac_lo -le $ac_mid; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid + 1` +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (char))) < 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=-1 ac_mid=-1 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_lo=$ac_mid; break +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_hi=`expr '(' $ac_mid ')' - 1` +- if test $ac_mid -le $ac_hi; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid` +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_lo= ac_hi= +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-# Binary search between lo and hi bounds. +-while test "x$ac_lo" != "x$ac_hi"; do +- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=$ac_mid +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_lo=`expr '(' $ac_mid ')' + 1` +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-case $ac_lo in +-?*) ac_cv_sizeof_char=$ac_lo;; +-'') if test "$ac_cv_type_char" = yes; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char) +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute sizeof (char) +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } +- else +- ac_cv_sizeof_char=0 +- fi ;; +-esac +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-static long int longval () { return (long int) (sizeof (char)); } +-static unsigned long int ulongval () { return (long int) (sizeof (char)); } +-#include <stdio.h> +-#include <stdlib.h> +-int +-main () +-{ +- +- FILE *f = fopen ("conftest.val", "w"); +- if (! f) +- return 1; +- if (((long int) (sizeof (char))) < 0) +- { +- long int i = longval (); +- if (i != ((long int) (sizeof (char)))) +- return 1; +- fprintf (f, "%ld", i); +- } +- else +- { +- unsigned long int i = ulongval (); +- if (i != ((long int) (sizeof (char)))) +- return 1; +- fprintf (f, "%lu", i); +- } +- /* Do not output a trailing newline, as this causes \r\n confusion +- on some platforms. */ +- return ferror (f) || fclose (f) != 0; +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_sizeof_char=`cat conftest.val` +-else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-if test "$ac_cv_type_char" = yes; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char) +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute sizeof (char) +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } +- else +- ac_cv_sizeof_char=0 +- fi +-fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f conftest.val +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5 +-$as_echo "$ac_cv_sizeof_char" >&6; } +- +- +- +-cat >>confdefs.h <<_ACEOF +-#define SIZEOF_CHAR $ac_cv_sizeof_char +-_ACEOF +- +- +- # The cast to long int works around a bug in the HP C Compiler +-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +-# This bug is HP SR number 8606223364. +-{ $as_echo "$as_me:$LINENO: checking size of short" >&5 +-$as_echo_n "checking size of short... " >&6; } +-if test "${ac_cv_sizeof_short+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test "$cross_compiling" = yes; then +- # Depending upon the size, compute the lo and hi bounds. +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_lo=0 ac_mid=0 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=$ac_mid; break +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_lo=`expr $ac_mid + 1` +- if test $ac_lo -le $ac_mid; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid + 1` +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (short))) < 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=-1 ac_mid=-1 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_lo=$ac_mid; break +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_hi=`expr '(' $ac_mid ')' - 1` +- if test $ac_mid -le $ac_hi; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid` +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_lo= ac_hi= +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-# Binary search between lo and hi bounds. +-while test "x$ac_lo" != "x$ac_hi"; do +- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=$ac_mid +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_lo=`expr '(' $ac_mid ')' + 1` +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-case $ac_lo in +-?*) ac_cv_sizeof_short=$ac_lo;; +-'') if test "$ac_cv_type_short" = yes; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short) +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute sizeof (short) +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } +- else +- ac_cv_sizeof_short=0 +- fi ;; +-esac +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-static long int longval () { return (long int) (sizeof (short)); } +-static unsigned long int ulongval () { return (long int) (sizeof (short)); } +-#include <stdio.h> +-#include <stdlib.h> +-int +-main () +-{ +- +- FILE *f = fopen ("conftest.val", "w"); +- if (! f) +- return 1; +- if (((long int) (sizeof (short))) < 0) +- { +- long int i = longval (); +- if (i != ((long int) (sizeof (short)))) +- return 1; +- fprintf (f, "%ld", i); +- } +- else +- { +- unsigned long int i = ulongval (); +- if (i != ((long int) (sizeof (short)))) +- return 1; +- fprintf (f, "%lu", i); +- } +- /* Do not output a trailing newline, as this causes \r\n confusion +- on some platforms. */ +- return ferror (f) || fclose (f) != 0; +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_sizeof_short=`cat conftest.val` +-else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-if test "$ac_cv_type_short" = yes; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short) +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute sizeof (short) +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } +- else +- ac_cv_sizeof_short=0 +- fi +-fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f conftest.val +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 +-$as_echo "$ac_cv_sizeof_short" >&6; } +- +- +- +-cat >>confdefs.h <<_ACEOF +-#define SIZEOF_SHORT $ac_cv_sizeof_short +-_ACEOF +- +- +- # The cast to long int works around a bug in the HP C Compiler +-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +-# This bug is HP SR number 8606223364. +-{ $as_echo "$as_me:$LINENO: checking size of int" >&5 +-$as_echo_n "checking size of int... " >&6; } +-if test "${ac_cv_sizeof_int+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test "$cross_compiling" = yes; then +- # Depending upon the size, compute the lo and hi bounds. +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_lo=0 ac_mid=0 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=$ac_mid; break +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_lo=`expr $ac_mid + 1` +- if test $ac_lo -le $ac_mid; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid + 1` +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (int))) < 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=-1 ac_mid=-1 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_lo=$ac_mid; break +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_hi=`expr '(' $ac_mid ')' - 1` +- if test $ac_mid -le $ac_hi; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid` +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_CCAS_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi + done +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_lo= ac_hi= ++ cd .. ++ rm -rf conftest.dir ++else ++ am_cv_CCAS_dependencies_compiler_type=none + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CCAS_dependencies_compiler_type" >&5 ++$as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; } ++CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-# Binary search between lo and hi bounds. +-while test "x$ac_lo" != "x$ac_hi"; do +- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=$ac_mid ++ if ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3; then ++ am__fastdepCCAS_TRUE= ++ am__fastdepCCAS_FALSE='#' + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_lo=`expr '(' $ac_mid ')' + 1` ++ am__fastdepCCAS_TRUE='#' ++ am__fastdepCCAS_FALSE= + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-case $ac_lo in +-?*) ac_cv_sizeof_int=$ac_lo;; +-'') if test "$ac_cv_type_int" = yes; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int) +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute sizeof (int) +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } +- else +- ac_cv_sizeof_int=0 +- fi ;; +-esac +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-static long int longval () { return (long int) (sizeof (int)); } +-static unsigned long int ulongval () { return (long int) (sizeof (int)); } +-#include <stdio.h> +-#include <stdlib.h> +-int +-main () +-{ + +- FILE *f = fopen ("conftest.val", "w"); +- if (! f) +- return 1; +- if (((long int) (sizeof (int))) < 0) +- { +- long int i = longval (); +- if (i != ((long int) (sizeof (int)))) +- return 1; +- fprintf (f, "%ld", i); +- } +- else +- { +- unsigned long int i = ulongval (); +- if (i != ((long int) (sizeof (int)))) +- return 1; +- fprintf (f, "%lu", i); +- } +- /* Do not output a trailing newline, as this causes \r\n confusion +- on some platforms. */ +- return ferror (f) || fclose (f) != 0; + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_sizeof_int=`cat conftest.val` +-else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +-( exit $ac_status ) +-if test "$ac_cv_type_int" = yes; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int) +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute sizeof (int) +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } +- else +- ac_cv_sizeof_int=0 +- fi +-fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f conftest.val +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 +-$as_echo "$ac_cv_sizeof_int" >&6; } + ++ACLOCAL_AMFLAGS="-I m4 $ACLOCAL_AMFLAGS" + + +-cat >>confdefs.h <<_ACEOF +-#define SIZEOF_INT $ac_cv_sizeof_int +-_ACEOF ++################################################## ++# Check for gtk-doc. ++################################################## ++ ++if test "x$cross_compiling" = "xyes" ; then ++ enable_gtk_doc=no ++fi + + +- # The cast to long int works around a bug in the HP C Compiler +-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +-# This bug is HP SR number 8606223364. +-{ $as_echo "$as_me:$LINENO: checking size of long" >&5 +-$as_echo_n "checking size of long... " >&6; } +-if test "${ac_cv_sizeof_long+set}" = set; then ++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. ++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- if test "$cross_compiling" = yes; then +- # Depending upon the size, compute the lo and hi bounds. +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_lo=0 ac_mid=0 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)]; +-test_array [0] = 0 ++ case $PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; ++ ;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=$ac_mid; break +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_lo=`expr $ac_mid + 1` +- if test $ac_lo -le $ac_mid; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid + 1` + fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- done ++PKG_CONFIG=$ac_cv_path_PKG_CONFIG ++if test -n "$PKG_CONFIG"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 ++$as_echo "$PKG_CONFIG" >&6; } + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi + +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)]; +-test_array [0] = 0 + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=-1 ac_mid=-1 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)]; +-test_array [0] = 0 ++fi ++if test -z "$ac_cv_path_PKG_CONFIG"; then ++ ac_pt_PKG_CONFIG=$PKG_CONFIG ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $ac_pt_PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; ++ ;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_lo=$ac_mid; break ++fi ++ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG ++if test -n "$ac_pt_PKG_CONFIG"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 ++$as_echo "$ac_pt_PKG_CONFIG" >&6; } + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_hi=`expr '(' $ac_mid ')' - 1` +- if test $ac_mid -le $ac_hi; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid` ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- done ++ if test "x$ac_pt_PKG_CONFIG" = x; then ++ PKG_CONFIG="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ PKG_CONFIG=$ac_pt_PKG_CONFIG ++ fi + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" ++fi + +- ac_lo= ac_hi= + fi ++if test -n "$PKG_CONFIG"; then ++ _pkg_min_version=0.9.0 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 ++$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } ++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ PKG_CONFIG="" ++ fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-# Binary search between lo and hi bounds. +-while test "x$ac_lo" != "x$ac_hi"; do +- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)]; +-test_array [0] = 0 + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=$ac_mid ++# Check whether --with-html-dir was given. ++if test "${with_html_dir+set}" = set; then : ++ withval=$with_html_dir; + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_lo=`expr '(' $ac_mid ')' + 1` ++ with_html_dir='${datadir}/gtk-doc/html' + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-case $ac_lo in +-?*) ac_cv_sizeof_long=$ac_lo;; +-'') if test "$ac_cv_type_long" = yes; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long) +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute sizeof (long) +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } +- else +- ac_cv_sizeof_long=0 +- fi ;; +-esac +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-static long int longval () { return (long int) (sizeof (long)); } +-static unsigned long int ulongval () { return (long int) (sizeof (long)); } +-#include <stdio.h> +-#include <stdlib.h> +-int +-main () +-{ ++ HTML_DIR="$with_html_dir" + +- FILE *f = fopen ("conftest.val", "w"); +- if (! f) +- return 1; +- if (((long int) (sizeof (long))) < 0) +- { +- long int i = longval (); +- if (i != ((long int) (sizeof (long)))) +- return 1; +- fprintf (f, "%ld", i); +- } +- else +- { +- unsigned long int i = ulongval (); +- if (i != ((long int) (sizeof (long)))) +- return 1; +- fprintf (f, "%lu", i); +- } +- /* Do not output a trailing newline, as this causes \r\n confusion +- on some platforms. */ +- return ferror (f) || fclose (f) != 0; + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_sizeof_long=`cat conftest.val` ++ # Check whether --enable-gtk-doc was given. ++if test "${enable_gtk_doc+set}" = set; then : ++ enableval=$enable_gtk_doc; + else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-if test "$ac_cv_type_long" = yes; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long) +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute sizeof (long) +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } +- else +- ac_cv_sizeof_long=0 +- fi +-fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f conftest.val ++ enable_gtk_doc=no + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 +-$as_echo "$ac_cv_sizeof_long" >&6; } +- + + +-cat >>confdefs.h <<_ACEOF +-#define SIZEOF_LONG $ac_cv_sizeof_long +-_ACEOF ++ if test x$enable_gtk_doc = xyes; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ : ++else ++ as_fn_error "You need to have gtk-doc >= 1.0 installed to build gtk-doc" "$LINENO" 5 ++fi ++ fi + ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 ++$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 ++$as_echo "$enable_gtk_doc" >&6; } + +- # The cast to long int works around a bug in the HP C Compiler +-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +-# This bug is HP SR number 8606223364. +-{ $as_echo "$as_me:$LINENO: checking size of void*" >&5 +-$as_echo_n "checking size of void*... " >&6; } +-if test "${ac_cv_sizeof_voidp+set}" = set; then ++ for ac_prog in gtkdoc-check ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- if test "$cross_compiling" = yes; then +- # Depending upon the size, compute the lo and hi bounds. +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (void*))) >= 0)]; +-test_array [0] = 0 +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_lo=0 ac_mid=0 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (void*))) <= $ac_mid)]; +-test_array [0] = 0 ++ case $GTKDOC_CHECK in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; ++ ;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=$ac_mid; break ++fi ++GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK ++if test -n "$GTKDOC_CHECK"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 ++$as_echo "$GTKDOC_CHECK" >&6; } + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi + +- ac_lo=`expr $ac_mid + 1` +- if test $ac_lo -le $ac_mid; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid + 1` ++ ++ test -n "$GTKDOC_CHECK" && break ++done ++ ++ ++ if test x$enable_gtk_doc = xyes; then ++ ENABLE_GTK_DOC_TRUE= ++ ENABLE_GTK_DOC_FALSE='#' ++else ++ ENABLE_GTK_DOC_TRUE='#' ++ ENABLE_GTK_DOC_FALSE= + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- done ++ if test -n "$LIBTOOL"; then ++ GTK_DOC_USE_LIBTOOL_TRUE= ++ GTK_DOC_USE_LIBTOOL_FALSE='#' + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ GTK_DOC_USE_LIBTOOL_TRUE='#' ++ GTK_DOC_USE_LIBTOOL_FALSE= ++fi + +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (void*))) < 0)]; +-test_array [0] = 0 + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=-1 ac_mid=-1 +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (void*))) >= $ac_mid)]; +-test_array [0] = 0 + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_lo=$ac_mid; break +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_hi=`expr '(' $ac_mid ')' - 1` +- if test $ac_mid -le $ac_hi; then +- ac_lo= ac_hi= +- break +- fi +- ac_mid=`expr 2 '*' $ac_mid` +-fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ case "x${host_cpu}" in ++ xi?86 | k?) ++ HAVE_I386=yes + +- ac_lo= ac_hi= +-fi ++$as_echo "#define HAVE_I386 1" >>confdefs.h + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi ++ ;; ++ xx86_64|xamd64) ++ HAVE_AMD64=yes + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-# Binary search between lo and hi bounds. +-while test "x$ac_lo" != "x$ac_hi"; do +- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-static int test_array [1 - 2 * !(((long int) (sizeof (void*))) <= $ac_mid)]; +-test_array [0] = 0 ++$as_echo "#define HAVE_AMD64 1" >>confdefs.h + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_hi=$ac_mid +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ ;; ++ xpowerpc|xppc|xpowerpc64|xppc64) ++ HAVE_POWERPC=yes + +- ac_lo=`expr '(' $ac_mid ')' + 1` +-fi ++$as_echo "#define HAVE_POWERPC 1" >>confdefs.h + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-case $ac_lo in +-?*) ac_cv_sizeof_voidp=$ac_lo;; +-'') if test "$ac_cv_type_voidp" = yes; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void*) +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute sizeof (void*) +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } +- else +- ac_cv_sizeof_voidp=0 +- fi ;; +-esac +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-static long int longval () { return (long int) (sizeof (void*)); } +-static unsigned long int ulongval () { return (long int) (sizeof (void*)); } +-#include <stdio.h> +-#include <stdlib.h> +-int +-main () +-{ ++ ;; ++ xarm) ++ HAVE_ARM=yes + +- FILE *f = fopen ("conftest.val", "w"); +- if (! f) +- return 1; +- if (((long int) (sizeof (void*))) < 0) +- { +- long int i = longval (); +- if (i != ((long int) (sizeof (void*)))) +- return 1; +- fprintf (f, "%ld", i); +- } +- else +- { +- unsigned long int i = ulongval (); +- if (i != ((long int) (sizeof (void*)))) +- return 1; +- fprintf (f, "%lu", i); +- } +- /* Do not output a trailing newline, as this causes \r\n confusion +- on some platforms. */ +- return ferror (f) || fclose (f) != 0; ++$as_echo "#define HAVE_ARM 1" >>confdefs.h + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_sizeof_voidp=`cat conftest.val` ++ ;; ++ esac ++ ++ if test "x$HAVE_I386" = "xyes"; then ++ HAVE_I386_TRUE= ++ HAVE_I386_FALSE='#' + else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ HAVE_I386_TRUE='#' ++ HAVE_I386_FALSE= ++fi + +-( exit $ac_status ) +-if test "$ac_cv_type_voidp" = yes; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void*) +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute sizeof (void*) +-See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } +- else +- ac_cv_sizeof_voidp=0 +- fi ++ if test "x$HAVE_AMD64" = "xyes"; then ++ HAVE_AMD64_TRUE= ++ HAVE_AMD64_FALSE='#' ++else ++ HAVE_AMD64_TRUE='#' ++ HAVE_AMD64_FALSE= + fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++ ++ if test "x$HAVE_POWERPC" = "xyes"; then ++ HAVE_POWERPC_TRUE= ++ HAVE_POWERPC_FALSE='#' ++else ++ HAVE_POWERPC_TRUE='#' ++ HAVE_POWERPC_FALSE= + fi +-rm -f conftest.val ++ ++ if test "x$HAVE_ARM" = "xyes"; then ++ HAVE_ARM_TRUE= ++ HAVE_ARM_FALSE='#' ++else ++ HAVE_ARM_TRUE='#' ++ HAVE_ARM_FALSE= + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_voidp" >&5 +-$as_echo "$ac_cv_sizeof_voidp" >&6; } + + ++ case "${host_os}" in ++ mingw*) ++ HAVE_OS_WIN32=yes + +-cat >>confdefs.h <<_ACEOF +-#define SIZEOF_VOIDP $ac_cv_sizeof_voidp +-_ACEOF ++$as_echo "#define HAVE_OS_WIN32 1" >>confdefs.h + ++ ;; ++ linux*) ++ HAVE_OS_LINUX=yes + +- ac_cv_char_data_model="" +- ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_char" +- ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_short" +- ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_int" +- ac_cv_long_data_model="" +- ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_int" +- ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_long" +- ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_voidp" +- { $as_echo "$as_me:$LINENO: checking data model" >&5 +-$as_echo_n "checking data model... " >&6; } +- case "$ac_cv_char_data_model/$ac_cv_long_data_model" in +- 122/242) ac_cv_data_model="IP16" ; n="standard 16bit machine" ;; +- 122/244) ac_cv_data_model="LP32" ; n="standard 32bit machine" ;; +- 122/*) ac_cv_data_model="i16" ; n="unusual int16 model" ;; +- 124/444) ac_cv_data_model="ILP32" ; n="standard 32bit unixish" ;; +- 124/488) ac_cv_data_model="LP64" ; n="standard 64bit unixish" ;; +- 124/448) ac_cv_data_model="LLP64" ; n="unusual 64bit unixish" ;; +- 124/*) ac_cv_data_model="i32" ; n="unusual int32 model" ;; +- 128/888) ac_cv_data_model="ILP64" ; n="unusual 64bit numeric" ;; +- 128/*) ac_cv_data_model="i64" ; n="unusual int64 model" ;; +- 222/*2) ac_cv_data_model="DSP16" ; n="strict 16bit dsptype" ;; +- 333/*3) ac_cv_data_model="DSP24" ; n="strict 24bit dsptype" ;; +- 444/*4) ac_cv_data_model="DSP32" ; n="strict 32bit dsptype" ;; +- 666/*6) ac_cv_data_model="DSP48" ; n="strict 48bit dsptype" ;; +- 888/*8) ac_cv_data_model="DSP64" ; n="strict 64bit dsptype" ;; +- 222/*|333/*|444/*|666/*|888/*) : +- ac_cv_data_model="iDSP" ; n="unusual dsptype" ;; +- *) ac_cv_data_model="none" ; n="very unusual model" ;; +- esac +- { $as_echo "$as_me:$LINENO: result: $ac_cv_data_model ($ac_cv_long_data_model, $n)" >&5 +-$as_echo "$ac_cv_data_model ($ac_cv_long_data_model, $n)" >&6; } ++$as_echo "#define HAVE_OS_LINUX 1" >>confdefs.h ++ ++ ;; ++ esac + ++ if test "$HAVE_OS_WIN32" = "yes"; then ++ HAVE_OS_WIN32_TRUE= ++ HAVE_OS_WIN32_FALSE='#' ++else ++ HAVE_OS_WIN32_TRUE='#' ++ HAVE_OS_WIN32_FALSE= + fi + +-if test "_$ac_cv_header_stdint_x" != "_" ; then +- ac_cv_header_stdint="$ac_cv_header_stdint_x" +-elif test "_$ac_cv_header_stdint_o" != "_" ; then +- ac_cv_header_stdint="$ac_cv_header_stdint_o" +-elif test "_$ac_cv_header_stdint_u" != "_" ; then +- ac_cv_header_stdint="$ac_cv_header_stdint_u" ++ if test "$HAVE_OS_LINUX" = "yes"; then ++ HAVE_OS_LINUX_TRUE= ++ HAVE_OS_LINUX_FALSE='#' + else +- ac_cv_header_stdint="stddef.h" ++ HAVE_OS_LINUX_TRUE='#' ++ HAVE_OS_LINUX_FALSE= + fi + +-{ $as_echo "$as_me:$LINENO: checking for extra inttypes in chosen header" >&5 +-$as_echo_n "checking for extra inttypes in chosen header... " >&6; } +-{ $as_echo "$as_me:$LINENO: result: ($ac_cv_header_stdint)" >&5 +-$as_echo "($ac_cv_header_stdint)" >&6; } +-unset ac_cv_type_int_least32_t +-unset ac_cv_type_int_fast32_t +-{ $as_echo "$as_me:$LINENO: checking for int_least32_t" >&5 +-$as_echo_n "checking for int_least32_t... " >&6; } +-if test "${ac_cv_type_int_least32_t+set}" = set; then ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 ++$as_echo_n "checking whether byte ordering is bigendian... " >&6; } ++if test "${ac_cv_c_bigendian+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- ac_cv_type_int_least32_t=no +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ ++ ac_cv_c_bigendian=unknown ++ # See if we're dealing with a universal compiler. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#ifndef __APPLE_CC__ ++ not a universal capable compiler ++ #endif ++ typedef int dummy; ++ + _ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ++ # Check for potential -arch flags. It is not universal unless ++ # there are at least two -arch flags with different values. ++ ac_arch= ++ ac_prev= ++ for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do ++ if test -n "$ac_prev"; then ++ case $ac_word in ++ i?86 | x86_64 | ppc | ppc64) ++ if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then ++ ac_arch=$ac_word ++ else ++ ac_cv_c_bigendian=universal ++ break ++ fi ++ ;; ++ esac ++ ac_prev= ++ elif test "x$ac_word" = "x-arch"; then ++ ac_prev=arch ++ fi ++ done ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ if test $ac_cv_c_bigendian = unknown; then ++ # See if sys/param.h defines the BYTE_ORDER macro. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include <$ac_cv_header_stdint> ++#include <sys/types.h> ++ #include <sys/param.h> + + int + main () + { +-if (sizeof (int_least32_t)) +- return 0; ++#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ ++ && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ ++ && LITTLE_ENDIAN) ++ bogus endian macros ++ #endif ++ + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ # It does; now see whether it defined to BIG_ENDIAN or not. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include <$ac_cv_header_stdint> ++#include <sys/types.h> ++ #include <sys/param.h> + + int + main () + { +-if (sizeof ((int_least32_t))) +- return 0; ++#if BYTE_ORDER != BIG_ENDIAN ++ not big endian ++ #endif ++ + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_c_bigendian=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_type_int_least32_t=yes ++ ac_cv_c_bigendian=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int_least32_t" >&5 +-$as_echo "$ac_cv_type_int_least32_t" >&6; } +- +-{ $as_echo "$as_me:$LINENO: checking for int_fast32_t" >&5 +-$as_echo_n "checking for int_fast32_t... " >&6; } +-if test "${ac_cv_type_int_fast32_t+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_type_int_fast32_t=no +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ fi ++ if test $ac_cv_c_bigendian = unknown; then ++ # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include<$ac_cv_header_stdint> ++#include <limits.h> + + int + main () + { +-if (sizeof (int_fast32_t)) +- return 0; ++#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) ++ bogus endian macros ++ #endif ++ + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ # It does; now see whether it defined to _BIG_ENDIAN or not. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include<$ac_cv_header_stdint> ++#include <limits.h> + + int + main () + { +-if (sizeof ((int_fast32_t))) +- return 0; ++#ifndef _BIG_ENDIAN ++ not big endian ++ #endif ++ + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_c_bigendian=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_type_int_fast32_t=yes ++ ac_cv_c_bigendian=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ fi ++ if test $ac_cv_c_bigendian = unknown; then ++ # Compile a test program. ++ if test "$cross_compiling" = yes; then : ++ # Try to guess by grepping values from an object file. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++short int ascii_mm[] = ++ { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; ++ short int ascii_ii[] = ++ { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; ++ int use_ascii (int i) { ++ return ascii_mm[i] + ascii_ii[i]; ++ } ++ short int ebcdic_ii[] = ++ { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; ++ short int ebcdic_mm[] = ++ { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; ++ int use_ebcdic (int i) { ++ return ebcdic_mm[i] + ebcdic_ii[i]; ++ } ++ extern int foo; + ++int ++main () ++{ ++return use_ascii (foo) == use_ebcdic (foo); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then ++ ac_cv_c_bigendian=yes ++ fi ++ if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then ++ if test "$ac_cv_c_bigendian" = unknown; then ++ ac_cv_c_bigendian=no ++ else ++ # finding both strings is unlikely to happen, but who knows? ++ ac_cv_c_bigendian=unknown ++ fi ++ fi ++fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ + ++ /* Are we little or big endian? From Harbison&Steele. */ ++ union ++ { ++ long int l; ++ char c[sizeof (long int)]; ++ } u; ++ u.l = 1; ++ return u.c[sizeof (long int) - 1] == 1; + ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_run "$LINENO"; then : ++ ac_cv_c_bigendian=no ++else ++ ac_cv_c_bigendian=yes ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int_fast32_t" >&5 +-$as_echo "$ac_cv_type_int_fast32_t" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 ++$as_echo "$ac_cv_c_bigendian" >&6; } ++ case $ac_cv_c_bigendian in #( ++ yes) ++ $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h ++;; #( ++ no) ++ ;; #( ++ universal) ++ ++$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h ++ ++ ;; #( ++ *) ++ as_fn_error "unknown endianness ++ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; ++ esac + +-{ $as_echo "$as_me:$LINENO: checking for intmax_t" >&5 +-$as_echo_n "checking for intmax_t... " >&6; } +-if test "${ac_cv_type_intmax_t+set}" = set; then ++ ++# ------ AX CREATE STDINT H ------------------------------------- ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint types" >&5 ++$as_echo_n "checking for stdint types... " >&6; } ++ac_stdint_h=`echo orc/orc-stdint.h` ++# try to shortcircuit - if the default include path of the compiler ++# can find a "stdint.h" header then we assume that all compilers can. ++if test "${ac_cv_header_stdint_t+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- ac_cv_type_intmax_t=no +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_cv_header_stdint> + ++old_CXXFLAGS="$CXXFLAGS" ; CXXFLAGS="" ++old_CPPFLAGS="$CPPFLAGS" ; CPPFLAGS="" ++old_CFLAGS="$CFLAGS" ; CFLAGS="" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <stdint.h> + int + main () + { +-if (sizeof (intmax_t)) +- return 0; ++int_least32_t v = 0; + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_stdint_result="(assuming C99 compatible system)" ++ ac_cv_header_stdint_t="stdint.h"; ++else ++ ac_cv_header_stdint_t="" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++if test "$GCC" = "yes" && test ".$ac_cv_header_stdint_t" = "."; then ++CFLAGS="-std=c99" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include <$ac_cv_header_stdint> +- ++#include <stdint.h> + int + main () + { +-if (sizeof ((intmax_t))) +- return 0; ++int_least32_t v = 0; + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_type_intmax_t=yes ++if ac_fn_c_try_compile "$LINENO"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: your GCC compiler has a defunct stdint.h for its default-mode" >&5 ++$as_echo "$as_me: WARNING: your GCC compiler has a defunct stdint.h for its default-mode" >&2;} + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- + fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++CXXFLAGS="$old_CXXFLAGS" ++CPPFLAGS="$old_CPPFLAGS" ++CFLAGS="$old_CFLAGS" + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_intmax_t" >&5 +-$as_echo "$ac_cv_type_intmax_t" >&6; } + + +-fi # shortcircut to system "stdint.h" +-# ------------------ PREPARE VARIABLES ------------------------------ +-if test "$GCC" = "yes" ; then +-ac_cv_stdint_message="using gnu compiler "`$CC --version | head -1` ++v="... $ac_cv_header_stdint_h" ++if test "$ac_stdint_h" = "stdint.h" ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: (are you sure you want them in ./stdint.h?)" >&5 ++$as_echo "(are you sure you want them in ./stdint.h?)" >&6; } ++elif test "$ac_stdint_h" = "inttypes.h" ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: (are you sure you want them in ./inttypes.h?)" >&5 ++$as_echo "(are you sure you want them in ./inttypes.h?)" >&6; } ++elif test "_$ac_cv_header_stdint_t" = "_" ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: (putting them into $ac_stdint_h)$v" >&5 ++$as_echo "(putting them into $ac_stdint_h)$v" >&6; } + else +-ac_cv_stdint_message="using $CC" ++ ac_cv_header_stdint="$ac_cv_header_stdint_t" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdint (shortcircuit)" >&5 ++$as_echo "$ac_cv_header_stdint (shortcircuit)" >&6; } + fi + +-{ $as_echo "$as_me:$LINENO: result: make use of $ac_cv_header_stdint in $ac_stdint_h $ac_cv_stdint_result" >&5 +-$as_echo "make use of $ac_cv_header_stdint in $ac_stdint_h $ac_cv_stdint_result" >&6; } +- +-# ----------------- DONE inttypes.h checks START header ------------- +-ac_config_commands="$ac_config_commands $ac_stdint_h" +- ++if test "_$ac_cv_header_stdint_t" = "_" ; then # can not shortcircuit.. + + ++inttype_headers=`echo | sed -e 's/,/ /g'` + ++ac_cv_stdint_result="(no helpful system typedefs seen)" + +-for ac_header in stdlib.h unistd.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint uintptr_t" >&5 ++$as_echo_n "checking for stdint uintptr_t... " >&6; } ++if test "${ac_cv_header_stdint_x+set}" = set; then : + $as_echo_n "(cached) " >&6 +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } + +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes ++ ac_cv_header_stdint_x="" # the 1997 typedefs (inttypes.h) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: (..)" >&5 ++$as_echo "(..)" >&6; } ++ for i in stdint.h inttypes.h sys/inttypes.h $inttype_headers ++ do ++ unset ac_cv_type_uintptr_t ++ unset ac_cv_type_uint64_t ++ ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "#include <$i> ++" ++if test "x$ac_cv_type_uintptr_t" = x""yes; then : ++ ac_cv_header_stdint_x=$i + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no ++ continue + fi + +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "#include<$i> ++" ++if test "x$ac_cv_type_uint64_t" = x""yes; then : ++ and64="/uint64_t" + else +- eval "$as_ac_Header=\$ac_header_preproc" ++ and64="" + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } + +-fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF ++ ac_cv_stdint_result="(seen uintptr_t$and64 in $i)" ++ break ++ done ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint uintptr_t" >&5 ++$as_echo_n "checking for stdint uintptr_t... " >&6; } + + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdint_x" >&5 ++$as_echo "$ac_cv_header_stdint_x" >&6; } + +-done + ++if test "_$ac_cv_header_stdint_x" = "_" ; then + +-for ac_func in getpagesize +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint uint32_t" >&5 ++$as_echo_n "checking for stdint uint32_t... " >&6; } ++if test "${ac_cv_header_stdint_o+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- +-#undef $ac_func +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif + +-int +-main () +-{ +-return $ac_func (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" ++ ac_cv_header_stdint_o="" # the 1995 typedefs (sys/inttypes.h) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: (..)" >&5 ++$as_echo "(..)" >&6; } ++ for i in inttypes.h sys/inttypes.h stdint.h $inttype_headers ++ do ++ unset ac_cv_type_uint32_t ++ unset ac_cv_type_uint64_t ++ ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "#include <$i> ++" ++if test "x$ac_cv_type_uint32_t" = x""yes; then : ++ ac_cv_header_stdint_o=$i + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ continue ++fi + +- eval "$as_ac_var=no" ++ ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "#include<$i> ++" ++if test "x$ac_cv_type_uint64_t" = x""yes; then : ++ and64="/uint64_t" ++else ++ and64="" + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++ ac_cv_stdint_result="(seen uint32_t$and64 in $i)" ++ break ++ break; ++ done ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint uint32_t" >&5 ++$as_echo_n "checking for stdint uint32_t... " >&6; } ++ + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdint_o" >&5 ++$as_echo "$ac_cv_header_stdint_o" >&6; } + + fi +-done + +-{ $as_echo "$as_me:$LINENO: checking for working mmap" >&5 +-$as_echo_n "checking for working mmap... " >&6; } +-if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then ++if test "_$ac_cv_header_stdint_x" = "_" ; then ++if test "_$ac_cv_header_stdint_o" = "_" ; then ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint u_int32_t" >&5 ++$as_echo_n "checking for stdint u_int32_t... " >&6; } ++if test "${ac_cv_header_stdint_u+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- if test "$cross_compiling" = yes; then +- ac_cv_func_mmap_fixed_mapped=no +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-/* malloc might have been renamed as rpl_malloc. */ +-#undef malloc +- +-/* Thanks to Mike Haertel and Jim Avera for this test. +- Here is a matrix of mmap possibilities: +- mmap private not fixed +- mmap private fixed at somewhere currently unmapped +- mmap private fixed at somewhere already mapped +- mmap shared not fixed +- mmap shared fixed at somewhere currently unmapped +- mmap shared fixed at somewhere already mapped +- For private mappings, we should verify that changes cannot be read() +- back from the file, nor mmap's back from the file at a different +- address. (There have been systems where private was not correctly +- implemented like the infamous i386 svr4.0, and systems where the +- VM page cache was not coherent with the file system buffer cache +- like early versions of FreeBSD and possibly contemporary NetBSD.) +- For shared mappings, we should conversely verify that changes get +- propagated back to all the places they're supposed to be. +- +- Grep wants private fixed already mapped. +- The main things grep needs to know about mmap are: +- * does it exist and is it safe to write into the mmap'd area +- * how to use it (BSD variants) */ +- +-#include <fcntl.h> +-#include <sys/mman.h> + +-#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H +-char *malloc (); +-#endif ++ ac_cv_header_stdint_u="" # the BSD typedefs (sys/types.h) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: (..)" >&5 ++$as_echo "(..)" >&6; } ++ for i in sys/types.h inttypes.h sys/inttypes.h $inttype_headers ; do ++ unset ac_cv_type_u_int32_t ++ unset ac_cv_type_u_int64_t ++ ac_fn_c_check_type "$LINENO" "u_int32_t" "ac_cv_type_u_int32_t" "#include <$i> ++" ++if test "x$ac_cv_type_u_int32_t" = x""yes; then : ++ ac_cv_header_stdint_u=$i ++else ++ continue ++fi + +-/* This mess was copied from the GNU getpagesize.h. */ +-#ifndef HAVE_GETPAGESIZE +-/* Assume that all systems that can run configure have sys/param.h. */ +-# ifndef HAVE_SYS_PARAM_H +-# define HAVE_SYS_PARAM_H 1 +-# endif ++ ac_fn_c_check_type "$LINENO" "u_int64_t" "ac_cv_type_u_int64_t" "#include<$i> ++" ++if test "x$ac_cv_type_u_int64_t" = x""yes; then : ++ and64="/u_int64_t" ++else ++ and64="" ++fi + +-# ifdef _SC_PAGESIZE +-# define getpagesize() sysconf(_SC_PAGESIZE) +-# else /* no _SC_PAGESIZE */ +-# ifdef HAVE_SYS_PARAM_H +-# include <sys/param.h> +-# ifdef EXEC_PAGESIZE +-# define getpagesize() EXEC_PAGESIZE +-# else /* no EXEC_PAGESIZE */ +-# ifdef NBPG +-# define getpagesize() NBPG * CLSIZE +-# ifndef CLSIZE +-# define CLSIZE 1 +-# endif /* no CLSIZE */ +-# else /* no NBPG */ +-# ifdef NBPC +-# define getpagesize() NBPC +-# else /* no NBPC */ +-# ifdef PAGESIZE +-# define getpagesize() PAGESIZE +-# endif /* PAGESIZE */ +-# endif /* no NBPC */ +-# endif /* no NBPG */ +-# endif /* no EXEC_PAGESIZE */ +-# else /* no HAVE_SYS_PARAM_H */ +-# define getpagesize() 8192 /* punt totally */ +-# endif /* no HAVE_SYS_PARAM_H */ +-# endif /* no _SC_PAGESIZE */ ++ ac_cv_stdint_result="(seen u_int32_t$and64 in $i)" ++ break ++ break; ++ done ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint u_int32_t" >&5 ++$as_echo_n "checking for stdint u_int32_t... " >&6; } + +-#endif /* no HAVE_GETPAGESIZE */ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdint_u" >&5 ++$as_echo "$ac_cv_header_stdint_u" >&6; } + +-int +-main () +-{ +- char *data, *data2, *data3; +- int i, pagesize; +- int fd; ++fi fi + +- pagesize = getpagesize (); ++if test "_$ac_cv_header_stdint_x" = "_" ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint datatype model" >&5 ++$as_echo_n "checking for stdint datatype model... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: (..)" >&5 ++$as_echo "(..)" >&6; } + +- /* First, make a file with some known garbage in it. */ +- data = (char *) malloc (pagesize); +- if (!data) +- return 1; +- for (i = 0; i < pagesize; ++i) +- *(data + i) = rand (); +- umask (0); +- fd = creat ("conftest.mmap", 0600); +- if (fd < 0) +- return 1; +- if (write (fd, data, pagesize) != pagesize) +- return 1; +- close (fd); ++ # The cast to long int works around a bug in the HP C Compiler ++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects ++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. ++# This bug is HP SR number 8606223364. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of char" >&5 ++$as_echo_n "checking size of char... " >&6; } ++if test "${ac_cv_sizeof_char+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char))" "ac_cv_sizeof_char" "$ac_includes_default"; then : + +- /* Next, try to mmap the file at a fixed address which already has +- something else allocated at it. If we can, also make sure that +- we see the same garbage. */ +- fd = open ("conftest.mmap", O_RDWR); +- if (fd < 0) +- return 1; +- data2 = (char *) malloc (2 * pagesize); +- if (!data2) +- return 1; +- data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1); +- if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, +- MAP_PRIVATE | MAP_FIXED, fd, 0L)) +- return 1; +- for (i = 0; i < pagesize; ++i) +- if (*(data + i) != *(data2 + i)) +- return 1; ++else ++ if test "$ac_cv_type_char" = yes; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ as_fn_set_status 77 ++as_fn_error "cannot compute sizeof (char) ++See \`config.log' for more details." "$LINENO" 5; }; } ++ else ++ ac_cv_sizeof_char=0 ++ fi ++fi + +- /* Finally, make sure that changes to the mapped area do not +- percolate back to the file as seen by read(). (This is a bug on +- some variants of i386 svr4.0.) */ +- for (i = 0; i < pagesize; ++i) +- *(data2 + i) = *(data2 + i) + 1; +- data3 = (char *) malloc (pagesize); +- if (!data3) +- return 1; +- if (read (fd, data3, pagesize) != pagesize) +- return 1; +- for (i = 0; i < pagesize; ++i) +- if (*(data + i) != *(data3 + i)) +- return 1; +- close (fd); +- return 0; +-} ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_char" >&5 ++$as_echo "$ac_cv_sizeof_char" >&6; } ++ ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_CHAR $ac_cv_sizeof_char + _ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_func_mmap_fixed_mapped=yes ++ ++ ++ # The cast to long int works around a bug in the HP C Compiler ++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects ++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. ++# This bug is HP SR number 8606223364. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5 ++$as_echo_n "checking size of short... " >&6; } ++if test "${ac_cv_sizeof_short+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then : + +-( exit $ac_status ) +-ac_cv_func_mmap_fixed_mapped=no ++else ++ if test "$ac_cv_type_short" = yes; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ as_fn_set_status 77 ++as_fn_error "cannot compute sizeof (short) ++See \`config.log' for more details." "$LINENO" 5; }; } ++ else ++ ac_cv_sizeof_short=0 ++ fi + fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++ + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5 ++$as_echo "$ac_cv_sizeof_short" >&6; } + + +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 +-$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; } +-if test $ac_cv_func_mmap_fixed_mapped = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_MMAP 1 ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_SHORT $ac_cv_sizeof_short + _ACEOF + ++ ++ # The cast to long int works around a bug in the HP C Compiler ++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects ++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. ++# This bug is HP SR number 8606223364. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 ++$as_echo_n "checking size of int... " >&6; } ++if test "${ac_cv_sizeof_int+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : ++ ++else ++ if test "$ac_cv_type_int" = yes; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ as_fn_set_status 77 ++as_fn_error "cannot compute sizeof (int) ++See \`config.log' for more details." "$LINENO" 5; }; } ++ else ++ ac_cv_sizeof_int=0 ++ fi ++fi ++ + fi +-rm -f conftest.mmap ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 ++$as_echo "$ac_cv_sizeof_int" >&6; } + + + +-for ac_header in inttypes.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_INT $ac_cv_sizeof_int ++_ACEOF ++ ++ ++ # The cast to long int works around a bug in the HP C Compiler ++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects ++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. ++# This bug is HP SR number 8606223364. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 ++$as_echo_n "checking size of long... " >&6; } ++if test "${ac_cv_sizeof_long+set}" = set; then : + $as_echo_n "(cached) " >&6 +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } + else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : ++ + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ if test "$ac_cv_type_long" = yes; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ as_fn_set_status 77 ++as_fn_error "cannot compute sizeof (long) ++See \`config.log' for more details." "$LINENO" 5; }; } ++ else ++ ac_cv_sizeof_long=0 ++ fi ++fi + +- ac_header_compiler=no + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 ++$as_echo "$ac_cv_sizeof_long" >&6; } + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } + +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> ++ ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_LONG $ac_cv_sizeof_long + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes ++ ++ ++ # The cast to long int works around a bug in the HP C Compiler ++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects ++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. ++# This bug is HP SR number 8606223364. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void*" >&5 ++$as_echo_n "checking size of void*... " >&6; } ++if test "${ac_cv_sizeof_voidp+set}" = set; then : ++ $as_echo_n "(cached) " >&6 + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void*))" "ac_cv_sizeof_voidp" "$ac_includes_default"; then : + +- ac_header_preproc=no ++else ++ if test "$ac_cv_type_voidp" = yes; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ as_fn_set_status 77 ++as_fn_error "cannot compute sizeof (void*) ++See \`config.log' for more details." "$LINENO" 5; }; } ++ else ++ ac_cv_sizeof_voidp=0 ++ fi + fi + +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_voidp" >&5 ++$as_echo "$ac_cv_sizeof_voidp" >&6; } + +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_VOIDP $ac_cv_sizeof_voidp ++_ACEOF ++ ++ ++ ac_cv_char_data_model="" ++ ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_char" ++ ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_short" ++ ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_int" ++ ac_cv_long_data_model="" ++ ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_int" ++ ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_long" ++ ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_voidp" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking data model" >&5 ++$as_echo_n "checking data model... " >&6; } ++ case "$ac_cv_char_data_model/$ac_cv_long_data_model" in ++ 122/242) ac_cv_data_model="IP16" ; n="standard 16bit machine" ;; ++ 122/244) ac_cv_data_model="LP32" ; n="standard 32bit machine" ;; ++ 122/*) ac_cv_data_model="i16" ; n="unusual int16 model" ;; ++ 124/444) ac_cv_data_model="ILP32" ; n="standard 32bit unixish" ;; ++ 124/488) ac_cv_data_model="LP64" ; n="standard 64bit unixish" ;; ++ 124/448) ac_cv_data_model="LLP64" ; n="unusual 64bit unixish" ;; ++ 124/*) ac_cv_data_model="i32" ; n="unusual int32 model" ;; ++ 128/888) ac_cv_data_model="ILP64" ; n="unusual 64bit numeric" ;; ++ 128/*) ac_cv_data_model="i64" ; n="unusual int64 model" ;; ++ 222/*2) ac_cv_data_model="DSP16" ; n="strict 16bit dsptype" ;; ++ 333/*3) ac_cv_data_model="DSP24" ; n="strict 24bit dsptype" ;; ++ 444/*4) ac_cv_data_model="DSP32" ; n="strict 32bit dsptype" ;; ++ 666/*6) ac_cv_data_model="DSP48" ; n="strict 48bit dsptype" ;; ++ 888/*8) ac_cv_data_model="DSP64" ; n="strict 64bit dsptype" ;; ++ 222/*|333/*|444/*|666/*|888/*) : ++ ac_cv_data_model="iDSP" ; n="unusual dsptype" ;; ++ *) ac_cv_data_model="none" ; n="very unusual model" ;; ++ esac ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_data_model ($ac_cv_long_data_model, $n)" >&5 ++$as_echo "$ac_cv_data_model ($ac_cv_long_data_model, $n)" >&6; } ++ ++fi ++ ++if test "_$ac_cv_header_stdint_x" != "_" ; then ++ ac_cv_header_stdint="$ac_cv_header_stdint_x" ++elif test "_$ac_cv_header_stdint_o" != "_" ; then ++ ac_cv_header_stdint="$ac_cv_header_stdint_o" ++elif test "_$ac_cv_header_stdint_u" != "_" ; then ++ ac_cv_header_stdint="$ac_cv_header_stdint_u" + else +- eval "$as_ac_Header=\$ac_header_preproc" ++ ac_cv_header_stdint="stddef.h" + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for extra inttypes in chosen header" >&5 ++$as_echo_n "checking for extra inttypes in chosen header... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ($ac_cv_header_stdint)" >&5 ++$as_echo "($ac_cv_header_stdint)" >&6; } ++unset ac_cv_type_int_least32_t ++unset ac_cv_type_int_fast32_t ++ac_fn_c_check_type "$LINENO" "int_least32_t" "ac_cv_type_int_least32_t" "#include <$ac_cv_header_stdint> ++" ++if test "x$ac_cv_type_int_least32_t" = x""yes; then : + + fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF + +-fi ++ac_fn_c_check_type "$LINENO" "int_fast32_t" "ac_cv_type_int_fast32_t" "#include<$ac_cv_header_stdint> ++" ++if test "x$ac_cv_type_int_fast32_t" = x""yes; then : + +-done ++fi + ++ac_fn_c_check_type "$LINENO" "intmax_t" "ac_cv_type_intmax_t" "#include <$ac_cv_header_stdint> ++" ++if test "x$ac_cv_type_intmax_t" = x""yes; then : + +-for ac_header in sys/time.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_compiler=no ++ ++fi # shortcircut to system "stdint.h" ++# ------------------ PREPARE VARIABLES ------------------------------ ++if test "$GCC" = "yes" ; then ++ac_cv_stdint_message="using gnu compiler "`$CC --version | head -1` ++else ++ac_cv_stdint_message="using $CC" + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: make use of $ac_cv_header_stdint in $ac_stdint_h $ac_cv_stdint_result" >&5 ++$as_echo "make use of $ac_cv_header_stdint in $ac_stdint_h $ac_cv_stdint_result" >&6; } + +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++# ----------------- DONE inttypes.h checks START header ------------- ++ac_config_commands="$ac_config_commands $ac_stdint_h" + +- ac_header_preproc=no +-fi + +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } + +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } + +-fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ ++ for ac_header in $ac_header_list ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default ++" ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -15977,450 +12212,255 @@ + done + + +-for ac_header in unistd.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } + +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_preproc=no +-fi + +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } + +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } + +-fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++for ac_func in getpagesize ++do : ++ ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize" ++if test "x$ac_cv_func_getpagesize" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define HAVE_GETPAGESIZE 1 + _ACEOF + + fi +- + done + +- +- +-for ac_func in gettimeofday +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5 ++$as_echo_n "checking for working mmap... " >&6; } ++if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ if test "$cross_compiling" = yes; then : ++ ac_cv_func_mmap_fixed_mapped=no ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func ++$ac_includes_default ++/* malloc might have been renamed as rpl_malloc. */ ++#undef malloc + +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ ++/* Thanks to Mike Haertel and Jim Avera for this test. ++ Here is a matrix of mmap possibilities: ++ mmap private not fixed ++ mmap private fixed at somewhere currently unmapped ++ mmap private fixed at somewhere already mapped ++ mmap shared not fixed ++ mmap shared fixed at somewhere currently unmapped ++ mmap shared fixed at somewhere already mapped ++ For private mappings, we should verify that changes cannot be read() ++ back from the file, nor mmap's back from the file at a different ++ address. (There have been systems where private was not correctly ++ implemented like the infamous i386 svr4.0, and systems where the ++ VM page cache was not coherent with the file system buffer cache ++ like early versions of FreeBSD and possibly contemporary NetBSD.) ++ For shared mappings, we should conversely verify that changes get ++ propagated back to all the places they're supposed to be. + +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif ++ Grep wants private fixed already mapped. ++ The main things grep needs to know about mmap are: ++ * does it exist and is it safe to write into the mmap'd area ++ * how to use it (BSD variants) */ + +-#undef $ac_func ++#include <fcntl.h> ++#include <sys/mman.h> + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me ++#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H ++char *malloc (); + #endif + ++/* This mess was copied from the GNU getpagesize.h. */ ++#ifndef HAVE_GETPAGESIZE ++# ifdef _SC_PAGESIZE ++# define getpagesize() sysconf(_SC_PAGESIZE) ++# else /* no _SC_PAGESIZE */ ++# ifdef HAVE_SYS_PARAM_H ++# include <sys/param.h> ++# ifdef EXEC_PAGESIZE ++# define getpagesize() EXEC_PAGESIZE ++# else /* no EXEC_PAGESIZE */ ++# ifdef NBPG ++# define getpagesize() NBPG * CLSIZE ++# ifndef CLSIZE ++# define CLSIZE 1 ++# endif /* no CLSIZE */ ++# else /* no NBPG */ ++# ifdef NBPC ++# define getpagesize() NBPC ++# else /* no NBPC */ ++# ifdef PAGESIZE ++# define getpagesize() PAGESIZE ++# endif /* PAGESIZE */ ++# endif /* no NBPC */ ++# endif /* no NBPG */ ++# endif /* no EXEC_PAGESIZE */ ++# else /* no HAVE_SYS_PARAM_H */ ++# define getpagesize() 8192 /* punt totally */ ++# endif /* no HAVE_SYS_PARAM_H */ ++# endif /* no _SC_PAGESIZE */ ++ ++#endif /* no HAVE_GETPAGESIZE */ ++ + int + main () + { +-return $ac_func (); +- ; ++ char *data, *data2, *data3; ++ const char *cdata2; ++ int i, pagesize; ++ int fd, fd2; ++ ++ pagesize = getpagesize (); ++ ++ /* First, make a file with some known garbage in it. */ ++ data = (char *) malloc (pagesize); ++ if (!data) ++ return 1; ++ for (i = 0; i < pagesize; ++i) ++ *(data + i) = rand (); ++ umask (0); ++ fd = creat ("conftest.mmap", 0600); ++ if (fd < 0) ++ return 2; ++ if (write (fd, data, pagesize) != pagesize) ++ return 3; ++ close (fd); ++ ++ /* Next, check that the tail of a page is zero-filled. File must have ++ non-zero length, otherwise we risk SIGBUS for entire page. */ ++ fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600); ++ if (fd2 < 0) ++ return 4; ++ cdata2 = ""; ++ if (write (fd2, cdata2, 1) != 1) ++ return 5; ++ data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); ++ if (data2 == MAP_FAILED) ++ return 6; ++ for (i = 0; i < pagesize; ++i) ++ if (*(data2 + i)) ++ return 7; ++ close (fd2); ++ if (munmap (data2, pagesize)) ++ return 8; ++ ++ /* Next, try to mmap the file at a fixed address which already has ++ something else allocated at it. If we can, also make sure that ++ we see the same garbage. */ ++ fd = open ("conftest.mmap", O_RDWR); ++ if (fd < 0) ++ return 9; ++ if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, ++ MAP_PRIVATE | MAP_FIXED, fd, 0L)) ++ return 10; ++ for (i = 0; i < pagesize; ++i) ++ if (*(data + i) != *(data2 + i)) ++ return 11; ++ ++ /* Finally, make sure that changes to the mapped area do not ++ percolate back to the file as seen by read(). (This is a bug on ++ some variants of i386 svr4.0.) */ ++ for (i = 0; i < pagesize; ++i) ++ *(data2 + i) = *(data2 + i) + 1; ++ data3 = (char *) malloc (pagesize); ++ if (!data3) ++ return 12; ++ if (read (fd, data3, pagesize) != pagesize) ++ return 13; ++ for (i = 0; i < pagesize; ++i) ++ if (*(data + i) != *(data3 + i)) ++ return 14; ++ close (fd); + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" ++if ac_fn_c_try_run "$LINENO"; then : ++ ac_cv_func_mmap_fixed_mapped=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_var=no" ++ ac_cv_func_mmap_fixed_mapped=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF + + fi +-done ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5 ++$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; } ++if test $ac_cv_func_mmap_fixed_mapped = yes; then + ++$as_echo "#define HAVE_MMAP 1" >>confdefs.h + +-for ac_func in sigaction +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func ++fi ++rm -f conftest.mmap conftest.txt + +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ + +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif ++for ac_header in inttypes.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default" ++if test "x$ac_cv_header_inttypes_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_INTTYPES_H 1 ++_ACEOF + +-#undef $ac_func ++fi + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif ++done + +-int +-main () +-{ +-return $ac_func (); +- ; +- return 0; +-} ++for ac_header in sys/time.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default" ++if test "x$ac_cv_header_sys_time_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_SYS_TIME_H 1 + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- eval "$as_ac_var=no" + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++done ++ ++for ac_header in unistd.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default" ++if test "x$ac_cv_header_unistd_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define HAVE_UNISTD_H 1 + _ACEOF + + fi ++ + done + + +-for ac_func in sigsetjmp +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ ++for ac_func in gettimeofday ++do : ++ ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" ++if test "x$ac_cv_func_gettimeofday" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_GETTIMEOFDAY 1 + _ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif + +-#undef $ac_func +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif ++fi ++done + +-int +-main () +-{ +-return $ac_func (); +- ; +- return 0; +-} ++for ac_func in sigaction ++do : ++ ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction" ++if test "x$ac_cv_func_sigaction" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_SIGACTION 1 + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- eval "$as_ac_var=no" + fi ++done + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++for ac_func in sigsetjmp ++do : ++ ac_fn_c_check_func "$LINENO" "sigsetjmp" "ac_cv_func_sigsetjmp" ++if test "x$ac_cv_func_sigsetjmp" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define HAVE_SIGSETJMP 1 + _ACEOF + + fi +@@ -16433,18 +12473,14 @@ + # These system don't have libm, or don't need it + ;; + *-ncr-sysv4.3*) +- { $as_echo "$as_me:$LINENO: checking for _mwvalidcheckl in -lmw" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _mwvalidcheckl in -lmw" >&5 + $as_echo_n "checking for _mwvalidcheckl in -lmw... " >&6; } +-if test "${ac_cv_lib_mw__mwvalidcheckl+set}" = set; then ++if test "${ac_cv_lib_mw__mwvalidcheckl+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmw $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -16462,58 +12498,29 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_mw__mwvalidcheckl=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_mw__mwvalidcheckl=no ++ ac_cv_lib_mw__mwvalidcheckl=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mw__mwvalidcheckl" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mw__mwvalidcheckl" >&5 + $as_echo "$ac_cv_lib_mw__mwvalidcheckl" >&6; } +-if test "x$ac_cv_lib_mw__mwvalidcheckl" = x""yes; then ++if test "x$ac_cv_lib_mw__mwvalidcheckl" = x""yes; then : + LIBM="-lmw" + fi + +- { $as_echo "$as_me:$LINENO: checking for cos in -lm" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5 + $as_echo_n "checking for cos in -lm... " >&6; } +-if test "${ac_cv_lib_m_cos+set}" = set; then ++if test "${ac_cv_lib_m_cos+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lm $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -16531,60 +12538,31 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_m_cos=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_m_cos=no ++ ac_cv_lib_m_cos=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_cos" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5 + $as_echo "$ac_cv_lib_m_cos" >&6; } +-if test "x$ac_cv_lib_m_cos" = x""yes; then ++if test "x$ac_cv_lib_m_cos" = x""yes; then : + LIBM="$LIBM -lm" + fi + + ;; + *) +- { $as_echo "$as_me:$LINENO: checking for cos in -lm" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5 + $as_echo_n "checking for cos in -lm... " >&6; } +-if test "${ac_cv_lib_m_cos+set}" = set; then ++if test "${ac_cv_lib_m_cos+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lm $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -16602,43 +12580,18 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_m_cos=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_m_cos=no ++ ac_cv_lib_m_cos=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_cos" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5 + $as_echo "$ac_cv_lib_m_cos" >&6; } +-if test "x$ac_cv_lib_m_cos" = x""yes; then ++if test "x$ac_cv_lib_m_cos" = x""yes; then : + LIBM="-lm" + fi + +@@ -16648,18 +12601,14 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for clock_gettime in -lrt" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5 + $as_echo_n "checking for clock_gettime in -lrt... " >&6; } +-if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then ++if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lrt $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -16677,47 +12626,20 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_rt_clock_gettime=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_rt_clock_gettime=no ++ ac_cv_lib_rt_clock_gettime=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_rt_clock_gettime" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5 + $as_echo "$ac_cv_lib_rt_clock_gettime" >&6; } +-if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then ++if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then : + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_CLOCK_GETTIME 1 +-_ACEOF ++$as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h + + LIBRT=-lrt + +@@ -16725,16 +12647,12 @@ + + + +-{ $as_echo "$as_me:$LINENO: checking for monotonic clocks" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for monotonic clocks" >&5 + $as_echo_n "checking for monotonic clocks... " >&6; } +-if test "${orc_cv_monotonic_clock+set}" = set; then ++if test "${orc_cv_monotonic_clock+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include <time.h> +@@ -16747,56 +12665,29 @@ + } + + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + orc_cv_monotonic_clock=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- orc_cv_monotonic_clock=no ++ orc_cv_monotonic_clock=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $orc_cv_monotonic_clock" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $orc_cv_monotonic_clock" >&5 + $as_echo "$orc_cv_monotonic_clock" >&6; } + if test "$orc_cv_monotonic_clock" = "yes"; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_MONOTONIC_CLOCK 1 +-_ACEOF ++$as_echo "#define HAVE_MONOTONIC_CLOCK 1" >>confdefs.h + + fi + + +- { $as_echo "$as_me:$LINENO: checking to see if compiler understands -Wall" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands -Wall" >&5 + $as_echo_n "checking to see if compiler understands -Wall... " >&6; } + + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Wall" + +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -16807,32 +12698,11 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + flag_ok=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- flag_ok=no ++ flag_ok=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$save_CFLAGS" + +@@ -16843,23 +12713,19 @@ + + true + fi +- { $as_echo "$as_me:$LINENO: result: $flag_ok" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 + $as_echo "$flag_ok" >&6; } + + if test "x$ORC_CVS" = "xyes" + then + +- { $as_echo "$as_me:$LINENO: checking to see if compiler understands -Werror" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands -Werror" >&5 + $as_echo_n "checking to see if compiler understands -Werror... " >&6; } + + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror" + +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +@@ -16870,32 +12736,11 @@ + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then ++if ac_fn_c_try_compile "$LINENO"; then : + flag_ok=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- flag_ok=no ++ flag_ok=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$save_CFLAGS" + +@@ -16906,7 +12751,7 @@ + + true + fi +- { $as_echo "$as_me:$LINENO: result: $flag_ok" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 + $as_echo "$flag_ok" >&6; } + + fi +@@ -16914,47 +12759,35 @@ + case "${host_os}" in + mingw*|pw32*|cygwin*) + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_CODEMEM_MALLOC 1 +-_ACEOF ++$as_echo "#define HAVE_CODEMEM_MALLOC 1" >>confdefs.h + + ;; +- linux*|darwin*|solaris*|netbsd*|freebsd*|openbsd*) ++ linux*|darwin*|solaris*|netbsd*|freebsd*|openbsd*|kfreebsd*|gnu*) + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_CODEMEM_MMAP 1 +-_ACEOF ++$as_echo "#define HAVE_CODEMEM_MMAP 1" >>confdefs.h + + ;; + *) +- { { $as_echo "$as_me:$LINENO: error: no code allocation backend" >&5 +-$as_echo "$as_me: error: no code allocation backend" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "no code allocation backend" "$LINENO" 5 + ;; + esac + + case "${host_os}" in + mingw*|pw32*|cygwin*) + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_THREAD_WIN32 1 +-_ACEOF ++$as_echo "#define HAVE_THREAD_WIN32 1" >>confdefs.h + + ;; + *) + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_THREAD_PTHREAD 1 +-_ACEOF ++$as_echo "#define HAVE_THREAD_PTHREAD 1" >>confdefs.h + + ;; + esac + + + +-cat >>confdefs.h <<\_ACEOF +-#define ORC_EXPORTS 1 +-_ACEOF ++$as_echo "#define ORC_EXPORTS 1" >>confdefs.h + + + ORC_CFLAGS="$ORC_CFLAGS -I\$(top_srcdir)" +@@ -17000,13 +12833,13 @@ + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( +- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 ++ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 + $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( +- *) $as_unset $ac_var ;; ++ *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done +@@ -17014,8 +12847,8 @@ + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). ++ # `set' does not quote correctly, so add quotes: double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +@@ -17038,11 +12871,11 @@ + if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + test "x$cache_file" != "x/dev/null" && +- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 + $as_echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 + $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi +@@ -17062,97 +12895,69 @@ + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. +- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" +- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' ++ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" ++ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' + done + LIBOBJS=$ac_libobjs + + LTLIBOBJS=$ac_ltlibobjs + + ++ if test -n "$EXEEXT"; then ++ am__EXEEXT_TRUE= ++ am__EXEEXT_FALSE='#' ++else ++ am__EXEEXT_TRUE='#' ++ am__EXEEXT_FALSE= ++fi ++ + if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"AMDEP\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"am__fastdepCC\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCCAS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"am__fastdepCCAS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"am__fastdepCCAS\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_I386_TRUE}" && test -z "${HAVE_I386_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_I386\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_I386\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"HAVE_I386\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_AMD64_TRUE}" && test -z "${HAVE_AMD64_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_AMD64\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_AMD64\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"HAVE_AMD64\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_POWERPC_TRUE}" && test -z "${HAVE_POWERPC_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_POWERPC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_POWERPC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"HAVE_POWERPC\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_ARM_TRUE}" && test -z "${HAVE_ARM_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_ARM\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_ARM\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"HAVE_ARM\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_OS_WIN32_TRUE}" && test -z "${HAVE_OS_WIN32_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_OS_WIN32\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_OS_WIN32\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"HAVE_OS_WIN32\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + if test -z "${HAVE_OS_LINUX_TRUE}" && test -z "${HAVE_OS_LINUX_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_OS_LINUX\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_OS_LINUX\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "conditional \"HAVE_OS_LINUX\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi + + +@@ -17160,9 +12965,10 @@ + ac_write_fail=0 + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 + $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++as_write_fail=0 ++cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 + #! $SHELL + # Generated by $as_me. + # Run this file to recreate the current configuration. +@@ -17172,17 +12978,18 @@ + debug=false + ac_cs_recheck=false + ac_cs_silent=false +-SHELL=\${CONFIG_SHELL-$SHELL} +-_ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-## --------------------- ## +-## M4sh Initialization. ## +-## --------------------- ## ++SHELL=\${CONFIG_SHELL-$SHELL} ++export SHELL ++_ASEOF ++cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 ++## -------------------- ## ++## M4sh Initialization. ## ++## -------------------- ## + + # Be more Bourne compatible + DUALCASE=1; export DUALCASE # for MKS sh +-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which +@@ -17190,23 +12997,15 @@ + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST + else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; ++ case `(set -o) 2>/dev/null` in #( ++ *posix*) : ++ set -o posix ;; #( ++ *) : ++ ;; + esac +- + fi + + +- +- +-# PATH needs CR +-# Avoid depending upon Character Ranges. +-as_cr_letters='abcdefghijklmnopqrstuvwxyz' +-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +-as_cr_Letters=$as_cr_letters$as_cr_LETTERS +-as_cr_digits='0123456789' +-as_cr_alnum=$as_cr_Letters$as_cr_digits +- + as_nl=' + ' + export as_nl +@@ -17214,7 +13013,13 @@ + as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo + as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then ++# Prefer a ksh shell builtin over an external printf program on Solaris, ++# but without wasting forks for bash or zsh. ++if test -z "$BASH_VERSION$ZSH_VERSION" \ ++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='print -r --' ++ as_echo_n='print -rn --' ++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' + else +@@ -17225,7 +13030,7 @@ + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; +- case $arg in ++ case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; +@@ -17248,13 +13053,6 @@ + } + fi + +-# Support unset when possible. +-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +- as_unset=unset +-else +- as_unset=false +-fi +- + + # IFS + # We need space, tab and new line, in precisely that order. Quoting is +@@ -17264,15 +13062,15 @@ + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +-case $0 in ++case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +-done ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++ done + IFS=$as_save_IFS + + ;; +@@ -17284,12 +13082,16 @@ + fi + if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 +- { (exit 1); exit 1; } ++ exit 1 + fi + +-# Work around bugs in pre-3.0 UWIN ksh. +-for as_var in ENV MAIL MAILPATH +-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++# Unset variables that we do not need and which cause bugs (e.g. in ++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" ++# suppresses any "Segmentation fault" message there. '((' could ++# trigger a bug in pdksh 5.2.14. ++for as_var in BASH_ENV ENV MAIL MAILPATH ++do eval test x\${$as_var+set} = xset \ ++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : + done + PS1='$ ' + PS2='> ' +@@ -17301,7 +13103,89 @@ + LANGUAGE=C + export LANGUAGE + +-# Required to use basename. ++# CDPATH. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++ ++# as_fn_error ERROR [LINENO LOG_FD] ++# --------------------------------- ++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are ++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the ++# script with status $?, using 1 if that was 0. ++as_fn_error () ++{ ++ as_status=$?; test $as_status -eq 0 && as_status=1 ++ if test "$3"; then ++ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ fi ++ $as_echo "$as_me: error: $1" >&2 ++ as_fn_exit $as_status ++} # as_fn_error ++ ++ ++# as_fn_set_status STATUS ++# ----------------------- ++# Set $? to STATUS, without forking. ++as_fn_set_status () ++{ ++ return $1 ++} # as_fn_set_status ++ ++# as_fn_exit STATUS ++# ----------------- ++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. ++as_fn_exit () ++{ ++ set +e ++ as_fn_set_status $1 ++ exit $1 ++} # as_fn_exit ++ ++# as_fn_unset VAR ++# --------------- ++# Portably unset VAR. ++as_fn_unset () ++{ ++ { eval $1=; unset $1;} ++} ++as_unset=as_fn_unset ++# as_fn_append VAR VALUE ++# ---------------------- ++# Append the text in VALUE to the end of the definition contained in VAR. Take ++# advantage of any shell optimizations that allow amortized linear growth over ++# repeated appends, instead of the typical quadratic growth present in naive ++# implementations. ++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ++ eval 'as_fn_append () ++ { ++ eval $1+=\$2 ++ }' ++else ++ as_fn_append () ++ { ++ eval $1=\$$1\$2 ++ } ++fi # as_fn_append ++ ++# as_fn_arith ARG... ++# ------------------ ++# Perform arithmetic evaluation on the ARGs, and store the result in the ++# global $as_val. Take advantage of shells that can avoid forks. The arguments ++# must be portable across $(()) and expr. ++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ++ eval 'as_fn_arith () ++ { ++ as_val=$(( $* )) ++ }' ++else ++ as_fn_arith () ++ { ++ as_val=`expr "$@" || test $? -eq 1` ++ } ++fi # as_fn_arith ++ ++ + if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +@@ -17315,8 +13199,12 @@ + as_basename=false + fi + ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi + +-# Name of the executable. + as_me=`$as_basename -- "$0" || + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ +@@ -17336,76 +13224,25 @@ + } + s/.*/./; q'` + +-# CDPATH. +-$as_unset CDPATH +- +- +- +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { +- +- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO +- # uniformly replaced by the line number. The first 'sed' inserts a +- # line-number line after each line using $LINENO; the second 'sed' +- # does the real work. The second script uses 'N' to pair each +- # line-number line with the line containing $LINENO, and appends +- # trailing '-' during substitution so that $LINENO is not a special +- # case at line end. +- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +- # scripts with optimization help from Paolo Bonzini. Blame Lee +- # E. McMahon (1931-1989) for sed's syntax. :-) +- sed -n ' +- p +- /[$]LINENO/= +- ' <$as_myself | +- sed ' +- s/[$]LINENO.*/&-/ +- t lineno +- b +- :lineno +- N +- :loop +- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ +- t loop +- s/-\n.*// +- ' >$as_me.lineno && +- chmod +x "$as_me.lineno" || +- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 +- { (exit 1); exit 1; }; } +- +- # Don't try to exec as it changes $[0], causing all sort of problems +- # (the dirname of $[0] is not the place where we might find the +- # original and so on. Autoconf is especially sensitive to this). +- . "./$as_me.lineno" +- # Exit status is that of the last command. +- exit +-} +- +- +-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then +- as_dirname=dirname +-else +- as_dirname=false +-fi ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits + + ECHO_C= ECHO_N= ECHO_T= +-case `echo -n x` in ++case `echo -n x` in #((((( + -n*) +- case `echo 'x\c'` in ++ case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. +- *) ECHO_C='\c';; ++ xy) ECHO_C='\c';; ++ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null ++ ECHO_T=' ';; + esac;; + *) + ECHO_N='-n';; + esac +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi + + rm -f conf$$ conf$$.exe conf$$.file + if test -d conf$$.dir; then +@@ -17434,8 +13271,56 @@ + rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file + rmdir conf$$.dir 2>/dev/null + ++ ++# as_fn_mkdir_p ++# ------------- ++# Create "$as_dir" as a directory, including parents if necessary. ++as_fn_mkdir_p () ++{ ++ ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || eval $as_mkdir_p || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ test -d "$as_dir" && break ++ done ++ test -z "$as_dirs" || eval "mkdir $as_dirs" ++ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" ++ ++ ++} # as_fn_mkdir_p + if mkdir -p . 2>/dev/null; then +- as_mkdir_p=: ++ as_mkdir_p='mkdir -p "$as_dir"' + else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +@@ -17454,10 +13339,10 @@ + if test -d "$1"; then + test -d "$1/."; + else +- case $1 in ++ case $1 in #( + -*)set "./$1";; + esac; +- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +@@ -17472,13 +13357,19 @@ + + + exec 6>&1 ++## ----------------------------------- ## ++## Main body of $CONFIG_STATUS script. ## ++## ----------------------------------- ## ++_ASEOF ++test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 + +-# Save the log message, to keep $[0] and so on meaningful, and to ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++# Save the log message, to keep $0 and so on meaningful, and to + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" + This file was extended by orc $as_me 0.4.3, which was +-generated by GNU Autoconf 2.63. Invocation command line was ++generated by GNU Autoconf 2.65. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -17510,13 +13401,15 @@ + + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + ac_cs_usage="\ +-\`$as_me' instantiates files from templates according to the +-current configuration. ++\`$as_me' instantiates files and other configuration actions ++from templates according to the current configuration. Unless the files ++and actions are specified as TAGs, all are instantiated by default. + +-Usage: $0 [OPTION]... [FILE]... ++Usage: $0 [OPTION]... [TAG]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit ++ --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages + -d, --debug don't remove temporary files +@@ -17535,16 +13428,17 @@ + Configuration commands: + $config_commands + +-Report bugs to <bug-autoconf@gnu.org>." ++Report bugs to the package provider." + + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ + orc config.status 0.4.3 +-configured by $0, generated by GNU Autoconf 2.63, +- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ++configured by $0, generated by GNU Autoconf 2.65, ++ with options \\"\$ac_cs_config\\" + +-Copyright (C) 2008 Free Software Foundation, Inc. ++Copyright (C) 2009 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + +@@ -17580,6 +13474,8 @@ + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;; ++ --config | --confi | --conf | --con | --co | --c ) ++ $as_echo "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) +@@ -17587,20 +13483,19 @@ + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac +- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" ++ as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac +- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" ++ as_fn_append CONFIG_HEADERS " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header +- { $as_echo "$as_me: error: ambiguous option: $1 +-Try \`$0 --help' for more information." >&2 +- { (exit 1); exit 1; }; };; ++ as_fn_error "ambiguous option: \`$1' ++Try \`$0 --help' for more information.";; + --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ +@@ -17608,11 +13503,10 @@ + ac_cs_silent=: ;; + + # This is an error. +- -*) { $as_echo "$as_me: error: unrecognized option: $1 +-Try \`$0 --help' for more information." >&2 +- { (exit 1); exit 1; }; } ;; ++ -*) as_fn_error "unrecognized option: \`$1' ++Try \`$0 --help' for more information." ;; + +- *) ac_config_targets="$ac_config_targets $1" ++ *) as_fn_append ac_config_targets " $1" + ac_need_defaults=false ;; + + esac +@@ -17955,9 +13849,7 @@ + "orc-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES orc-uninstalled.pc" ;; + "orc.pc") CONFIG_FILES="$CONFIG_FILES orc.pc" ;; + +- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} +- { (exit 1); exit 1; }; };; ++ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac + done + +@@ -17984,7 +13876,7 @@ + trap 'exit_status=$? + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + ' 0 +- trap '{ (exit 1); exit 1; }' 1 2 13 15 ++ trap 'as_fn_exit 1' 1 2 13 15 + } + # Create a (secure) tmp directory for tmp files. + +@@ -17995,11 +13887,7 @@ + { + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +-} || +-{ +- $as_echo "$as_me: cannot create a temporary directory in ." >&2 +- { (exit 1); exit 1; } +-} ++} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 + + # Set up the scripts for CONFIG_FILES section. + # No need to generate them if there are no CONFIG_FILES. +@@ -18007,10 +13895,16 @@ + if test -n "$CONFIG_FILES"; then + + +-ac_cr='
' ++ac_cr=`echo X | tr X '\015'` ++# On cygwin, bash can eat \r inside `` if the user requested igncr. ++# But we know of no other shell where ac_cr would be empty at this ++# point, so we can use a bashism as a fallback. ++if test "x$ac_cr" = x; then ++ eval ac_cr=\$\'\\r\' ++fi + ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` + if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then +- ac_cs_awk_cr='\\r' ++ ac_cs_awk_cr='\r' + else + ac_cs_awk_cr=$ac_cr + fi +@@ -18024,24 +13918,18 @@ + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" + } >conf$$subs.sh || +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -18063,7 +13951,7 @@ + t delim + :nl + h +-s/\(.\{148\}\).*/\1/ ++s/\(.\{148\}\)..*/\1/ + t more1 + s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ + p +@@ -18077,7 +13965,7 @@ + t nl + :delim + h +-s/\(.\{148\}\).*/\1/ ++s/\(.\{148\}\)..*/\1/ + t more2 + s/["\\]/\\&/g; s/^/"/; s/$/"/ + p +@@ -18130,9 +14018,7 @@ + else + cat + fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 +-$as_echo "$as_me: error: could not setup config files machinery" >&2;} +- { (exit 1); exit 1; }; } ++ || as_fn_error "could not setup config files machinery" "$LINENO" 5 + _ACEOF + + # VPATH may cause trouble with some makes, so we remove $(srcdir), +@@ -18173,9 +14059,7 @@ + if test -z "$ac_t"; then + break + elif $ac_last_try; then +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +@@ -18260,9 +14144,7 @@ + _ACAWK + _ACEOF + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 +-$as_echo "$as_me: error: could not setup config headers machinery" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "could not setup config headers machinery" "$LINENO" 5 + fi # test -n "$CONFIG_HEADERS" + + +@@ -18275,9 +14157,7 @@ + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; +- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 +-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} +- { (exit 1); exit 1; }; };; ++ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac +@@ -18305,12 +14185,10 @@ + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || +- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} +- { (exit 1); exit 1; }; };; ++ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac +- ac_file_inputs="$ac_file_inputs '$ac_f'" ++ as_fn_append ac_file_inputs " '$ac_f'" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't +@@ -18321,7 +14199,7 @@ + `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" +- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 + $as_echo "$as_me: creating $ac_file" >&6;} + fi + # Neutralize special characters interpreted by sed in replacement strings. +@@ -18334,9 +14212,7 @@ + + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ;; ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac +@@ -18364,47 +14240,7 @@ + q + } + s/.*/./; q'` +- { as_dir="$ac_dir" +- case $as_dir in #( +- -*) as_dir=./$as_dir;; +- esac +- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { +- as_dirs= +- while :; do +- case $as_dir in #( +- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( +- *) as_qdir=$as_dir;; +- esac +- as_dirs="'$as_qdir' $as_dirs" +- as_dir=`$as_dirname -- "$as_dir" || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- test -d "$as_dir" && break +- done +- test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} +- { (exit 1); exit 1; }; }; } ++ as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. + + case "$ac_dir" in +@@ -18461,7 +14297,6 @@ + # If the template does not know about datarootdir, expand it. + # FIXME: This hack should be removed a few years after 2.60. + ac_datarootdir_hack=; ac_datarootdir_seen= +- + ac_sed_dataroot=' + /datarootdir/ { + p +@@ -18471,12 +14306,11 @@ + /@docdir@/p + /@infodir@/p + /@localedir@/p +-/@mandir@/p +-' ++/@mandir@/p' + case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in + *datarootdir*) ac_datarootdir_seen=yes;; + *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 + $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +@@ -18486,7 +14320,7 @@ + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g +- s&\\\${datarootdir}&$datarootdir&g' ;; ++ s&\\\${datarootdir}&$datarootdir&g' ;; + esac + _ACEOF + +@@ -18515,14 +14349,12 @@ + $ac_datarootdir_hack + " + eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 + + test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && +- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + which seems to be undefined. Please make sure it is defined." >&5 + $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' + which seems to be undefined. Please make sure it is defined." >&2;} +@@ -18532,9 +14364,7 @@ + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + esac \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # +@@ -18545,25 +14375,19 @@ + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" + } >"$tmp/config.h" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then +- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 + $as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" + mv "$tmp/config.h" "$ac_file" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ++ || as_fn_error "could not create $ac_file" "$LINENO" 5 + fi + else + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 +-$as_echo "$as_me: error: could not create -" >&2;} +- { (exit 1); exit 1; }; } ++ || as_fn_error "could not create -" "$LINENO" 5 + fi + # Compute "$ac_file"'s index in $config_headers. + _am_arg="$ac_file" +@@ -18601,7 +14425,7 @@ + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; + +- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 ++ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 + $as_echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac +@@ -18696,47 +14520,7 @@ + q + } + s/.*/./; q'` +- { as_dir=$dirpart/$fdir +- case $as_dir in #( +- -*) as_dir=./$as_dir;; +- esac +- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { +- as_dirs= +- while :; do +- case $as_dir in #( +- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( +- *) as_qdir=$as_dir;; +- esac +- as_dirs="'$as_qdir' $as_dirs" +- as_dir=`$as_dirname -- "$as_dir" || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- test -d "$as_dir" && break +- done +- test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} +- { (exit 1); exit 1; }; }; } ++ as_dir=$dirpart/$fdir; as_fn_mkdir_p + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +@@ -19385,7 +15169,7 @@ + + ;; + "$ac_stdint_h":C) +-{ $as_echo "$as_me:$LINENO: creating $ac_stdint_h : $_ac_stdint_h" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_stdint_h : $_ac_stdint_h" >&5 + $as_echo "$as_me: creating $ac_stdint_h : $_ac_stdint_h" >&6;} + ac_stdint=$tmp/_stdint.h + +@@ -19817,7 +15601,7 @@ + STDINT_EOF + fi + if cmp -s $ac_stdint_h $ac_stdint 2>/dev/null; then +- { $as_echo "$as_me:$LINENO: $ac_stdint_h is unchanged" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_stdint_h is unchanged" >&5 + $as_echo "$as_me: $ac_stdint_h is unchanged" >&6;} + else + ac_dir=`$as_dirname -- "$ac_stdint_h" || +@@ -19843,47 +15627,7 @@ + q + } + s/.*/./; q'` +- { as_dir="$ac_dir" +- case $as_dir in #( +- -*) as_dir=./$as_dir;; +- esac +- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { +- as_dirs= +- while :; do +- case $as_dir in #( +- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( +- *) as_qdir=$as_dir;; +- esac +- as_dirs="'$as_qdir' $as_dirs" +- as_dir=`$as_dirname -- "$as_dir" || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- test -d "$as_dir" && break +- done +- test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} +- { (exit 1); exit 1; }; }; } ++ as_dir="$ac_dir"; as_fn_mkdir_p + rm -f $ac_stdint_h + mv $ac_stdint $ac_stdint_h + fi +@@ -19893,15 +15637,12 @@ + done # for ac_tag + + +-{ (exit 0); exit 0; } ++as_fn_exit 0 + _ACEOF +-chmod +x $CONFIG_STATUS + ac_clean_files=$ac_clean_files_save + + test $ac_write_fail = 0 || +- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } ++ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + + + # configure is writing to config.log, and then calls config.status. +@@ -19922,10 +15663,10 @@ + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. +- $ac_cs_success || { (exit 1); exit 1; } ++ $ac_cs_success || as_fn_exit $? + fi + if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then +- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 + $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + fi + +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/depcomp orc-0.4.3/depcomp +--- orc-0.4.3.old/depcomp 2009-12-14 02:20:11.000000000 +0100 ++++ orc-0.4.3/depcomp 2010-02-02 12:18:15.047398687 +0100 +@@ -1,10 +1,10 @@ + #! /bin/sh + # depcomp - compile a program generating dependencies as side-effects + +-scriptversion=2007-03-29.01 ++scriptversion=2009-04-28.21; # UTC + +-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software +-# Foundation, Inc. ++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 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 +@@ -17,9 +17,7 @@ + # 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., 51 Franklin Street, Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program. If not, see <http://www.gnu.org/licenses/>. + + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -87,6 +85,15 @@ + depmode=dashmstdout + fi + ++cygpath_u="cygpath -u -f -" ++if test "$depmode" = msvcmsys; then ++ # This is just like msvisualcpp but w/o cygpath translation. ++ # Just convert the backslash-escaped backslashes to single forward ++ # slashes to satisfy depend.m4 ++ cygpath_u="sed s,\\\\\\\\,/,g" ++ depmode=msvisualcpp ++fi ++ + case "$depmode" in + gcc3) + ## gcc 3 implements dependency tracking that does exactly what +@@ -192,14 +199,14 @@ + ' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ + tr ' +-' ' ' >> $depfile +- echo >> $depfile ++' ' ' >> "$depfile" ++ echo >> "$depfile" + + # The second pass generates a dummy entry for each header file. + tr ' ' ' + ' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ +- >> $depfile ++ >> "$depfile" + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile +@@ -328,7 +335,12 @@ + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + # Add `dependent.h:' lines. +- sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" ++ sed -ne '2,${ ++ s/^ *// ++ s/ \\*$// ++ s/$/:/ ++ p ++ }' "$tmpdepfile" >> "$depfile" + else + echo "#dummy" > "$depfile" + fi +@@ -404,7 +416,7 @@ + + # Remove the call to Libtool. + if test "$libtool" = yes; then +- while test $1 != '--mode=compile'; do ++ while test "X$1" != 'X--mode=compile'; do + shift + done + shift +@@ -455,32 +467,39 @@ + "$@" || exit $? + # Remove any Libtool call + if test "$libtool" = yes; then +- while test $1 != '--mode=compile'; do ++ while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + # X makedepend + shift +- cleared=no +- for arg in "$@"; do ++ cleared=no eat=no ++ for arg ++ do + case $cleared in + no) + set ""; shift + cleared=yes ;; + esac ++ if test $eat = yes; then ++ eat=no ++ continue ++ fi + case "$arg" in + -D*|-I*) + set fnord "$@" "$arg"; shift ;; + # Strip any option that makedepend may not understand. Remove + # the object too, otherwise makedepend will parse it as a source file. ++ -arch) ++ eat=yes ;; + -*|$object) + ;; + *) + set fnord "$@" "$arg"; shift ;; + esac + done +- obj_suffix="`echo $object | sed 's/^.*\././'`" ++ obj_suffix=`echo "$object" | sed 's/^.*\././'` + touch "$tmpdepfile" + ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" + rm -f "$depfile" +@@ -500,7 +519,7 @@ + + # Remove the call to Libtool. + if test "$libtool" = yes; then +- while test $1 != '--mode=compile'; do ++ while test "X$1" != 'X--mode=compile'; do + shift + done + shift +@@ -538,13 +557,27 @@ + + msvisualcpp) + # Important note: in order to support this mode, a compiler *must* +- # always write the preprocessed file to stdout, regardless of -o, +- # because we must use -o when running libtool. ++ # always write the preprocessed file to stdout. + "$@" || exit $? ++ ++ # Remove the call to Libtool. ++ if test "$libtool" = yes; then ++ while test "X$1" != 'X--mode=compile'; do ++ shift ++ done ++ shift ++ fi ++ + IFS=" " + for arg + do + case "$arg" in ++ -o) ++ shift ++ ;; ++ $object) ++ shift ++ ;; + "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") + set fnord "$@" + shift +@@ -557,16 +590,23 @@ + ;; + esac + done +- "$@" -E | +- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" ++ "$@" -E 2>/dev/null | ++ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \\" > "$depfile" +- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" ++ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" + echo " " >> "$depfile" +- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" ++ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" + rm -f "$tmpdepfile" + ;; + ++msvcmsys) ++ # This case exists only to let depend.m4 do its work. It works by ++ # looking at the text of this script. This case will never be run, ++ # since it is checked for above. ++ exit 1 ++ ;; ++ + none) + exec "$@" + ;; +@@ -585,5 +625,6 @@ + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" + # time-stamp-format: "%:y-%02m-%02d.%02H" +-# time-stamp-end: "$" ++# time-stamp-time-zone: "UTC" ++# time-stamp-end: "; # UTC" + # End: +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/doc/Makefile.in orc-0.4.3/doc/Makefile.in +--- orc-0.4.3.old/doc/Makefile.in 2009-12-14 02:20:10.000000000 +0100 ++++ orc-0.4.3/doc/Makefile.in 2010-02-02 12:18:14.463377390 +0100 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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. +@@ -21,8 +22,9 @@ + #################################### + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -55,6 +57,7 @@ + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = version.entities ++CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +@@ -124,6 +127,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +@@ -295,9 +299,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu doc/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu doc/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -315,6 +319,7 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + version.entities: $(top_builddir)/config.status $(srcdir)/version.entities.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + +@@ -346,13 +351,17 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -384,6 +393,7 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -402,6 +412,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -410,18 +422,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -581,6 +603,7 @@ + + sync: + cd html && rsync -a . home.schleef.org:/srv/schleef.org/www/orc/documentation/ ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/examples/Makefile.in orc-0.4.3/examples/Makefile.in +--- orc-0.4.3.old/examples/Makefile.in 2009-12-14 02:20:10.000000000 +0100 ++++ orc-0.4.3/examples/Makefile.in 2010-02-02 12:18:14.519377667 +0100 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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. +@@ -16,8 +17,9 @@ + + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -51,8 +53,8 @@ + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + am__installdirs = "$(DESTDIR)$(orcbindir)" +-orcbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + PROGRAMS = $(orcbin_PROGRAMS) + example1_SOURCES = example1.c + example1_OBJECTS = example1.$(OBJEXT) +@@ -66,6 +68,7 @@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles ++am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +@@ -146,6 +149,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +@@ -224,9 +228,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu examples/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu examples/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -244,34 +248,50 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + install-orcbinPROGRAMS: $(orcbin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(orcbindir)" || $(MKDIR_P) "$(DESTDIR)$(orcbindir)" +- @list='$(orcbin_PROGRAMS)'; for p in $$list; do \ +- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- if test -f $$p \ +- || test -f $$p1 \ +- ; then \ +- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(orcbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(orcbindir)/$$f'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(orcbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(orcbindir)/$$f" || exit 1; \ +- else :; fi; \ +- done ++ @list='$(orcbin_PROGRAMS)'; test -n "$(orcbindir)" || list=; \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed 's/$(EXEEXT)$$//' | \ ++ while read p p1; do if test -f $$p || test -f $$p1; \ ++ then echo "$$p"; echo "$$p"; else :; fi; \ ++ done | \ ++ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ ++ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ ++ sed 'N;N;N;s,\n, ,g' | \ ++ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ ++ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ ++ if ($$2 == $$4) files[d] = files[d] " " $$1; \ ++ else { print "f", $$3 "/" $$4, $$1; } } \ ++ END { for (d in files) print "f", d, files[d] }' | \ ++ while read type dir files; do \ ++ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ ++ test -z "$$files" || { \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(orcbindir)$$dir'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(orcbindir)$$dir" || exit $$?; \ ++ } \ ++ ; done + + uninstall-orcbinPROGRAMS: + @$(NORMAL_UNINSTALL) +- @list='$(orcbin_PROGRAMS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " rm -f '$(DESTDIR)$(orcbindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(orcbindir)/$$f"; \ +- done ++ @list='$(orcbin_PROGRAMS)'; test -n "$(orcbindir)" || list=; \ ++ files=`for p in $$list; do echo "$$p"; done | \ ++ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ ++ -e 's/$$/$(EXEEXT)/' `; \ ++ test -n "$$list" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(orcbindir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(orcbindir)" && rm -f $$files + + clean-orcbinPROGRAMS: +- @list='$(orcbin_PROGRAMS)'; for p in $$list; do \ +- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f $$p $$f"; \ +- rm -f $$p $$f ; \ +- done ++ @list='$(orcbin_PROGRAMS)'; test -n "$$list" || exit 0; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list || exit $$?; \ ++ test -n "$(EXEEXT)" || exit 0; \ ++ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list + example1$(EXEEXT): $(example1_OBJECTS) $(example1_DEPENDENCIES) + @rm -f example1$(EXEEXT) + $(LINK) $(example1_OBJECTS) $(example1_LDADD) $(LIBS) +@@ -294,21 +314,21 @@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@@ -331,7 +351,7 @@ + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -339,29 +359,34 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ + fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -382,13 +407,17 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -419,6 +448,7 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -440,6 +470,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -448,18 +480,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -498,6 +540,7 @@ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-orcbinPROGRAMS + ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/install-sh orc-0.4.3/install-sh +--- orc-0.4.3.old/install-sh 2009-12-14 02:20:10.000000000 +0100 ++++ orc-0.4.3/install-sh 2010-02-02 12:18:14.391412590 +0100 +@@ -1,7 +1,7 @@ + #!/bin/sh + # install - install a program, script, or datafile + +-scriptversion=2006-12-25.00 ++scriptversion=2009-04-28.21; # UTC + + # This originates from X11R5 (mit/util/scripts/install.sh), which was + # later released in X11R6 (xc/config/util/install.sh) with the +@@ -515,5 +515,6 @@ + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" + # time-stamp-format: "%:y-%02m-%02d.%02H" +-# time-stamp-end: "$" ++# time-stamp-time-zone: "UTC" ++# time-stamp-end: "; # UTC" + # End: +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/ltmain.sh orc-0.4.3/ltmain.sh +--- orc-0.4.3.old/ltmain.sh 2009-12-14 02:20:03.000000000 +0100 ++++ orc-0.4.3/ltmain.sh 2010-02-02 12:18:08.828405777 +0100 +@@ -65,7 +65,7 @@ + # compiler: $LTCC + # compiler flags: $LTCFLAGS + # linker: $LD (gnu? $with_gnu_ld) +-# $progname: (GNU libtool) 2.2.6b ++# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2 + # automake: $automake_version + # autoconf: $autoconf_version + # +@@ -73,7 +73,7 @@ + + PROGRAM=ltmain.sh + PACKAGE=libtool +-VERSION=2.2.6b ++VERSION="2.2.6b Debian-2.2.6b-2" + TIMESTAMP="" + package_revision=1.3017 + +@@ -5033,7 +5033,10 @@ + case $pass in + dlopen) libs="$dlfiles" ;; + dlpreopen) libs="$dlprefiles" ;; +- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; ++ link) ++ libs="$deplibs %DEPLIBS%" ++ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" ++ ;; + esac + fi + if test "$linkmode,$pass" = "lib,dlpreopen"; then +@@ -5344,19 +5347,19 @@ + # It is a libtool convenience library, so add in its objects. + convenience="$convenience $ladir/$objdir/$old_library" + old_convenience="$old_convenience $ladir/$objdir/$old_library" ++ tmp_libs= ++ for deplib in $dependency_libs; do ++ deplibs="$deplib $deplibs" ++ if $opt_duplicate_deps ; then ++ case "$tmp_libs " in ++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ esac ++ fi ++ tmp_libs="$tmp_libs $deplib" ++ done + elif test "$linkmode" != prog && test "$linkmode" != lib; then + func_fatal_error "\`$lib' is not a convenience library" + fi +- tmp_libs= +- for deplib in $dependency_libs; do +- deplibs="$deplib $deplibs" +- if $opt_duplicate_deps ; then +- case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; +- esac +- fi +- tmp_libs="$tmp_libs $deplib" +- done + continue + fi # $pass = conv + +@@ -5893,6 +5896,7 @@ + if test "$link_all_deplibs" != no; then + # Add the search paths of all dependency libraries + for deplib in $dependency_libs; do ++ path= + case $deplib in + -L*) path="$deplib" ;; + *.la) +@@ -6206,6 +6210,9 @@ + revision="$number_minor" + lt_irix_increment=no + ;; ++ *) ++ func_fatal_configuration "$modename: unknown library version type \`$version_type'" ++ ;; + esac + ;; + no) +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/m4/libtool.m4 orc-0.4.3/m4/libtool.m4 +--- orc-0.4.3.old/m4/libtool.m4 2009-12-14 02:20:03.000000000 +0100 ++++ orc-0.4.3/m4/libtool.m4 2010-02-02 12:18:08.928379157 +0100 +@@ -2254,7 +2254,7 @@ + ;; + + *) +- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} ${libname}${versuffix}.lib' ++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; + esac + dynamic_linker='Win32 ld.exe' +@@ -2445,7 +2445,7 @@ + ;; + + # This must be Linux ELF. +-linux* | k*bsd*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -2485,6 +2485,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -3072,11 +3084,11 @@ + ;; + + # This must be Linux ELF. +-linux* | k*bsd*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) ++netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else +@@ -3693,7 +3705,7 @@ + ;; + esac + ;; +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler +@@ -3757,7 +3769,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise +@@ -3977,7 +3989,7 @@ + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. + ecc*) +@@ -4182,6 +4194,9 @@ + cygwin* | mingw* | cegcc*) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + ;; ++ linux* | k*bsd*-gnu) ++ _LT_TAGVAR(link_all_deplibs, $1)=no ++ ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; +@@ -4246,6 +4261,9 @@ + openbsd*) + with_gnu_ld=no + ;; ++ linux* | k*bsd*-gnu) ++ _LT_TAGVAR(link_all_deplibs, $1)=no ++ ;; + esac + + _LT_TAGVAR(ld_shlibs, $1)=yes +@@ -4267,6 +4285,7 @@ + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in ++ *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +@@ -4358,7 +4377,7 @@ + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- gnu* | linux* | tpf* | k*bsd*-gnu) ++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in +@@ -4428,7 +4447,7 @@ + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -4603,6 +4622,7 @@ + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi ++ _LT_TAGVAR(link_all_deplibs, $1)=no + else + # not using gcc + if test "$host_cpu" = ia64; then +@@ -4689,7 +4709,8 @@ + # The linker will automatically build a .lib file if we build a DLL. + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. +- _LT_TAGVAR(fix_srcfile_path, $1)= ++ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + +@@ -4840,7 +4861,7 @@ + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -5840,7 +5861,7 @@ + _LT_TAGVAR(inherit_rpath, $1)=yes + ;; + +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/Makefile.in orc-0.4.3/Makefile.in +--- orc-0.4.3.old/Makefile.in 2009-12-14 02:20:11.000000000 +0100 ++++ orc-0.4.3/Makefile.in 2010-02-02 12:18:15.131377659 +0100 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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. +@@ -16,8 +17,9 @@ + + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -55,6 +57,7 @@ + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = config.h + CONFIG_CLEAN_FILES = orc-uninstalled.pc orc.pc ++CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ +@@ -69,12 +72,29 @@ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + am__installdirs = "$(DESTDIR)$(pkgconfigdir)" +-pkgconfigDATA_INSTALL = $(INSTALL_DATA) + DATA = $(pkgconfig_DATA) + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ++AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ ++ distdir dist dist-all distcheck + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +@@ -82,9 +102,34 @@ + distdir = $(PACKAGE)-$(VERSION) + top_distdir = $(distdir) + am__remove_distdir = \ +- { test ! -d $(distdir) \ +- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ +- && rm -fr $(distdir); }; } ++ { test ! -d "$(distdir)" \ ++ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ ++ && rm -fr "$(distdir)"; }; } ++am__relativize = \ ++ dir0=`pwd`; \ ++ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ ++ sed_rest='s,^[^/]*/*,,'; \ ++ sed_last='s,^.*/\([^/]*\)$$,\1,'; \ ++ sed_butlast='s,/*[^/]*$$,,'; \ ++ while test -n "$$dir1"; do \ ++ first=`echo "$$dir1" | sed -e "$$sed_first"`; \ ++ if test "$$first" != "."; then \ ++ if test "$$first" = ".."; then \ ++ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ ++ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ ++ else \ ++ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ ++ if test "$$first2" = "$$first"; then \ ++ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ ++ else \ ++ dir2="../$$dir2"; \ ++ fi; \ ++ dir0="$$dir0"/"$$first"; \ ++ fi; \ ++ fi; \ ++ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ ++ done; \ ++ reldir="$$dir2" + DIST_ARCHIVES = $(distdir).tar.gz + GZIP_ENV = --best + distuninstallcheck_listfiles = find . -type f -print +@@ -155,6 +200,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +@@ -236,15 +282,15 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ +- cd $(srcdir) && $(AUTOMAKE) --foreign \ ++ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ ++ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -260,9 +306,10 @@ + $(SHELL) ./config.status --recheck + + $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(srcdir) && $(AUTOCONF) ++ $(am__cd) $(srcdir) && $(AUTOCONF) + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) ++ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) ++$(am__aclocal_m4_deps): + + config.h: stamp-h1 + @if test ! -f $@; then \ +@@ -274,7 +321,7 @@ + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h + $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- cd $(top_srcdir) && $(AUTOHEADER) ++ ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) + rm -f stamp-h1 + touch $@ + +@@ -296,20 +343,23 @@ + install-pkgconfigDATA: $(pkgconfig_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" +- @list='$(pkgconfig_DATA)'; for p in $$list; do \ ++ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ ++ for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ +- $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ + done + + uninstall-pkgconfigDATA: + @$(NORMAL_UNINSTALL) +- @list='$(pkgconfig_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ +- done ++ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ test -n "$$files" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. +@@ -318,7 +368,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -335,7 +385,7 @@ + else \ + local_target="$$target"; \ + fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ +@@ -343,7 +393,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -369,16 +419,16 @@ + else \ + local_target="$$target"; \ + fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +@@ -393,7 +443,7 @@ + + TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +@@ -405,7 +455,7 @@ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ +- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ ++ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ +@@ -414,36 +464,41 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ + fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) + $(am__remove_distdir) +- test -d $(distdir) || mkdir $(distdir) ++ test -d "$(distdir)" || mkdir "$(distdir)" + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -459,38 +514,55 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +- (cd $$subdir && \ ++ fi; \ ++ done ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ ++ $(am__relativize); \ ++ new_distdir=$$reldir; \ ++ dir1=$$subdir; dir2="$(top_distdir)"; \ ++ $(am__relativize); \ ++ new_top_distdir=$$reldir; \ ++ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ ++ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ ++ ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ ++ top_distdir="$$new_top_distdir" \ ++ distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ ++ am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done +- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ -test -n "$(am__skip_mode_fix)" \ ++ || find "$(distdir)" -type d ! -perm -755 \ ++ -exec chmod u+rwx,go+rx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ +- || chmod -R a+r $(distdir) ++ || chmod -R a+r "$(distdir)" + dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) +@@ -503,6 +575,10 @@ + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + ++dist-xz: distdir ++ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz ++ $(am__remove_distdir) ++ + dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) +@@ -526,15 +602,17 @@ + distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ +- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ ++ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ +- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ ++ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ ++ *.tar.xz*) \ ++ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac +@@ -542,9 +620,11 @@ + mkdir $(distdir)/_build + mkdir $(distdir)/_inst + chmod a-w $(distdir) ++ test -d $(distdir)/_build || exit 0; \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ +- && cd $(distdir)/_build \ ++ && am__cwd=`pwd` \ ++ && $(am__cd) $(distdir)/_build \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(DISTCHECK_CONFIGURE_FLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) \ +@@ -566,13 +646,15 @@ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ +- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck ++ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ ++ && cd "$$am__cwd" \ ++ || exit 1 + $(am__remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' + distuninstallcheck: +- @cd $(distuninstallcheck_dir) \ ++ @$(am__cd) '$(distuninstallcheck_dir)' \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ +@@ -620,6 +702,7 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -641,6 +724,8 @@ + + html: html-recursive + ++html-am: ++ + info: info-recursive + + info-am: +@@ -649,18 +734,28 @@ + + install-dvi: install-dvi-recursive + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-recursive + ++install-html-am: ++ + install-info: install-info-recursive + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-recursive + ++install-pdf-am: ++ + install-ps: install-ps-recursive + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -683,25 +778,26 @@ + + uninstall-am: uninstall-pkgconfigDATA + +-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ +- install-strip ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ ++ ctags-recursive install install-am install-strip \ ++ tags-recursive + + .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am am--refresh check check-am clean clean-generic \ + clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ +- dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ +- distclean distclean-generic distclean-hdr distclean-libtool \ +- distclean-tags distcleancheck distdir distuninstallcheck dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-dvi install-dvi-am \ +- install-exec install-exec-am install-html install-html-am \ +- install-info install-info-am install-man install-pdf \ +- install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- installdirs-am maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am tags tags-recursive uninstall uninstall-am \ +- uninstall-pkgconfigDATA ++ dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ ++ distcheck distclean distclean-generic distclean-hdr \ ++ distclean-libtool distclean-tags distcleancheck distdir \ ++ distuninstallcheck dvi dvi-am html html-am info info-am \ ++ install install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-pkgconfigDATA install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ ++ installdirs installdirs-am maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ ++ uninstall uninstall-am uninstall-pkgconfigDATA + + + orc-$(ORC_MAJORMINOR).pc: orc.pc +@@ -709,6 +805,7 @@ + + orc-$(ORC_MAJORMINOR)-uninstalled.pc: orc-uninstalled.pc + cp orc-uninstalled.pc orc-$(ORC_MAJORMINOR)-uninstalled.pc ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/missing orc-0.4.3/missing +--- orc-0.4.3.old/missing 2009-12-14 02:20:10.000000000 +0100 ++++ orc-0.4.3/missing 2010-02-02 12:18:14.395380273 +0100 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Common stub for a few missing GNU programs while installing. + +-scriptversion=2006-05-10.23 ++scriptversion=2009-04-28.21; # UTC + +-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 +-# Free Software Foundation, Inc. ++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, ++# 2008, 2009 Free Software Foundation, Inc. + # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. + + # This program is free software; you can redistribute it and/or modify +@@ -18,9 +18,7 @@ + # 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., 51 Franklin Street, Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program. If not, see <http://www.gnu.org/licenses/>. + + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -89,6 +87,9 @@ + tar try tar, gnutar, gtar, then tar without non-portable flags + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + ++Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and ++\`g' are ignored when checking the name. ++ + Send bug reports to <bug-automake@gnu.org>." + exit $? + ;; +@@ -106,15 +107,22 @@ + + esac + ++# normalize program name to check for. ++program=`echo "$1" | sed ' ++ s/^gnu-//; t ++ s/^gnu//; t ++ s/^g//; t'` ++ + # Now exit if we have it, but it failed. Also exit now if we + # don't have it and --version was passed (most likely to detect +-# the program). ++# the program). This is about non-GNU programs, so use $1 not ++# $program. + case $1 in +- lex|yacc) ++ lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + +- tar) ++ tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 +@@ -138,7 +146,7 @@ + + # If it does not exist, or fails to run (possibly an outdated version), + # try to emulate it. +-case $1 in ++case $program in + aclocal*) + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if +@@ -148,7 +156,7 @@ + touch aclocal.m4 + ;; + +- autoconf) ++ autoconf*) + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if + you modified \`${configure_ac}'. You might want to install the +@@ -157,7 +165,7 @@ + touch configure + ;; + +- autoheader) ++ autoheader*) + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if + you modified \`acconfig.h' or \`${configure_ac}'. You might want +@@ -187,7 +195,7 @@ + while read f; do touch "$f"; done + ;; + +- autom4te) ++ autom4te*) + echo 1>&2 "\ + WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the +@@ -210,7 +218,7 @@ + fi + ;; + +- bison|yacc) ++ bison*|yacc*) + echo 1>&2 "\ + WARNING: \`$1' $msg. You should only need it if + you modified a \`.y' file. You may need the \`Bison' package +@@ -240,7 +248,7 @@ + fi + ;; + +- lex|flex) ++ lex*|flex*) + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if + you modified a \`.l' file. You may need the \`Flex' package +@@ -263,7 +271,7 @@ + fi + ;; + +- help2man) ++ help2man*) + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if + you modified a dependency of a manual page. You may need the +@@ -277,11 +285,11 @@ + else + test -z "$file" || exec >$file + echo ".ab help2man is required to generate this page" +- exit 1 ++ exit $? + fi + ;; + +- makeinfo) ++ makeinfo*) + echo 1>&2 "\ + WARNING: \`$1' is $msg. You should only need it if + you modified a \`.texi' or \`.texinfo' file, or any other file +@@ -310,7 +318,7 @@ + touch $file + ;; + +- tar) ++ tar*) + shift + + # We have already tried tar in the generic part. +@@ -363,5 +371,6 @@ + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" + # time-stamp-format: "%:y-%02m-%02d.%02H" +-# time-stamp-end: "$" ++# time-stamp-time-zone: "UTC" ++# time-stamp-end: "; # UTC" + # End: +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/orc/Makefile.in orc-0.4.3/orc/Makefile.in +--- orc-0.4.3.old/orc/Makefile.in 2009-12-14 02:20:11.000000000 +0100 ++++ orc-0.4.3/orc/Makefile.in 2010-02-02 12:18:14.891377460 +0100 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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. +@@ -18,6 +19,7 @@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -54,19 +56,34 @@ + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; + am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)" \ + "$(DESTDIR)$(pkgincludedir)" +-libLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(lib_LTLIBRARIES) + liborc_@ORC_MAJORMINOR@_la_LIBADD = + am__liborc_@ORC_MAJORMINOR@_la_SOURCES_DIST = orc.c orcexecutor.c \ +- orcfunctions.c orcrule.c orccodemem.c orcprogram.c \ ++ orcfunctions.c orcutils.c orcrule.c orccodemem.c orcprogram.c \ + orccompiler.c orcprogram-arm.c orcprogram-c.c \ + orcprogram-c64x-c.c orcprogram-altivec.c orcprogram-mmx.c \ + orcprogram-sse.c orcprogram.h orcopcodes.c orcparse.c \ +@@ -84,6 +101,7 @@ + liborc_@ORC_MAJORMINOR@_la-orc.lo \ + liborc_@ORC_MAJORMINOR@_la-orcexecutor.lo \ + liborc_@ORC_MAJORMINOR@_la-orcfunctions.lo \ ++ liborc_@ORC_MAJORMINOR@_la-orcutils.lo \ + liborc_@ORC_MAJORMINOR@_la-orcrule.lo \ + liborc_@ORC_MAJORMINOR@_la-orccodemem.lo \ + liborc_@ORC_MAJORMINOR@_la-orcprogram.lo \ +@@ -117,6 +135,7 @@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles ++am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +@@ -128,8 +147,6 @@ + $(LDFLAGS) -o $@ + SOURCES = $(liborc_@ORC_MAJORMINOR@_la_SOURCES) + DIST_SOURCES = $(am__liborc_@ORC_MAJORMINOR@_la_SOURCES_DIST) +-nodist_pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) +-pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) + HEADERS = $(nodist_pkginclude_HEADERS) $(pkginclude_HEADERS) + ETAGS = etags + CTAGS = ctags +@@ -201,6 +218,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +@@ -273,7 +291,7 @@ + -DORC_ENABLE_UNSTABLE_API + + liborc_@ORC_MAJORMINOR@_la_SOURCES = orc.c orcexecutor.c \ +- orcfunctions.c orcrule.c orccodemem.c orcprogram.c \ ++ orcfunctions.c orcutils.c orcrule.c orccodemem.c orcprogram.c \ + orccompiler.c orcprogram-arm.c orcprogram-c.c \ + orcprogram-c64x-c.c orcprogram-altivec.c orcprogram-mmx.c \ + orcprogram-sse.c orcprogram.h orcopcodes.c orcparse.c \ +@@ -311,9 +329,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu orc/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu orc/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu orc/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu orc/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -331,23 +349,28 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ ++ list2=; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ ++ list2="$$list2 $$p"; \ + else :; fi; \ +- done ++ done; \ ++ test -z "$$list2" || { \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ ++ } + + uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ ++ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ ++ for p in $$list; do \ ++ $(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + + clean-libLTLIBRARIES: +@@ -395,231 +418,239 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-sse.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcsse.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcutils.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcx86.Plo@am__quote@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + liborc_@ORC_MAJORMINOR@_la-orc.lo: orc.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orc.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orc.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orc.lo `test -f 'orc.c' || echo '$(srcdir)/'`orc.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orc.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orc.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orc.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orc.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orc.lo `test -f 'orc.c' || echo '$(srcdir)/'`orc.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orc.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orc.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orc.c' object='liborc_@ORC_MAJORMINOR@_la-orc.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orc.lo `test -f 'orc.c' || echo '$(srcdir)/'`orc.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orc.lo `test -f 'orc.c' || echo '$(srcdir)/'`orc.c + + liborc_@ORC_MAJORMINOR@_la-orcexecutor.lo: orcexecutor.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcexecutor.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcexecutor.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcexecutor.lo `test -f 'orcexecutor.c' || echo '$(srcdir)/'`orcexecutor.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcexecutor.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcexecutor.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcexecutor.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcexecutor.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcexecutor.lo `test -f 'orcexecutor.c' || echo '$(srcdir)/'`orcexecutor.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcexecutor.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcexecutor.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcexecutor.c' object='liborc_@ORC_MAJORMINOR@_la-orcexecutor.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcexecutor.lo `test -f 'orcexecutor.c' || echo '$(srcdir)/'`orcexecutor.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcexecutor.lo `test -f 'orcexecutor.c' || echo '$(srcdir)/'`orcexecutor.c + + liborc_@ORC_MAJORMINOR@_la-orcfunctions.lo: orcfunctions.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcfunctions.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcfunctions.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcfunctions.lo `test -f 'orcfunctions.c' || echo '$(srcdir)/'`orcfunctions.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcfunctions.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcfunctions.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcfunctions.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcfunctions.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcfunctions.lo `test -f 'orcfunctions.c' || echo '$(srcdir)/'`orcfunctions.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcfunctions.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcfunctions.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcfunctions.c' object='liborc_@ORC_MAJORMINOR@_la-orcfunctions.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcfunctions.lo `test -f 'orcfunctions.c' || echo '$(srcdir)/'`orcfunctions.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcfunctions.lo `test -f 'orcfunctions.c' || echo '$(srcdir)/'`orcfunctions.c ++ ++liborc_@ORC_MAJORMINOR@_la-orcutils.lo: orcutils.c ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcutils.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcutils.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcutils.lo `test -f 'orcutils.c' || echo '$(srcdir)/'`orcutils.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcutils.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcutils.Plo ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcutils.c' object='liborc_@ORC_MAJORMINOR@_la-orcutils.lo' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcutils.lo `test -f 'orcutils.c' || echo '$(srcdir)/'`orcutils.c + + liborc_@ORC_MAJORMINOR@_la-orcrule.lo: orcrule.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcrule.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrule.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcrule.lo `test -f 'orcrule.c' || echo '$(srcdir)/'`orcrule.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrule.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrule.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcrule.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrule.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcrule.lo `test -f 'orcrule.c' || echo '$(srcdir)/'`orcrule.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrule.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrule.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcrule.c' object='liborc_@ORC_MAJORMINOR@_la-orcrule.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcrule.lo `test -f 'orcrule.c' || echo '$(srcdir)/'`orcrule.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcrule.lo `test -f 'orcrule.c' || echo '$(srcdir)/'`orcrule.c + + liborc_@ORC_MAJORMINOR@_la-orccodemem.lo: orccodemem.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orccodemem.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccodemem.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orccodemem.lo `test -f 'orccodemem.c' || echo '$(srcdir)/'`orccodemem.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccodemem.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccodemem.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orccodemem.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccodemem.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orccodemem.lo `test -f 'orccodemem.c' || echo '$(srcdir)/'`orccodemem.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccodemem.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccodemem.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orccodemem.c' object='liborc_@ORC_MAJORMINOR@_la-orccodemem.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orccodemem.lo `test -f 'orccodemem.c' || echo '$(srcdir)/'`orccodemem.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orccodemem.lo `test -f 'orccodemem.c' || echo '$(srcdir)/'`orccodemem.c + + liborc_@ORC_MAJORMINOR@_la-orcprogram.lo: orcprogram.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcprogram.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram.lo `test -f 'orcprogram.c' || echo '$(srcdir)/'`orcprogram.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcprogram.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram.lo `test -f 'orcprogram.c' || echo '$(srcdir)/'`orcprogram.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcprogram.c' object='liborc_@ORC_MAJORMINOR@_la-orcprogram.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram.lo `test -f 'orcprogram.c' || echo '$(srcdir)/'`orcprogram.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram.lo `test -f 'orcprogram.c' || echo '$(srcdir)/'`orcprogram.c + + liborc_@ORC_MAJORMINOR@_la-orccompiler.lo: orccompiler.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orccompiler.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccompiler.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orccompiler.lo `test -f 'orccompiler.c' || echo '$(srcdir)/'`orccompiler.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccompiler.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccompiler.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orccompiler.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccompiler.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orccompiler.lo `test -f 'orccompiler.c' || echo '$(srcdir)/'`orccompiler.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccompiler.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccompiler.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orccompiler.c' object='liborc_@ORC_MAJORMINOR@_la-orccompiler.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orccompiler.lo `test -f 'orccompiler.c' || echo '$(srcdir)/'`orccompiler.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orccompiler.lo `test -f 'orccompiler.c' || echo '$(srcdir)/'`orccompiler.c + + liborc_@ORC_MAJORMINOR@_la-orcprogram-arm.lo: orcprogram-arm.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcprogram-arm.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-arm.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-arm.lo `test -f 'orcprogram-arm.c' || echo '$(srcdir)/'`orcprogram-arm.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-arm.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-arm.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcprogram-arm.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-arm.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-arm.lo `test -f 'orcprogram-arm.c' || echo '$(srcdir)/'`orcprogram-arm.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-arm.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-arm.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcprogram-arm.c' object='liborc_@ORC_MAJORMINOR@_la-orcprogram-arm.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-arm.lo `test -f 'orcprogram-arm.c' || echo '$(srcdir)/'`orcprogram-arm.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-arm.lo `test -f 'orcprogram-arm.c' || echo '$(srcdir)/'`orcprogram-arm.c + + liborc_@ORC_MAJORMINOR@_la-orcprogram-c.lo: orcprogram-c.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcprogram-c.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-c.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-c.lo `test -f 'orcprogram-c.c' || echo '$(srcdir)/'`orcprogram-c.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-c.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-c.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcprogram-c.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-c.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-c.lo `test -f 'orcprogram-c.c' || echo '$(srcdir)/'`orcprogram-c.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-c.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-c.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcprogram-c.c' object='liborc_@ORC_MAJORMINOR@_la-orcprogram-c.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-c.lo `test -f 'orcprogram-c.c' || echo '$(srcdir)/'`orcprogram-c.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-c.lo `test -f 'orcprogram-c.c' || echo '$(srcdir)/'`orcprogram-c.c + + liborc_@ORC_MAJORMINOR@_la-orcprogram-c64x-c.lo: orcprogram-c64x-c.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcprogram-c64x-c.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-c64x-c.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-c64x-c.lo `test -f 'orcprogram-c64x-c.c' || echo '$(srcdir)/'`orcprogram-c64x-c.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-c64x-c.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-c64x-c.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcprogram-c64x-c.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-c64x-c.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-c64x-c.lo `test -f 'orcprogram-c64x-c.c' || echo '$(srcdir)/'`orcprogram-c64x-c.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-c64x-c.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-c64x-c.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcprogram-c64x-c.c' object='liborc_@ORC_MAJORMINOR@_la-orcprogram-c64x-c.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-c64x-c.lo `test -f 'orcprogram-c64x-c.c' || echo '$(srcdir)/'`orcprogram-c64x-c.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-c64x-c.lo `test -f 'orcprogram-c64x-c.c' || echo '$(srcdir)/'`orcprogram-c64x-c.c + + liborc_@ORC_MAJORMINOR@_la-orcprogram-altivec.lo: orcprogram-altivec.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcprogram-altivec.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-altivec.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-altivec.lo `test -f 'orcprogram-altivec.c' || echo '$(srcdir)/'`orcprogram-altivec.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-altivec.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-altivec.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcprogram-altivec.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-altivec.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-altivec.lo `test -f 'orcprogram-altivec.c' || echo '$(srcdir)/'`orcprogram-altivec.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-altivec.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-altivec.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcprogram-altivec.c' object='liborc_@ORC_MAJORMINOR@_la-orcprogram-altivec.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-altivec.lo `test -f 'orcprogram-altivec.c' || echo '$(srcdir)/'`orcprogram-altivec.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-altivec.lo `test -f 'orcprogram-altivec.c' || echo '$(srcdir)/'`orcprogram-altivec.c + + liborc_@ORC_MAJORMINOR@_la-orcprogram-mmx.lo: orcprogram-mmx.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcprogram-mmx.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-mmx.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-mmx.lo `test -f 'orcprogram-mmx.c' || echo '$(srcdir)/'`orcprogram-mmx.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-mmx.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-mmx.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcprogram-mmx.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-mmx.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-mmx.lo `test -f 'orcprogram-mmx.c' || echo '$(srcdir)/'`orcprogram-mmx.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-mmx.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-mmx.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcprogram-mmx.c' object='liborc_@ORC_MAJORMINOR@_la-orcprogram-mmx.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-mmx.lo `test -f 'orcprogram-mmx.c' || echo '$(srcdir)/'`orcprogram-mmx.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-mmx.lo `test -f 'orcprogram-mmx.c' || echo '$(srcdir)/'`orcprogram-mmx.c + + liborc_@ORC_MAJORMINOR@_la-orcprogram-sse.lo: orcprogram-sse.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcprogram-sse.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-sse.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-sse.lo `test -f 'orcprogram-sse.c' || echo '$(srcdir)/'`orcprogram-sse.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-sse.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-sse.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcprogram-sse.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-sse.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-sse.lo `test -f 'orcprogram-sse.c' || echo '$(srcdir)/'`orcprogram-sse.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-sse.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcprogram-sse.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcprogram-sse.c' object='liborc_@ORC_MAJORMINOR@_la-orcprogram-sse.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-sse.lo `test -f 'orcprogram-sse.c' || echo '$(srcdir)/'`orcprogram-sse.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcprogram-sse.lo `test -f 'orcprogram-sse.c' || echo '$(srcdir)/'`orcprogram-sse.c + + liborc_@ORC_MAJORMINOR@_la-orcopcodes.lo: orcopcodes.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcopcodes.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcopcodes.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcopcodes.lo `test -f 'orcopcodes.c' || echo '$(srcdir)/'`orcopcodes.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcopcodes.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcopcodes.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcopcodes.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcopcodes.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcopcodes.lo `test -f 'orcopcodes.c' || echo '$(srcdir)/'`orcopcodes.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcopcodes.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcopcodes.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcopcodes.c' object='liborc_@ORC_MAJORMINOR@_la-orcopcodes.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcopcodes.lo `test -f 'orcopcodes.c' || echo '$(srcdir)/'`orcopcodes.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcopcodes.lo `test -f 'orcopcodes.c' || echo '$(srcdir)/'`orcopcodes.c + + liborc_@ORC_MAJORMINOR@_la-orcparse.lo: orcparse.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcparse.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcparse.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcparse.lo `test -f 'orcparse.c' || echo '$(srcdir)/'`orcparse.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcparse.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcparse.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcparse.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcparse.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcparse.lo `test -f 'orcparse.c' || echo '$(srcdir)/'`orcparse.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcparse.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcparse.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcparse.c' object='liborc_@ORC_MAJORMINOR@_la-orcparse.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcparse.lo `test -f 'orcparse.c' || echo '$(srcdir)/'`orcparse.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcparse.lo `test -f 'orcparse.c' || echo '$(srcdir)/'`orcparse.c + + liborc_@ORC_MAJORMINOR@_la-orconce.lo: orconce.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orconce.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orconce.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orconce.lo `test -f 'orconce.c' || echo '$(srcdir)/'`orconce.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orconce.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orconce.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orconce.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orconce.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orconce.lo `test -f 'orconce.c' || echo '$(srcdir)/'`orconce.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orconce.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orconce.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orconce.c' object='liborc_@ORC_MAJORMINOR@_la-orconce.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orconce.lo `test -f 'orconce.c' || echo '$(srcdir)/'`orconce.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orconce.lo `test -f 'orconce.c' || echo '$(srcdir)/'`orconce.c + + liborc_@ORC_MAJORMINOR@_la-orcrules-altivec.lo: orcrules-altivec.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcrules-altivec.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-altivec.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-altivec.lo `test -f 'orcrules-altivec.c' || echo '$(srcdir)/'`orcrules-altivec.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-altivec.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-altivec.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcrules-altivec.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-altivec.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-altivec.lo `test -f 'orcrules-altivec.c' || echo '$(srcdir)/'`orcrules-altivec.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-altivec.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-altivec.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcrules-altivec.c' object='liborc_@ORC_MAJORMINOR@_la-orcrules-altivec.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-altivec.lo `test -f 'orcrules-altivec.c' || echo '$(srcdir)/'`orcrules-altivec.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-altivec.lo `test -f 'orcrules-altivec.c' || echo '$(srcdir)/'`orcrules-altivec.c + + liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.lo: orcrules-mmx.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.lo `test -f 'orcrules-mmx.c' || echo '$(srcdir)/'`orcrules-mmx.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.lo `test -f 'orcrules-mmx.c' || echo '$(srcdir)/'`orcrules-mmx.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcrules-mmx.c' object='liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.lo `test -f 'orcrules-mmx.c' || echo '$(srcdir)/'`orcrules-mmx.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-mmx.lo `test -f 'orcrules-mmx.c' || echo '$(srcdir)/'`orcrules-mmx.c + + liborc_@ORC_MAJORMINOR@_la-orcrules-sse.lo: orcrules-sse.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcrules-sse.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-sse.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-sse.lo `test -f 'orcrules-sse.c' || echo '$(srcdir)/'`orcrules-sse.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-sse.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-sse.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcrules-sse.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-sse.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-sse.lo `test -f 'orcrules-sse.c' || echo '$(srcdir)/'`orcrules-sse.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-sse.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-sse.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcrules-sse.c' object='liborc_@ORC_MAJORMINOR@_la-orcrules-sse.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-sse.lo `test -f 'orcrules-sse.c' || echo '$(srcdir)/'`orcrules-sse.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-sse.lo `test -f 'orcrules-sse.c' || echo '$(srcdir)/'`orcrules-sse.c + + liborc_@ORC_MAJORMINOR@_la-orcrules-arm.lo: orcrules-arm.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcrules-arm.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-arm.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-arm.lo `test -f 'orcrules-arm.c' || echo '$(srcdir)/'`orcrules-arm.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-arm.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-arm.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcrules-arm.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-arm.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-arm.lo `test -f 'orcrules-arm.c' || echo '$(srcdir)/'`orcrules-arm.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-arm.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcrules-arm.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcrules-arm.c' object='liborc_@ORC_MAJORMINOR@_la-orcrules-arm.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-arm.lo `test -f 'orcrules-arm.c' || echo '$(srcdir)/'`orcrules-arm.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcrules-arm.lo `test -f 'orcrules-arm.c' || echo '$(srcdir)/'`orcrules-arm.c + + liborc_@ORC_MAJORMINOR@_la-orcdebug.lo: orcdebug.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcdebug.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcdebug.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcdebug.lo `test -f 'orcdebug.c' || echo '$(srcdir)/'`orcdebug.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcdebug.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcdebug.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcdebug.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcdebug.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcdebug.lo `test -f 'orcdebug.c' || echo '$(srcdir)/'`orcdebug.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcdebug.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcdebug.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcdebug.c' object='liborc_@ORC_MAJORMINOR@_la-orcdebug.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcdebug.lo `test -f 'orcdebug.c' || echo '$(srcdir)/'`orcdebug.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcdebug.lo `test -f 'orcdebug.c' || echo '$(srcdir)/'`orcdebug.c + + liborc_@ORC_MAJORMINOR@_la-orcpowerpc.lo: orcpowerpc.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcpowerpc.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcpowerpc.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcpowerpc.lo `test -f 'orcpowerpc.c' || echo '$(srcdir)/'`orcpowerpc.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcpowerpc.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcpowerpc.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcpowerpc.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcpowerpc.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcpowerpc.lo `test -f 'orcpowerpc.c' || echo '$(srcdir)/'`orcpowerpc.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcpowerpc.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcpowerpc.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcpowerpc.c' object='liborc_@ORC_MAJORMINOR@_la-orcpowerpc.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcpowerpc.lo `test -f 'orcpowerpc.c' || echo '$(srcdir)/'`orcpowerpc.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcpowerpc.lo `test -f 'orcpowerpc.c' || echo '$(srcdir)/'`orcpowerpc.c + + liborc_@ORC_MAJORMINOR@_la-orcsse.lo: orcsse.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcsse.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcsse.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcsse.lo `test -f 'orcsse.c' || echo '$(srcdir)/'`orcsse.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcsse.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcsse.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcsse.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcsse.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcsse.lo `test -f 'orcsse.c' || echo '$(srcdir)/'`orcsse.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcsse.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcsse.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcsse.c' object='liborc_@ORC_MAJORMINOR@_la-orcsse.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcsse.lo `test -f 'orcsse.c' || echo '$(srcdir)/'`orcsse.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcsse.lo `test -f 'orcsse.c' || echo '$(srcdir)/'`orcsse.c + + liborc_@ORC_MAJORMINOR@_la-orcmmx.lo: orcmmx.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcmmx.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcmmx.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcmmx.lo `test -f 'orcmmx.c' || echo '$(srcdir)/'`orcmmx.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcmmx.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcmmx.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcmmx.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcmmx.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcmmx.lo `test -f 'orcmmx.c' || echo '$(srcdir)/'`orcmmx.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcmmx.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcmmx.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcmmx.c' object='liborc_@ORC_MAJORMINOR@_la-orcmmx.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcmmx.lo `test -f 'orcmmx.c' || echo '$(srcdir)/'`orcmmx.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcmmx.lo `test -f 'orcmmx.c' || echo '$(srcdir)/'`orcmmx.c + + liborc_@ORC_MAJORMINOR@_la-orcx86.lo: orcx86.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcx86.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcx86.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcx86.lo `test -f 'orcx86.c' || echo '$(srcdir)/'`orcx86.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcx86.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcx86.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcx86.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcx86.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcx86.lo `test -f 'orcx86.c' || echo '$(srcdir)/'`orcx86.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcx86.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcx86.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcx86.c' object='liborc_@ORC_MAJORMINOR@_la-orcx86.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcx86.lo `test -f 'orcx86.c' || echo '$(srcdir)/'`orcx86.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcx86.lo `test -f 'orcx86.c' || echo '$(srcdir)/'`orcx86.c + + liborc_@ORC_MAJORMINOR@_la-orcarm.lo: orcarm.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcarm.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcarm.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcarm.lo `test -f 'orcarm.c' || echo '$(srcdir)/'`orcarm.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcarm.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcarm.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orcarm.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcarm.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orcarm.lo `test -f 'orcarm.c' || echo '$(srcdir)/'`orcarm.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcarm.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orcarm.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcarm.c' object='liborc_@ORC_MAJORMINOR@_la-orcarm.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcarm.lo `test -f 'orcarm.c' || echo '$(srcdir)/'`orcarm.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orcarm.lo `test -f 'orcarm.c' || echo '$(srcdir)/'`orcarm.c + + liborc_@ORC_MAJORMINOR@_la-orccpu-x86.lo: orccpu-x86.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orccpu-x86.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-x86.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orccpu-x86.lo `test -f 'orccpu-x86.c' || echo '$(srcdir)/'`orccpu-x86.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-x86.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-x86.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orccpu-x86.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-x86.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orccpu-x86.lo `test -f 'orccpu-x86.c' || echo '$(srcdir)/'`orccpu-x86.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-x86.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-x86.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orccpu-x86.c' object='liborc_@ORC_MAJORMINOR@_la-orccpu-x86.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orccpu-x86.lo `test -f 'orccpu-x86.c' || echo '$(srcdir)/'`orccpu-x86.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orccpu-x86.lo `test -f 'orccpu-x86.c' || echo '$(srcdir)/'`orccpu-x86.c + + liborc_@ORC_MAJORMINOR@_la-orccpu-powerpc.lo: orccpu-powerpc.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orccpu-powerpc.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-powerpc.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orccpu-powerpc.lo `test -f 'orccpu-powerpc.c' || echo '$(srcdir)/'`orccpu-powerpc.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-powerpc.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-powerpc.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orccpu-powerpc.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-powerpc.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orccpu-powerpc.lo `test -f 'orccpu-powerpc.c' || echo '$(srcdir)/'`orccpu-powerpc.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-powerpc.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-powerpc.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orccpu-powerpc.c' object='liborc_@ORC_MAJORMINOR@_la-orccpu-powerpc.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orccpu-powerpc.lo `test -f 'orccpu-powerpc.c' || echo '$(srcdir)/'`orccpu-powerpc.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orccpu-powerpc.lo `test -f 'orccpu-powerpc.c' || echo '$(srcdir)/'`orccpu-powerpc.c + + liborc_@ORC_MAJORMINOR@_la-orccpu-arm.lo: orccpu-arm.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orccpu-arm.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-arm.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orccpu-arm.lo `test -f 'orccpu-arm.c' || echo '$(srcdir)/'`orccpu-arm.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-arm.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-arm.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_@ORC_MAJORMINOR@_la-orccpu-arm.lo -MD -MP -MF $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-arm.Tpo -c -o liborc_@ORC_MAJORMINOR@_la-orccpu-arm.lo `test -f 'orccpu-arm.c' || echo '$(srcdir)/'`orccpu-arm.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-arm.Tpo $(DEPDIR)/liborc_@ORC_MAJORMINOR@_la-orccpu-arm.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orccpu-arm.c' object='liborc_@ORC_MAJORMINOR@_la-orccpu-arm.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orccpu-arm.lo `test -f 'orccpu-arm.c' || echo '$(srcdir)/'`orccpu-arm.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_@ORC_MAJORMINOR@_la-orccpu-arm.lo `test -f 'orccpu-arm.c' || echo '$(srcdir)/'`orccpu-arm.c + + mostlyclean-libtool: + -rm -f *.lo +@@ -629,37 +660,43 @@ + install-nodist_pkgincludeHEADERS: $(nodist_pkginclude_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" +- @list='$(nodist_pkginclude_HEADERS)'; for p in $$list; do \ ++ @list='$(nodist_pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ ++ for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(nodist_pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ +- $(nodist_pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \ ++ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \ + done + + uninstall-nodist_pkgincludeHEADERS: + @$(NORMAL_UNINSTALL) +- @list='$(nodist_pkginclude_HEADERS)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ +- done ++ @list='$(nodist_pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ test -n "$$files" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files + install-pkgincludeHEADERS: $(pkginclude_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" +- @list='$(pkginclude_HEADERS)'; for p in $$list; do \ ++ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ ++ for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ +- $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \ ++ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \ + done + + uninstall-pkgincludeHEADERS: + @$(NORMAL_UNINSTALL) +- @list='$(pkginclude_HEADERS)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ +- done ++ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ test -n "$$files" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +@@ -673,7 +710,7 @@ + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -681,29 +718,34 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ + fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -724,13 +766,17 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -761,6 +807,7 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + + maintainer-clean-generic: +@@ -783,6 +830,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -792,18 +841,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: install-libLTLIBRARIES + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -850,6 +909,7 @@ + orcfunctions: + $(top_builddir)/tools/orcc$(EXEEXT) --implementation -o orcfunctions.c orcfunctions.orc + $(top_builddir)/tools/orcc$(EXEEXT) --header -o orcfunctions.h orcfunctions.orc ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/orc-float/Makefile.in orc-0.4.3/orc-float/Makefile.in +--- orc-0.4.3.old/orc-float/Makefile.in 2009-12-14 02:20:11.000000000 +0100 ++++ orc-0.4.3/orc-float/Makefile.in 2010-02-02 12:18:14.587377512 +0100 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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. +@@ -18,6 +19,7 @@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -50,14 +52,29 @@ + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; + am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)" +-libLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(lib_LTLIBRARIES) + am__DEPENDENCIES_1 = + liborc_float_@ORC_MAJORMINOR@_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +@@ -73,6 +90,7 @@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles ++am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +@@ -84,7 +102,6 @@ + $(LDFLAGS) -o $@ + SOURCES = $(liborc_float_@ORC_MAJORMINOR@_la_SOURCES) + DIST_SOURCES = $(liborc_float_@ORC_MAJORMINOR@_la_SOURCES) +-pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) + HEADERS = $(pkginclude_HEADERS) + ETAGS = etags + CTAGS = ctags +@@ -156,6 +173,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +@@ -244,9 +262,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu orc-float/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu orc-float/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu orc-float/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu orc-float/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -264,23 +282,28 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ ++ list2=; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ ++ list2="$$list2 $$p"; \ + else :; fi; \ +- done ++ done; \ ++ test -z "$$list2" || { \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ ++ } + + uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ ++ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ ++ for p in $$list; do \ ++ $(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + + clean-libLTLIBRARIES: +@@ -305,38 +328,38 @@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + liborc_float_@ORC_MAJORMINOR@_la-orcfloat.lo: orcfloat.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_float_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_float_@ORC_MAJORMINOR@_la-orcfloat.lo -MD -MP -MF $(DEPDIR)/liborc_float_@ORC_MAJORMINOR@_la-orcfloat.Tpo -c -o liborc_float_@ORC_MAJORMINOR@_la-orcfloat.lo `test -f 'orcfloat.c' || echo '$(srcdir)/'`orcfloat.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_float_@ORC_MAJORMINOR@_la-orcfloat.Tpo $(DEPDIR)/liborc_float_@ORC_MAJORMINOR@_la-orcfloat.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_float_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_float_@ORC_MAJORMINOR@_la-orcfloat.lo -MD -MP -MF $(DEPDIR)/liborc_float_@ORC_MAJORMINOR@_la-orcfloat.Tpo -c -o liborc_float_@ORC_MAJORMINOR@_la-orcfloat.lo `test -f 'orcfloat.c' || echo '$(srcdir)/'`orcfloat.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_float_@ORC_MAJORMINOR@_la-orcfloat.Tpo $(DEPDIR)/liborc_float_@ORC_MAJORMINOR@_la-orcfloat.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcfloat.c' object='liborc_float_@ORC_MAJORMINOR@_la-orcfloat.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_float_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_float_@ORC_MAJORMINOR@_la-orcfloat.lo `test -f 'orcfloat.c' || echo '$(srcdir)/'`orcfloat.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_float_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_float_@ORC_MAJORMINOR@_la-orcfloat.lo `test -f 'orcfloat.c' || echo '$(srcdir)/'`orcfloat.c + + liborc_float_@ORC_MAJORMINOR@_la-orcfloat-sse.lo: orcfloat-sse.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_float_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_float_@ORC_MAJORMINOR@_la-orcfloat-sse.lo -MD -MP -MF $(DEPDIR)/liborc_float_@ORC_MAJORMINOR@_la-orcfloat-sse.Tpo -c -o liborc_float_@ORC_MAJORMINOR@_la-orcfloat-sse.lo `test -f 'orcfloat-sse.c' || echo '$(srcdir)/'`orcfloat-sse.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_float_@ORC_MAJORMINOR@_la-orcfloat-sse.Tpo $(DEPDIR)/liborc_float_@ORC_MAJORMINOR@_la-orcfloat-sse.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_float_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_float_@ORC_MAJORMINOR@_la-orcfloat-sse.lo -MD -MP -MF $(DEPDIR)/liborc_float_@ORC_MAJORMINOR@_la-orcfloat-sse.Tpo -c -o liborc_float_@ORC_MAJORMINOR@_la-orcfloat-sse.lo `test -f 'orcfloat-sse.c' || echo '$(srcdir)/'`orcfloat-sse.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_float_@ORC_MAJORMINOR@_la-orcfloat-sse.Tpo $(DEPDIR)/liborc_float_@ORC_MAJORMINOR@_la-orcfloat-sse.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcfloat-sse.c' object='liborc_float_@ORC_MAJORMINOR@_la-orcfloat-sse.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_float_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_float_@ORC_MAJORMINOR@_la-orcfloat-sse.lo `test -f 'orcfloat-sse.c' || echo '$(srcdir)/'`orcfloat-sse.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_float_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_float_@ORC_MAJORMINOR@_la-orcfloat-sse.lo `test -f 'orcfloat-sse.c' || echo '$(srcdir)/'`orcfloat-sse.c + + mostlyclean-libtool: + -rm -f *.lo +@@ -346,20 +369,23 @@ + install-pkgincludeHEADERS: $(pkginclude_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" +- @list='$(pkginclude_HEADERS)'; for p in $$list; do \ ++ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ ++ for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ +- $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \ ++ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \ + done + + uninstall-pkgincludeHEADERS: + @$(NORMAL_UNINSTALL) +- @list='$(pkginclude_HEADERS)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ +- done ++ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ test -n "$$files" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +@@ -373,7 +399,7 @@ + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -381,29 +407,34 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ + fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -424,13 +455,17 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -461,6 +496,7 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -482,6 +518,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -490,18 +528,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: install-libLTLIBRARIES + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -541,6 +589,7 @@ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-libLTLIBRARIES uninstall-pkgincludeHEADERS + ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/orc-pixel/Makefile.in orc-0.4.3/orc-pixel/Makefile.in +--- orc-0.4.3.old/orc-pixel/Makefile.in 2009-12-14 02:20:11.000000000 +0100 ++++ orc-0.4.3/orc-pixel/Makefile.in 2010-02-02 12:18:14.651377550 +0100 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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. +@@ -18,6 +19,7 @@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -50,14 +52,29 @@ + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; + am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)" +-libLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(lib_LTLIBRARIES) + am__DEPENDENCIES_1 = + liborc_pixel_@ORC_MAJORMINOR@_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +@@ -73,6 +90,7 @@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles ++am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +@@ -84,7 +102,6 @@ + $(LDFLAGS) -o $@ + SOURCES = $(liborc_pixel_@ORC_MAJORMINOR@_la_SOURCES) + DIST_SOURCES = $(liborc_pixel_@ORC_MAJORMINOR@_la_SOURCES) +-pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) + HEADERS = $(pkginclude_HEADERS) + ETAGS = etags + CTAGS = ctags +@@ -156,6 +173,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +@@ -244,9 +262,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu orc-pixel/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu orc-pixel/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu orc-pixel/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu orc-pixel/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -264,23 +282,28 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ ++ list2=; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ ++ list2="$$list2 $$p"; \ + else :; fi; \ +- done ++ done; \ ++ test -z "$$list2" || { \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ ++ } + + uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ ++ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ ++ for p in $$list; do \ ++ $(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + + clean-libLTLIBRARIES: +@@ -305,38 +328,38 @@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel.lo: orcpixel.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_pixel_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel.lo -MD -MP -MF $(DEPDIR)/liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel.Tpo -c -o liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel.lo `test -f 'orcpixel.c' || echo '$(srcdir)/'`orcpixel.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel.Tpo $(DEPDIR)/liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_pixel_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel.lo -MD -MP -MF $(DEPDIR)/liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel.Tpo -c -o liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel.lo `test -f 'orcpixel.c' || echo '$(srcdir)/'`orcpixel.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel.Tpo $(DEPDIR)/liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcpixel.c' object='liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_pixel_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel.lo `test -f 'orcpixel.c' || echo '$(srcdir)/'`orcpixel.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_pixel_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel.lo `test -f 'orcpixel.c' || echo '$(srcdir)/'`orcpixel.c + + liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel-sse.lo: orcpixel-sse.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_pixel_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel-sse.lo -MD -MP -MF $(DEPDIR)/liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel-sse.Tpo -c -o liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel-sse.lo `test -f 'orcpixel-sse.c' || echo '$(srcdir)/'`orcpixel-sse.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel-sse.Tpo $(DEPDIR)/liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel-sse.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_pixel_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel-sse.lo -MD -MP -MF $(DEPDIR)/liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel-sse.Tpo -c -o liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel-sse.lo `test -f 'orcpixel-sse.c' || echo '$(srcdir)/'`orcpixel-sse.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel-sse.Tpo $(DEPDIR)/liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel-sse.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcpixel-sse.c' object='liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel-sse.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_pixel_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel-sse.lo `test -f 'orcpixel-sse.c' || echo '$(srcdir)/'`orcpixel-sse.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_pixel_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_pixel_@ORC_MAJORMINOR@_la-orcpixel-sse.lo `test -f 'orcpixel-sse.c' || echo '$(srcdir)/'`orcpixel-sse.c + + mostlyclean-libtool: + -rm -f *.lo +@@ -346,20 +369,23 @@ + install-pkgincludeHEADERS: $(pkginclude_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" +- @list='$(pkginclude_HEADERS)'; for p in $$list; do \ ++ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ ++ for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ +- $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \ ++ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \ + done + + uninstall-pkgincludeHEADERS: + @$(NORMAL_UNINSTALL) +- @list='$(pkginclude_HEADERS)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ +- done ++ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ test -n "$$files" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +@@ -373,7 +399,7 @@ + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -381,29 +407,34 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ + fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -424,13 +455,17 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -461,6 +496,7 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -482,6 +518,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -490,18 +528,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: install-libLTLIBRARIES + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -541,6 +589,7 @@ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-libLTLIBRARIES uninstall-pkgincludeHEADERS + ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/orc-test/Makefile.in orc-0.4.3/orc-test/Makefile.in +--- orc-0.4.3.old/orc-test/Makefile.in 2009-12-14 02:20:11.000000000 +0100 ++++ orc-0.4.3/orc-test/Makefile.in 2010-02-02 12:18:14.723377766 +0100 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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. +@@ -18,6 +19,7 @@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -50,14 +52,29 @@ + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; + am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)" +-libLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(lib_LTLIBRARIES) + am__DEPENDENCIES_1 = + liborc_test_@ORC_MAJORMINOR@_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +@@ -75,6 +92,7 @@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles ++am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +@@ -86,7 +104,6 @@ + $(LDFLAGS) -o $@ + SOURCES = $(liborc_test_@ORC_MAJORMINOR@_la_SOURCES) + DIST_SOURCES = $(liborc_test_@ORC_MAJORMINOR@_la_SOURCES) +-pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) + HEADERS = $(pkginclude_HEADERS) + ETAGS = etags + CTAGS = ctags +@@ -158,6 +175,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +@@ -254,9 +272,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu orc-test/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu orc-test/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu orc-test/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu orc-test/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -274,23 +292,28 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ ++ list2=; for p in $$list; do \ + if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ ++ list2="$$list2 $$p"; \ + else :; fi; \ +- done ++ done; \ ++ test -z "$$list2" || { \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ ++ } + + uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ ++ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ ++ for p in $$list; do \ ++ $(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + + clean-libLTLIBRARIES: +@@ -317,52 +340,52 @@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + liborc_test_@ORC_MAJORMINOR@_la-orctest.lo: orctest.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_test_@ORC_MAJORMINOR@_la-orctest.lo -MD -MP -MF $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orctest.Tpo -c -o liborc_test_@ORC_MAJORMINOR@_la-orctest.lo `test -f 'orctest.c' || echo '$(srcdir)/'`orctest.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orctest.Tpo $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orctest.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_test_@ORC_MAJORMINOR@_la-orctest.lo -MD -MP -MF $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orctest.Tpo -c -o liborc_test_@ORC_MAJORMINOR@_la-orctest.lo `test -f 'orctest.c' || echo '$(srcdir)/'`orctest.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orctest.Tpo $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orctest.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orctest.c' object='liborc_test_@ORC_MAJORMINOR@_la-orctest.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_test_@ORC_MAJORMINOR@_la-orctest.lo `test -f 'orctest.c' || echo '$(srcdir)/'`orctest.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_test_@ORC_MAJORMINOR@_la-orctest.lo `test -f 'orctest.c' || echo '$(srcdir)/'`orctest.c + + liborc_test_@ORC_MAJORMINOR@_la-orcarray.lo: orcarray.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_test_@ORC_MAJORMINOR@_la-orcarray.lo -MD -MP -MF $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcarray.Tpo -c -o liborc_test_@ORC_MAJORMINOR@_la-orcarray.lo `test -f 'orcarray.c' || echo '$(srcdir)/'`orcarray.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcarray.Tpo $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcarray.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_test_@ORC_MAJORMINOR@_la-orcarray.lo -MD -MP -MF $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcarray.Tpo -c -o liborc_test_@ORC_MAJORMINOR@_la-orcarray.lo `test -f 'orcarray.c' || echo '$(srcdir)/'`orcarray.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcarray.Tpo $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcarray.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcarray.c' object='liborc_test_@ORC_MAJORMINOR@_la-orcarray.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_test_@ORC_MAJORMINOR@_la-orcarray.lo `test -f 'orcarray.c' || echo '$(srcdir)/'`orcarray.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_test_@ORC_MAJORMINOR@_la-orcarray.lo `test -f 'orcarray.c' || echo '$(srcdir)/'`orcarray.c + + liborc_test_@ORC_MAJORMINOR@_la-orcrandom.lo: orcrandom.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_test_@ORC_MAJORMINOR@_la-orcrandom.lo -MD -MP -MF $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcrandom.Tpo -c -o liborc_test_@ORC_MAJORMINOR@_la-orcrandom.lo `test -f 'orcrandom.c' || echo '$(srcdir)/'`orcrandom.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcrandom.Tpo $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcrandom.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_test_@ORC_MAJORMINOR@_la-orcrandom.lo -MD -MP -MF $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcrandom.Tpo -c -o liborc_test_@ORC_MAJORMINOR@_la-orcrandom.lo `test -f 'orcrandom.c' || echo '$(srcdir)/'`orcrandom.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcrandom.Tpo $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcrandom.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcrandom.c' object='liborc_test_@ORC_MAJORMINOR@_la-orcrandom.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_test_@ORC_MAJORMINOR@_la-orcrandom.lo `test -f 'orcrandom.c' || echo '$(srcdir)/'`orcrandom.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_test_@ORC_MAJORMINOR@_la-orcrandom.lo `test -f 'orcrandom.c' || echo '$(srcdir)/'`orcrandom.c + + liborc_test_@ORC_MAJORMINOR@_la-orcprofile.lo: orcprofile.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_test_@ORC_MAJORMINOR@_la-orcprofile.lo -MD -MP -MF $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcprofile.Tpo -c -o liborc_test_@ORC_MAJORMINOR@_la-orcprofile.lo `test -f 'orcprofile.c' || echo '$(srcdir)/'`orcprofile.c +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcprofile.Tpo $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcprofile.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT liborc_test_@ORC_MAJORMINOR@_la-orcprofile.lo -MD -MP -MF $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcprofile.Tpo -c -o liborc_test_@ORC_MAJORMINOR@_la-orcprofile.lo `test -f 'orcprofile.c' || echo '$(srcdir)/'`orcprofile.c ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcprofile.Tpo $(DEPDIR)/liborc_test_@ORC_MAJORMINOR@_la-orcprofile.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='orcprofile.c' object='liborc_test_@ORC_MAJORMINOR@_la-orcprofile.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_test_@ORC_MAJORMINOR@_la-orcprofile.lo `test -f 'orcprofile.c' || echo '$(srcdir)/'`orcprofile.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liborc_test_@ORC_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o liborc_test_@ORC_MAJORMINOR@_la-orcprofile.lo `test -f 'orcprofile.c' || echo '$(srcdir)/'`orcprofile.c + + mostlyclean-libtool: + -rm -f *.lo +@@ -372,20 +395,23 @@ + install-pkgincludeHEADERS: $(pkginclude_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" +- @list='$(pkginclude_HEADERS)'; for p in $$list; do \ ++ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ ++ for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ +- $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \ ++ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \ + done + + uninstall-pkgincludeHEADERS: + @$(NORMAL_UNINSTALL) +- @list='$(pkginclude_HEADERS)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ +- rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ +- done ++ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ test -n "$$files" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +@@ -399,7 +425,7 @@ + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -407,29 +433,34 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ + fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -450,13 +481,17 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -487,6 +522,7 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -508,6 +544,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -516,18 +554,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: install-libLTLIBRARIES + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -567,6 +615,7 @@ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-libLTLIBRARIES uninstall-pkgincludeHEADERS + ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/testsuite/Makefile.in orc-0.4.3/testsuite/Makefile.in +--- orc-0.4.3.old/testsuite/Makefile.in 2009-12-14 02:41:53.000000000 +0100 ++++ orc-0.4.3/testsuite/Makefile.in 2010-02-02 12:18:14.971377639 +0100 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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. +@@ -16,8 +17,9 @@ + + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -63,6 +65,7 @@ + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + am__EXEEXT_1 = compile_opcodes_sys_c$(EXEEXT) \ + compile_opcodes_float_c$(EXEEXT) \ + compile_opcodes_pixel_c$(EXEEXT) test_accsadubl$(EXEEXT) \ +@@ -125,6 +128,7 @@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles ++am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +@@ -155,9 +159,39 @@ + ps-recursive uninstall-recursive + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ++AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ ++ distdir + ETAGS = etags + CTAGS = ctags ++am__tty_colors = \ ++red=; grn=; lgn=; blu=; std= + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++am__relativize = \ ++ dir0=`pwd`; \ ++ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ ++ sed_rest='s,^[^/]*/*,,'; \ ++ sed_last='s,^.*/\([^/]*\)$$,\1,'; \ ++ sed_butlast='s,/*[^/]*$$,,'; \ ++ while test -n "$$dir1"; do \ ++ first=`echo "$$dir1" | sed -e "$$sed_first"`; \ ++ if test "$$first" != "."; then \ ++ if test "$$first" = ".."; then \ ++ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ ++ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ ++ else \ ++ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ ++ if test "$$first2" = "$$first"; then \ ++ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ ++ else \ ++ dir2="../$$dir2"; \ ++ fi; \ ++ dir0="$$dir0"/"$$first"; \ ++ fi; \ ++ fi; \ ++ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ ++ done; \ ++ reldir="$$dir2" + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + AMTAR = @AMTAR@ +@@ -224,6 +258,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +@@ -322,9 +357,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu testsuite/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu testsuite/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu testsuite/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu testsuite/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -342,13 +377,16 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + + clean-noinstPROGRAMS: +- @list='$(noinst_PROGRAMS)'; for p in $$list; do \ +- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f $$p $$f"; \ +- rm -f $$p $$f ; \ +- done ++ @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list || exit $$?; \ ++ test -n "$(EXEEXT)" || exit 0; \ ++ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list + compile_opcodes_float$(EXEEXT): $(compile_opcodes_float_OBJECTS) $(compile_opcodes_float_DEPENDENCIES) + @rm -f compile_opcodes_float$(EXEEXT) + $(LINK) $(compile_opcodes_float_OBJECTS) $(compile_opcodes_float_LDADD) $(LIBS) +@@ -419,21 +457,21 @@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@@ -451,7 +489,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -468,7 +506,7 @@ + else \ + local_target="$$target"; \ + fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ +@@ -476,7 +514,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -502,16 +540,16 @@ + else \ + local_target="$$target"; \ + fi; \ +- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +@@ -526,7 +564,7 @@ + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +@@ -538,7 +576,7 @@ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ +- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ ++ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +@@ -547,29 +585,34 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ + fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -578,6 +621,7 @@ + @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ ++ $(am__tty_colors); \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ +@@ -589,10 +633,10 @@ + *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ +- echo "XPASS: $$tst"; \ ++ col=$$red; res=XPASS; \ + ;; \ + *) \ +- echo "PASS: $$tst"; \ ++ col=$$grn; res=PASS; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ +@@ -600,17 +644,18 @@ + case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ +- echo "XFAIL: $$tst"; \ ++ col=$$lgn; res=XFAIL; \ + ;; \ + *) \ + failed=`expr $$failed + 1`; \ +- echo "FAIL: $$tst"; \ ++ col=$$red; res=FAIL; \ + ;; \ + esac; \ + else \ + skip=`expr $$skip + 1`; \ +- echo "SKIP: $$tst"; \ ++ col=$$blu; res=SKIP; \ + fi; \ ++ echo "$${col}$$res$${std}: $$tst"; \ + done; \ + if test "$$all" -eq 1; then \ + tests="test"; \ +@@ -652,11 +697,15 @@ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ +- echo "$$dashes"; \ ++ if test "$$failed" -eq 0; then \ ++ echo "$$grn$$dashes"; \ ++ else \ ++ echo "$$red$$dashes"; \ ++ fi; \ + echo "$$banner"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ +- echo "$$dashes"; \ ++ echo "$$dashes$$std"; \ + test "$$failed" -eq 0; \ + else :; fi + +@@ -676,29 +725,44 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ +- distdir=`$(am__cd) $(distdir) && pwd`; \ +- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +- (cd $$subdir && \ ++ fi; \ ++ done ++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ if test "$$subdir" = .; then :; else \ ++ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ ++ $(am__relativize); \ ++ new_distdir=$$reldir; \ ++ dir1=$$subdir; dir2="$(top_distdir)"; \ ++ $(am__relativize); \ ++ new_top_distdir=$$reldir; \ ++ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ ++ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ ++ ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$top_distdir" \ +- distdir="$$distdir/$$subdir" \ ++ top_distdir="$$new_top_distdir" \ ++ distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ ++ am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -730,6 +794,7 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -751,6 +816,8 @@ + + html: html-recursive + ++html-am: ++ + info: info-recursive + + info-am: +@@ -759,18 +826,28 @@ + + install-dvi: install-dvi-recursive + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-recursive + ++install-html-am: ++ + install-info: install-info-recursive + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-recursive + ++install-pdf-am: ++ + install-ps: install-ps-recursive + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -793,8 +870,8 @@ + + uninstall-am: + +-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ +- install-strip ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \ ++ ctags-recursive install-am install-strip tags-recursive + + .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-TESTS check-am clean clean-generic \ +@@ -811,6 +888,7 @@ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am + ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/testsuite/orcc/Makefile.in orc-0.4.3/testsuite/orcc/Makefile.in +--- orc-0.4.3.old/testsuite/orcc/Makefile.in 2009-12-14 02:20:11.000000000 +0100 ++++ orc-0.4.3/testsuite/orcc/Makefile.in 2010-02-02 12:18:15.027377566 +0100 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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. +@@ -16,8 +17,9 @@ + + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -51,6 +53,7 @@ + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + PROGRAMS = $(noinst_PROGRAMS) + orc_test_SOURCES = orc_test.c + orc_test_OBJECTS = orc_test.$(OBJEXT) +@@ -58,6 +61,7 @@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles ++am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +@@ -71,6 +75,8 @@ + DIST_SOURCES = orc_test.c + ETAGS = etags + CTAGS = ctags ++am__tty_colors = \ ++red=; grn=; lgn=; blu=; std= + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +@@ -138,6 +144,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +@@ -218,9 +225,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu testsuite/orcc/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu testsuite/orcc/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu testsuite/orcc/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu testsuite/orcc/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -238,13 +245,16 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + + clean-noinstPROGRAMS: +- @list='$(noinst_PROGRAMS)'; for p in $$list; do \ +- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f $$p $$f"; \ +- rm -f $$p $$f ; \ +- done ++ @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list || exit $$?; \ ++ test -n "$(EXEEXT)" || exit 0; \ ++ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list + orc_test$(EXEEXT): $(orc_test_OBJECTS) $(orc_test_DEPENDENCIES) + @rm -f orc_test$(EXEEXT) + $(LINK) $(orc_test_OBJECTS) $(orc_test_LDADD) $(LIBS) +@@ -259,21 +269,21 @@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@@ -296,7 +306,7 @@ + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -304,29 +314,34 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ + fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -335,6 +350,7 @@ + @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ ++ $(am__tty_colors); \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ +@@ -346,10 +362,10 @@ + *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ +- echo "XPASS: $$tst"; \ ++ col=$$red; res=XPASS; \ + ;; \ + *) \ +- echo "PASS: $$tst"; \ ++ col=$$grn; res=PASS; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ +@@ -357,17 +373,18 @@ + case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ +- echo "XFAIL: $$tst"; \ ++ col=$$lgn; res=XFAIL; \ + ;; \ + *) \ + failed=`expr $$failed + 1`; \ +- echo "FAIL: $$tst"; \ ++ col=$$red; res=FAIL; \ + ;; \ + esac; \ + else \ + skip=`expr $$skip + 1`; \ +- echo "SKIP: $$tst"; \ ++ col=$$blu; res=SKIP; \ + fi; \ ++ echo "$${col}$$res$${std}: $$tst"; \ + done; \ + if test "$$all" -eq 1; then \ + tests="test"; \ +@@ -409,11 +426,15 @@ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ +- echo "$$dashes"; \ ++ if test "$$failed" -eq 0; then \ ++ echo "$$grn$$dashes"; \ ++ else \ ++ echo "$$red$$dashes"; \ ++ fi; \ + echo "$$banner"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ +- echo "$$dashes"; \ ++ echo "$$dashes$$std"; \ + test "$$failed" -eq 0; \ + else :; fi + +@@ -433,13 +454,17 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -471,6 +496,7 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -493,6 +519,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -501,18 +529,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -535,7 +573,7 @@ + + uninstall-am: + +-.MAKE: install-am install-strip ++.MAKE: all check check-am install install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ + clean-generic clean-libtool clean-noinstPROGRAMS ctags \ +@@ -556,6 +594,7 @@ + $(top_builddir)/tools/orcc$(EXEEXT) --header -o testorc.h test.orc + $(top_builddir)/tools/orcc$(EXEEXT) --implementation -o testorc.c test.orc + $(top_builddir)/tools/orcc$(EXEEXT) --test -o orc_test.c test.orc ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -x'*config.sub' -x'*config.guess' -Naur orc-0.4.3.old/tools/Makefile.in orc-0.4.3/tools/Makefile.in +--- orc-0.4.3.old/tools/Makefile.in 2009-12-14 02:20:11.000000000 +0100 ++++ orc-0.4.3/tools/Makefile.in 2010-02-02 12:18:15.079377682 +0100 +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.2 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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. +@@ -16,8 +17,9 @@ + + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -50,8 +52,8 @@ + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = + am__installdirs = "$(DESTDIR)$(bindir)" +-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + PROGRAMS = $(bin_PROGRAMS) + orcc_SOURCES = orcc.c + orcc_OBJECTS = orcc.$(OBJEXT) +@@ -62,6 +64,7 @@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles ++am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +@@ -142,6 +145,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +@@ -221,9 +225,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu tools/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu tools/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -241,34 +245,50 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_PROGRAMS)'; for p in $$list; do \ +- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- if test -f $$p \ +- || test -f $$p1 \ +- ; then \ +- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ +- else :; fi; \ +- done ++ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed 's/$(EXEEXT)$$//' | \ ++ while read p p1; do if test -f $$p || test -f $$p1; \ ++ then echo "$$p"; echo "$$p"; else :; fi; \ ++ done | \ ++ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ ++ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ ++ sed 'N;N;N;s,\n, ,g' | \ ++ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ ++ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ ++ if ($$2 == $$4) files[d] = files[d] " " $$1; \ ++ else { print "f", $$3 "/" $$4, $$1; } } \ ++ END { for (d in files) print "f", d, files[d] }' | \ ++ while read type dir files; do \ ++ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ ++ test -z "$$files" || { \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ ++ } \ ++ ; done + + uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) +- @list='$(bin_PROGRAMS)'; for p in $$list; do \ +- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ +- rm -f "$(DESTDIR)$(bindir)/$$f"; \ +- done ++ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ ++ files=`for p in $$list; do echo "$$p"; done | \ ++ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ ++ -e 's/$$/$(EXEEXT)/' `; \ ++ test -n "$$list" || exit 0; \ ++ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(bindir)" && rm -f $$files + + clean-binPROGRAMS: +- @list='$(bin_PROGRAMS)'; for p in $$list; do \ +- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f $$p $$f"; \ +- rm -f $$p $$f ; \ +- done ++ @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list || exit $$?; \ ++ test -n "$(EXEEXT)" || exit 0; \ ++ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f" $$list; \ ++ rm -f $$list + orcc$(EXEEXT): $(orcc_OBJECTS) $(orcc_DEPENDENCIES) + @rm -f orcc$(EXEEXT) + $(LINK) $(orcc_OBJECTS) $(orcc_LDADD) $(LIBS) +@@ -283,21 +303,21 @@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@@ -320,7 +340,7 @@ + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ ++ set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -328,29 +348,34 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ shift; \ ++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ ++ if test $$# -gt 0; then \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ "$$@" $$unique; \ ++ else \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$unique; \ ++ fi; \ + fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique ++ $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here ++ && $(am__cd) $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) "$$here" + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -371,13 +396,17 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +@@ -408,6 +437,7 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -428,6 +458,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -436,18 +468,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: install-binPROGRAMS + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -486,6 +528,7 @@ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-binPROGRAMS + ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/recipes/orc/orc.inc b/recipes/orc/orc.inc new file mode 100644 index 0000000000..7d48806c0e --- /dev/null +++ b/recipes/orc/orc.inc @@ -0,0 +1,18 @@ +DESCRIPTION = "orc - The Oil Runtime Compiler" +HOMEPAGE = "http://code.entropywave.com/projects/orc/" + +SRC_URI = "http://code.entropywave.com/download/orc/orc-${PV}.tar.gz;name=orc" + +inherit autotools pkgconfig + +BBCLASSEXTEND = "native" + +PACKAGES =+ "orc-examples" +FILES_orc-examples = "${libdir}/orc/*" +FILES_${PN} = "${bindir}/*" + +python populate_packages_prepend () { + libdir = bb.data.expand('${libdir}', d) + do_split_packages(d, libdir, '^lib(.*)\.so\.*', 'lib%s', 'ORC %s library', extra_depends='', allow_links=True) +} + diff --git a/recipes/orc/orc_0.4.3.bb b/recipes/orc/orc_0.4.3.bb new file mode 100644 index 0000000000..6da5789e5e --- /dev/null +++ b/recipes/orc/orc_0.4.3.bb @@ -0,0 +1,11 @@ +require orc.inc + +PR = "r1" + +SRC_URI[orc.md5sum] = "9b2e7030c8df8a0d371115869fe5685a" +SRC_URI[orc.sha256sum] = "4c0266d81da67fef0b2abd5e624a9ab0db5de04eb23c3ab24e22f5f9ceeefbfe" + +SRC_URI += "file://03_orcutils.patch;patch=1 \ + file://99_autoreconf.patch;patch=1" + + diff --git a/recipes/orinoco/spectrum-fw.bb b/recipes/orinoco/spectrum-fw.bb index cedb0e35fe..66ec16ed83 100644 --- a/recipes/orinoco/spectrum-fw.bb +++ b/recipes/orinoco/spectrum-fw.bb @@ -1,9 +1,10 @@ DESCRIPTION = "Firmware for Spectrum Wireless LAN cards" -do_unpack[depends] += "unzip-native:do_populate_staging" +DEPENDS += " unzip-native " LICENSE = "unknown" -PR = "r1" +PR = "r2" -SRC_URI = "file://get_symbol_fw \ +SRC_URI = "ftp://symstore.longisland.com/Symstore/services_download/wirless_prod/MC&DriverOnlyInstallers.zip;name=zip \ + file://get_symbol_fw \ file://parse_symbol_fw" S = "${WORKDIR}" @@ -19,3 +20,6 @@ do_install() { PACKAGE_ARCH = "all" FILES_${PN} += "${base_libdir}/firmware/symbol*" + +SRC_URI[zip.md5sum] = "48ad5e824af83d4d7a38ef0a3eab0c3b" +SRC_URI[zip.sha256sum] = "c4a960651f91e4485bb74770ab8611fc6b03a677c69d7256422bc56604624982" diff --git a/recipes/orinoco/spectrum-fw/get_symbol_fw b/recipes/orinoco/spectrum-fw/get_symbol_fw index e7b0bf2d44..80420b01a8 100755 --- a/recipes/orinoco/spectrum-fw/get_symbol_fw +++ b/recipes/orinoco/spectrum-fw/get_symbol_fw @@ -15,29 +15,15 @@ set -e -URL_BASE='ftp://symstore.longisland.com/Symstore/services_download/wirless_prod/' -DL_FILE='MC&DriverOnlyInstallers.zip' DL_INT1='S24DRVR392B67-01.exe' DL_INT2='Driver Only Installer/NetWLan5.sys' DRIVER1=symbol1.drv DRIVER2=symbol2.drv -get_file() { - curl --remote-name "$1" || \ - wget --passive-ftp "$1" || \ - wget "$1" || \ - ftp "$1" </dev/null || \ - exit 1 -} - -if ! test -f $DL_FILE; then - get_file $URL_BASE/$DL_FILE -fi - -unzip -p $DL_FILE "$DL_INT1" >$DRIVER1 -unzip -p $DRIVER1 "$DL_INT2" >$DRIVER2 - +unzip -p $DL_INT1 "$DL_INT2" >$DRIVER2 + perl parse_symbol_fw $DRIVER2 spectrum_fw.h symbol_sp24t_prim_fw \ symbol_sp24t_sec_fw -rm -f $DRIVER1 $DRIVER2
\ No newline at end of file +rm -f $DRIVER1 $DRIVER2 + diff --git a/recipes/pointercal/files/htc-msm7/pointercal b/recipes/pointercal/files/htc-msm7/pointercal new file mode 100644 index 0000000000..1eaf01013a --- /dev/null +++ b/recipes/pointercal/files/htc-msm7/pointercal @@ -0,0 +1 @@ +5881 -59 243084 -214 5990 -70204 65536 diff --git a/recipes/pointercal/pointercal_0.0.bb b/recipes/pointercal/pointercal_0.0.bb index dfe5863726..d98a78f66e 100644 --- a/recipes/pointercal/pointercal_0.0.bb +++ b/recipes/pointercal/pointercal_0.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Touchscreen calibration data" SECTION = "base" -PR = "r19" +PR = "r20" SRC_URI = "file://pointercal" S = "${WORKDIR}" diff --git a/recipes/procps/procps-3.1.15/install.patch b/recipes/procps/procps-3.1.15/install.patch deleted file mode 100644 index 2d16c26f17..0000000000 --- a/recipes/procps/procps-3.1.15/install.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- procps-3.1.15/Makefile~install 2003-12-24 03:01:55.000000000 +0100 -+++ procps-3.1.15/Makefile 2004-02-11 00:45:59.000000000 +0100 -@@ -147,7 +147,7 @@ - ###### install - - $(BINFILES) : all -- $(install) --mode a=rx --strip $(notdir $@) $@ -+ $(install) --mode a=rx $(notdir $@) $@ - - $(MANFILES) : all - $(install) --mode a=r $(notdir $@) $@ diff --git a/recipes/procps/procps-3.1.15/procps_3.1.15-2.diff b/recipes/procps/procps-3.1.15/procps_3.1.15-2.diff deleted file mode 100644 index 438fd0f664..0000000000 --- a/recipes/procps/procps-3.1.15/procps_3.1.15-2.diff +++ /dev/null @@ -1,5133 +0,0 @@ ---- procps-3.1.15.orig/proc/library.map -+++ procps-3.1.15/proc/library.map -@@ -4,7 +4,7 @@ - - readproc; readtask; readproctab; readproctab2; look_up_our_self; escape_command; - escape_str; escape_strlist; -- openproc; closeproc; -+ openproc; closeproc; freeproc; - tty_to_dev; dev_to_tty; open_psdb_message; open_psdb; wchan; - display_version; procps_version; linux_version_code; - Hertz; smp_num_cpus; ---- procps-3.1.15.orig/proc/readproc.c -+++ procps-3.1.15/proc/readproc.c -@@ -162,7 +162,7 @@ - // examine a field name (hash and compare) - base: - if(unlikely(!*S)) break; -- entry = table[63 & (asso[S[3]] + asso[S[2]] + asso[S[0]])]; -+ entry = table[63 & (asso[(int)S[3]] + asso[(int)S[2]] + asso[(int)S[0]])]; - colon = strchr(S, ':'); - if(unlikely(!colon)) break; - if(unlikely(colon[1]!='\t')) break; -@@ -888,6 +888,8 @@ - else - PT = openproc(flags); - va_end(ap); -+ if (!PT) -+ return 0; - do { /* read table: */ - tab = xrealloc(tab, (n+1)*sizeof(proc_t*));/* realloc as we go, using */ - tab[n] = readproc_direct(PT, NULL); /* final null to terminate */ ---- procps-3.1.15.orig/proc/module.mk -+++ procps-3.1.15/proc/module.mk -@@ -3,7 +3,7 @@ - # for lib$(NAME).so and /usr/include/($NAME) and such - NAME := proc - --SHARED := 1 -+SHARED ?= 1 - - SONAME := lib$(NAME).so.$(LIBVERSION) - ---- procps-3.1.15.orig/debian/README.Debian -+++ procps-3.1.15/debian/README.Debian -@@ -0,0 +1,22 @@ -+README for Debian package of procps -+=================================== -+ -+XConsole gone -+------------- -+ XConsole and other X-based programs have been finally removed. Look in -+ the x packages for their equivalents. -+ -+pgrep -+----- -+pgrep is a new program, using the Unix standard name for something that -+greps for processes. If you are looking for Perl compatible regular -+expression grep, it is called pcregrep. -+ -+forks -+----- -+Procps upstream is forked. This one comes from procps.sf.net I'm really -+not interested when the others have new versions so please don't bug me about -+it. However if you see something neat in the others and would like it in -+the Debian one, report a *wishlist* level bug about it. -+ -+ Craig Small <csmall@debian.org> ---- procps-3.1.15.orig/debian/copyright -+++ procps-3.1.15/debian/copyright -@@ -0,0 +1,27 @@ -+This is the Debian Linux prepackaged version of the /proc file -+system utilities. -+ -+This package was downloaded from: -+ http://procps.sourceforge.net/ -+ -+ -+Upstream Authors: -+Werner Almesberger <almesber@di.epfl.ch>, Roger Binns, Charles -+Blake <cblake@ucsd.edu>, Brian Edmonds, David Engel <david@ods.com>, -+Larry Greenfield <greenfie@gauss.rutgers.edu>, Michael K. Johnson -+<johnsonm@sunsite.unc.edu>, Branko Lankester <lankeste@fwi.uva.nl>, -+Robert Nation <nation@rocket.sanders.lockheed.com>, Michael Shields -+<mjshield@nyx.cs.du.edu>, Henry Ware <al172@yfn.ysu.edu>, Matt -+Welsh <mdw@sunsite.unc.edu>, Albert D. Cahalan and Jim C. Warner -+<warnerjc@worldnet.att.net> -+ -+All programs except ps, skill and snice are copyright by their -+authors and redistributable under the terms of the GNU General -+Public License. On Debian Linux systems, the complete text of -+the GNU General Public License can be found in -+`/usr/share/common-licenses/GPL'. -+ -+ps, skill and snice are copyright by their authors and redistributable under -+the terms of the GNU Library General Public License. On Debian Linux -+systems, the complete text of the GNU Library General Public License can -+be found in `/usr/share/common/licenses/LGPL'. ---- procps-3.1.15.orig/debian/dirs -+++ procps-3.1.15/debian/dirs -@@ -0,0 +1,12 @@ -+etc -+lib -+sbin -+bin -+usr/bin -+usr/sbin -+usr/lib -+usr/include/proc -+usr/share/man/man1 -+usr/share/man/man5 -+usr/share/man/man8 -+ ---- procps-3.1.15.orig/debian/docs -+++ procps-3.1.15/debian/docs -@@ -0,0 +1,4 @@ -+BUGS -+TODO -+README.top -+ ---- procps-3.1.15.orig/debian/examples -+++ procps-3.1.15/debian/examples -@@ -0,0 +1,2 @@ -+debian/sysctl.conf -+ ---- procps-3.1.15.orig/debian/libproc-dev.dirs -+++ procps-3.1.15/debian/libproc-dev.dirs -@@ -0,0 +1,2 @@ -+usr/lib -+usr/include/proc ---- procps-3.1.15.orig/debian/menu -+++ procps-3.1.15/debian/menu -@@ -0,0 +1 @@ -+?package(procps):needs=text section="Apps/System" title="Top" command="/usr/bin/top" hints="Monitoring" ---- procps-3.1.15.orig/debian/postinst -+++ procps-3.1.15/debian/postinst -@@ -0,0 +1,74 @@ -+#!/bin/sh -+# postinst script for procps -+# -+# see: dh_installdeb(1) -+ -+set -e -+ -+# summary of how this script can be called: -+# * <postinst> `configure' <most-recently-configured-version> -+# * <old-postinst> `abort-upgrade' <new version> -+# * <conflictor's-postinst> `abort-remove' `in-favour' <package> -+# <new-version> -+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' -+# <failed-install-package> <version> `removing' -+# <conflicting-package> <version> -+# for details, see http://www.debian.org/doc/debian-policy/ or -+# the debian-policy package -+# -+# quoting from the policy: -+# Any necessary prompting should almost always be confined to the -+# post-installation script, and should be protected with a conditional -+# so that unnecessary prompting doesn't happen if a package's -+# installation fails and the `postinst' is called with `abort-upgrade', -+# `abort-remove' or `abort-deconfigure'. -+ -+case "$1" in -+ configure) -+ if [ -e /etc/psdevtab ] ; then -+ rm -f /etc/psdevtab -+ fi -+ if [ -e /etc/psdatabase ] -+ then -+ rm -f /etc/psdatabase -+ fi -+ # Remove old /etc/init.d/procps file, Bug #53818 -+ if [ -e /etc/init.d/procps ] -+ then -+ rm -f /etc/init.d/procps -+ fi -+ # Remove old procps init.d script, if it exists Closes: #55137 -+ if [ -e /etc/rcS.d/S30procps ] -+ then -+ update-rc.d procps remove >/dev/null -+ fi -+ # and if that didn't work Closes: #92184 -+ if [ -e /etc/rcS.d/S30procps ] -+ then -+ rm -f /etc/rcS.d/S30procps -+ fi -+ # -+ # Now to do the alternatives for w and ps -+ update-alternatives --install /usr/bin/w w /usr/bin/w.procps 50 \ -+ --slave /usr/share/man/man1/w.1.gz w.1.gz /usr/share/man/man1/w.procps.1.gz -+ -+ ;; -+ -+ abort-upgrade|abort-remove|abort-deconfigure) -+ -+ ;; -+ -+ *) -+ echo "postinst called with unknown argument \`$1'" >&2 -+ exit 1 -+ ;; -+esac -+ -+# dh_installdeb will replace this with shell code automatically -+# generated by other debhelper scripts. -+ -+#DEBHELPER# -+ -+exit 0 -+ -+ ---- procps-3.1.15.orig/debian/prerm -+++ procps-3.1.15/debian/prerm -@@ -0,0 +1,11 @@ -+#!/bin/sh -+ -+if [ "$1" != "upgrade" ] -+then -+ update-alternatives --remove w /usr/bin/w.procps -+fi -+ -+#DEBHELPER# -+ -+exit 0 -+ ---- procps-3.1.15.orig/debian/sysctl.conf -+++ procps-3.1.15/debian/sysctl.conf -@@ -0,0 +1,6 @@ -+# -+# /etc/sysctl.conf - Configuration file for setting system variables -+# See sysctl.conf (5) for information. -+# -+#kernel.domainname = example.com -+#net/ipv4/icmp_echo_ignore_broadcasts=1 ---- procps-3.1.15.orig/debian/watch -+++ procps-3.1.15/debian/watch -@@ -0,0 +1,6 @@ -+# Example watch control file for uscan -+# Rename this file to "watch" and then you can run the "uscan" command -+# to check for upstream updates and more. -+# Site Directory Pattern Version Script -+sunsite.unc.edu /pub/Linux/Incoming procps-*.tar.gz debian uupdate -+ ---- procps-3.1.15.orig/debian/procps.sh -+++ procps-3.1.15/debian/procps.sh -@@ -0,0 +1,40 @@ -+#! /bin/sh -+# /etc/init.d/procps: Set kernel variables from /etc/sysctl.conf -+# -+# written by Elrond <Elrond@Wunder-Nett.org> -+ -+# Check for existance of the default file and exit if not there, -+# Closes #52839 for the boot-floppy people -+[ -r /etc/default/rcS ] || exit 0 -+. /etc/default/rcS -+ -+[ -x /sbin/sysctl ] || exit 0 -+ -+ -+case "$1" in -+ start|reload|restart|force-reload) -+ if [ ! -r /etc/sysctl.conf ] -+ then -+ exit 0 -+ fi -+ if [ "$VERBOSE" = "no" ] -+ then -+ n="-n" -+ redir=">/dev/null" -+ else -+ echo -n "Setting kernel variables." -+ n="" -+ redir="" -+ fi -+ eval "/sbin/sysctl $n -p $redir" -+ echo "." -+ ;; -+ stop|show) -+ ;; -+ *) -+ echo "Usage: /etc/init.d/procps.sh {start|stop|reload|restart}" >&2 -+ exit 1 -+ ;; -+esac -+ -+ ---- procps-3.1.15.orig/debian/procps.manpages -+++ procps-3.1.15/debian/procps.manpages -@@ -0,0 +1 @@ -+ps/ps.1 ---- procps-3.1.15.orig/debian/compat -+++ procps-3.1.15/debian/compat -@@ -0,0 +1 @@ -+4 ---- procps-3.1.15.orig/debian/libproc-dev.files -+++ procps-3.1.15/debian/libproc-dev.files -@@ -0,0 +1,2 @@ -+usr/include/proc/*.h -+lib/libproc.so ---- procps-3.1.15.orig/debian/libproc-dev.README -+++ procps-3.1.15/debian/libproc-dev.README -@@ -0,0 +1,12 @@ -+README for libproc-dev -+====================== -+ -+This README is for people who want to use the libraries for their own -+programs. If you just want to use procps tools you don't need to use this -+and you can probably remove libproc-dev too. -+ -+It is generally a bad idea to dynamically link to libproc. The API changes -+a fair bit and I cannot guarantee that it will stay the same between minor -+versions (though it will stay the same between Debian versions). I've now -+re-included the libproc.a file so use that. -+ ---- procps-3.1.15.orig/debian/patches/20_procps-fix+attr.dpatch -+++ procps-3.1.15/debian/patches/20_procps-fix+attr.dpatch -@@ -0,0 +1,55 @@ -+#! /bin/sh -e -+## 20_procps-fix++attr by someone -+## -+## All lines beginning with `## DP:' are a description of the patch. -+## DP: SELINUX Attr value in /proc -+ -+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -+patch_opts="${patch_opts:--f --no-backup-if-mismatch}" -+ -+if [ $# -ne 1 ]; then -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" -+ exit 1 -+fi -+case "$1" in -+ -patch) patch $patch_opts -p1 < $0;; -+ -unpatch) patch $patch_opts -p1 -R < $0;; -+ *) -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argum -+ent" -+ exit 1;; -+esac -+ -+exit 0 -+@DPATCH@ -+diff -urN procps-3.1.15/ps/output.c procps-3.1.15.new/ps/output.c -+--- procps-3.1.15/ps/output.c 2003-12-23 19:46:32.000000000 -0600 -++++ procps-3.1.15.new/ps/output.c 2003-12-24 13:31:16.000000000 -0600 -+@@ -944,7 +944,7 @@ -+ -+ // wchan file is suitable for testing -+ //snprintf(filename, sizeof filename, "/proc/%d/task/%d/wchan", pp->tgid, pp->tid); -+- snprintf(filename, sizeof filename, "/proc/%d/task/%d/attr/current", pp->tgid, pp->tid); -++ snprintf(filename, sizeof filename, "/proc/%d/attr/current", pp->tgid); -+ -+ fd = open(filename, O_RDONLY, 0); -+ if(likely(fd==-1)) goto fail; -+diff -urN procps-3.1.15/ps/parser.c procps-3.1.15.new/ps/parser.c -+--- procps-3.1.15/ps/parser.c 2003-12-23 17:58:06.000000000 -0600 -++++ procps-3.1.15.new/ps/parser.c 2003-12-24 13:45:08.000000000 -0600 -+@@ -315,12 +315,10 @@ -+ exclusive("-V"); -+ display_version(); -+ exit(0); -+-#if 0 -+- case 'Z': /* full Mandatory Access Control level info */ -+- trace("-Z shows full MAC info\n"); -+- return "Don't understand MAC on Linux."; -++ case 'Z': -++ trace("-Z shows SELinux contexts\n"); -++ format_flags |= FF_Fc; -+ break; -+-#endif -+ case 'a': -+ trace("-a select all with a tty, but omit session leaders.\n"); -+ simple_select |= SS_U_a; ---- procps-3.1.15.orig/debian/patches/20_ps.1.dpatch -+++ procps-3.1.15/debian/patches/20_ps.1.dpatch -@@ -0,0 +1,376 @@ -+#! /bin/sh -e -+## 20_ps.1.dpatch by Craig Small <csmall@debian.org> -+## -+## All lines beginning with `## DP:' are a description of the patch. -+## DP: Fix ps manual page -+ -+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -+patch_opts="${patch_opts:--f --no-backup-if-mismatch}" -+ -+if [ $# -ne 1 ]; then -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" -+ exit 1 -+fi -+case "$1" in -+ -patch) patch $patch_opts -p1 < $0;; -+ -unpatch) patch $patch_opts -p1 -R < $0;; -+ *) -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argum -+ent" -+ exit 1;; -+esac -+ -+exit 0 -+@DPATCH@ -+--- procps-3.1.15/ps/ps.1 2003-12-24 12:59:47.000000000 +1100 -++++ procps-3.1.15.newps/ps.1 2003-12-26 18:05:01.000000000 +1100 -+@@ -1,3 +1,5 @@ -++'\" t -++.\" (The preceding line is a note to broken versions of man to tell -+ .\" Man page for ps. -+ .\" Quick hack conversion by Albert Cahalan, 1998. -+ .\" Licensed under version 2 of the Gnu General Public License. -+@@ -10,8 +12,8 @@ -+ .\" invented this crap in 1973. Oh yeah, they did. Sorry. -+ .\" -+ .TH PS 1 "July 5, 1998" "Linux" "Linux User's Manual" -+-.SH \fRNAME\fR -+-ps \- report process status -++.SH NAME -++ps \- report a snapshot of the current processes. -+ .ad r -+ .na -+ .ss 12 0 -+@@ -19,17 +21,17 @@ -+ .nh -+ .nf -+ -+-SYNOPSIS -++.SH SYNOPSIS -+ ps [options] -+ -+ -+-DESCRIPTION -++.SH DESCRIPTION -+ ps gives a snapshot of the current processes. If you want -+ a repetitive update of this status, use top. This man -+ page documents the /proc-based version of ps, or tries to. -+ -+ -+-COMMAND-LINE OPTIONS -++.SH "COMMAND-LINE OPTIONS" -+ -+ This version of ps accepts several kinds of options. -+ -+@@ -43,7 +45,9 @@ -+ when options are preceeded by a dash. The PS_PERSONALITY environment -+ variable (described below) provides more detailed control of ps behavior. -+ -+-SIMPLE PROCESS SELECTION -++.SH "SIMPLE PROCESS SELECTION" -++.TS -++l l. -+ -A select all processes -+ -N negate selection -+ -a select all with a tty except session leaders -+@@ -55,8 +59,11 @@ -+ r restrict output to running processes -+ x select processes without controlling ttys -+ --deselect negate selection -++.TE -+ -+-PROCESS SELECTION BY LIST -++.SH "PROCESS SELECTION BY LIST" -++.TS -++l l. -+ -C select by command name -+ -G select by RGID (supports names) -+ -U select by RUID (supports names) -+@@ -78,8 +85,10 @@ -+ --user select by effective user name or ID -+ -123 implied --sid -+ 123 implied --pid -+- -+-OUTPUT FORMAT CONTROL -++.TE -++.SH "OUTPUT FORMAT CONTROL" -++.TS -++l l. -+ -O is preloaded "-o" -+ -F extra full format -+ -c different scheduler info for -l option -+@@ -98,8 +107,10 @@ -+ v display virtual memory format -+ --format user-defined format -+ --context display security context format (NSA SELinux, etc.) -+- -+-OUTPUT MODIFIERS -++.TE -++.SH "OUTPUT MODIFIERS" -++.TS -++l l. -+ -H show process hierarchy (forest) -+ -n set namelist file -+ -w wide output -+@@ -123,31 +134,40 @@ -+ --rows set screen height -+ --sort specify sorting order -+ --width set screen width -+- -+-THREAD DISPLAY -++.TE -++.SH "THREAD DISPLAY" -++.TS -++l l. -+ -L show threads, possibly with LWP and NLWP columns -+ -T show threads, possibly with SPID column -+ -m show threads after processes -+ H show threads as if they were processes -+ m show threads after processes -++.TE -+ -+-INFORMATION -++.SH INFORMATION -++ -++.TS -++l l. -+ -V print version -+ L list all format specifiers -+ V show version info -+ --help print help message -+ --info print debugging info -+ --version print version -++.TE -++ -++.SH OBSOLETE -+ -+-OBSOLETE -++.TS -++l l. -+ A increases the argument space (DecUnix) -+ M use alternate core (try -n or N instead) -+ W get swap info from ... not /dev/drum (try -n or N instead) -+ k use /vmcore as c-dumpfile (try -n or N instead) -+- -+- -+- -+-NOTES -++.TE -++ -++.SH NOTES -+ -+ User-defined format options ("o", "-o", "O", and "-O") offer -+ a way to specify individual output columns. Headers may be -+@@ -249,14 +269,17 @@ -+ will be destroyed by init(8) if the parent process exits. -+ -+ -+-PROCESS FLAGS -+- -++.SH "PROCESS FLAGS" -++.TS -++l l l. -+ FORKNOEXEC 1 forked but didn't exec -+ SUPERPRIV 4 used super-user privileges -++.TE -+ -++.SH "PROCESS STATE CODES" -+ -+-PROCESS STATE CODES -+- -++.TS -++l l. -+ D uninterruptible sleep (usually IO) -+ R runnable (on run queue) -+ S sleeping -+@@ -264,23 +287,30 @@ -+ W paging -+ X dead -+ Z a defunct ("zombie") process -++.TE -+ -+ For BSD formats and when the "stat" keyword is used, additional -+ letters may be displayed: -+ -+-W has no resident pages -+-< high-priority process -+-N low-priority task -+-L has pages locked into memory (for real-time and custom IO) -++.IP W -++has no resident pages -++.IP < -++high-priority process -++.IP N -++low-priority task -++.IP L -++has pages locked into memory (for real-time and custom IO) -+ -+ -+-SORT KEYS -++.SH "SORT KEYS" -+ -+ Note that the values used in sorting are the internal values ps uses and not -+ the `cooked' values used in some of the output format fields. Pipe ps -+ output into the sort(1) command if you want to sort the cooked values. -+ -+-KEY LONG DESCRIPTION -++.TS -++l l l. -++\fBKEY LONG DESCRIPTION\fR -+ c cmd simple name of executable -+ C cmdline full command line -+ f flags flags as in long format F field -+@@ -307,14 +337,15 @@ -+ u user user name -+ v vsize total VM size in kB -+ y priority kernel scheduling priority -++.TE -+ -+- -+-AIX FORMAT DESCRIPTORS -++.SH "AIX FORMAT DESCRIPTORS" -+ -+ This ps supports AIX format descriptors, which work somewhat like the -+ formatting codes of printf(1) and printf(3). For example, the normal -+ default output can be produced with this: ps -eo "%p %y %x %c" -+- -++.TS -++l l l. -+ CODE NORMAL HEADER -+ %C pcpu %CPU -+ %G group GROUP -+@@ -331,14 +362,16 @@ -+ %x time TIME -+ %y tty TTY -+ %z vsz VSZ -++.TE -+ -+- -+-STANDARD FORMAT SPECIFIERS -++.SH "STANDARD FORMAT SPECIFIERS" -+ -+ These may be used to control both output format and sorting. -+ For example: ps -eo pid,user,args --sort user -+ -+-CODE HEADER -++.TS -++l l. -++\fBCODE HEADER\fR -+ %cpu %CPU -+ %mem %MEM -+ alarm ALARM -+@@ -459,25 +492,51 @@ -+ vsize VSZ -+ vsz VSZ -+ wchan WCHAN -++.TE -+ -++.SH "ENVIRONMENT VARIABLES" -+ -+- -+- -+-ENVIRONMENT VARIABLES -+ The following environment variables could affect ps: -+- COLUMNS Override default display width. -+- LINES Override default display height. -+- PS_PERSONALITY Set to one of posix,old,linux,bsd,sun,digital... -+- CMD_ENV Set to one of posix,old,linux,bsd,sun,digital... -+- I_WANT_A_BROKEN_PS Force obsolete command line interpretation. -+- LC_TIME Date format. -+- PS_COLORS Not currently supported. -+- PS_FORMAT Default output format override. -+- PS_SYSMAP Default namelist (System.map) location. -+- PS_SYSTEM_MAP Default namelist (System.map) location. -+- POSIXLY_CORRECT Don't find excuses to ignore bad "features". -+- UNIX95 Don't find excuses to ignore bad "features". -+- _XPG Cancel CMD_ENV=irix non-standard behavior. -++ -++.TP -++.B COLUMNS -++Override default display width. -++.TP -++.B LINES -++Override default display height. -++.TP -++.B PS_PERSONALITY -++Set to one of posix,old,linux,bsd,sun,digital... -++.TP -++.B CMD_ENV -++Set to one of posix,old,linux,bsd,sun,digital... -++.TP -++.B I_WANT_A_BROKEN_PS -++Force obsolete command line interpretation. -++.TP -++.B LC_TIME -++Date format. -++.TP -++.B PS_COLORS -++Not currently supported. -++.TP -++.B PS_FORMAT -++Default output format override. -++.TP -++.B PS_SYSMAP -++Default namelist (System.map) location. -++.TP -++.B PS_SYSTEM_MAP -++Default namelist (System.map) location. -++.TP -++.B POSIXLY_CORRECT -++Don't find excuses to ignore bad "features". -++.TP -++.B UNIX95 -++Don't find excuses to ignore bad "features". -++.TP -++.B _XPG -++Cancel CMD_ENV=irix non-standard behavior. -+ -+ In general, it is a bad idea to set these variables. The one exception -+ is CMD_ENV or PS_PERSONALITY, which could be set to Linux for normal -+@@ -485,7 +544,9 @@ -+ of the Unix98 standard. -+ -+ -+-PERSONALITY -++.SH "PERSONALITY" -++.TS -++l l. -+ 390 like the S/390 OpenEdition ps -+ aix like AIX ps -+ bsd like FreeBSD ps (totally non-standard) -+@@ -507,9 +568,9 @@ -+ unix standard -+ unix95 standard -+ unix98 standard -++.TE -+ -+- -+-EXAMPLES -++.SH "EXAMPLES" -+ To see every process on the system using standard syntax: -+ ps -e -+ To see every process on the system using BSD syntax: -+@@ -523,13 +584,13 @@ -+ Print only the process IDs of syslogd: -+ ps -C syslogd -o pid= -+ -+-SEE ALSO -+-top(1) pgrep(1) pstree(1) proc(5) -++.SH "SEE ALSO" -++.BR top (1), pgrep (1), pstree (1), proc (5). -+ -+-STANDARDS -++.SH STANDARDS -+ This ps conforms to version 2 of the Single Unix Specification. -+ -+-AUTHOR -++.SH AUTHOR -+ ps was originally written by Branko Lankester <lankeste@fwi.uva.nl>. Michael -+ K. Johnson <johnsonm@redhat.com> re-wrote it significantly to use the proc -+ filesystem, changing a few things in the process. Michael Shields -+@@ -541,4 +602,4 @@ -+ <acahalan@cs.uml.edu> rewrote ps for full Unix98 and BSD support, along with -+ some ugly hacks for obsolete and foreign syntax. -+ -+-Please send bug reports to <acahalan@cs.uml.edu> -++Please send bug reports to <procps-feedback@lists.sf.net>. ---- procps-3.1.15.orig/debian/patches/20_top_manpage.dpatch -+++ procps-3.1.15/debian/patches/20_top_manpage.dpatch -@@ -0,0 +1,384 @@ -+#! /bin/sh -e -+## 20_top_manpage by Randy Hron -+## -+## All lines beginning with `## DP:' are a description of the patch. -+## DP: Fix bold in top manual page -+ -+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -+patch_opts="${patch_opts:--f --no-backup-if-mismatch}" -+ -+if [ $# -ne 1 ]; then -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" -+ exit 1 -+fi -+case "$1" in -+ -patch) patch $patch_opts -p1 < $0;; -+ -unpatch) patch $patch_opts -p1 -R < $0;; -+ *) -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argum -+ent" -+ exit 1;; -+esac -+ -+exit 0 -+@DPATCH@ -+--- procps/top.1.orig 2003-12-24 15:51:35.000000000 -0500 -++++ procps/top.1 2003-12-24 18:57:14.564156176 -0500 -+@@ -52,7 +52,7 @@ -+ .ds CF configuration file -+ .ds CI interactive command -+ .ds CO command\-line option -+-.ds CW \'current' window -++.ds CW 'current' window -+ .ds FM full\-screen mode -+ .ds MP \fBphysical\fR memory -+ .ds MS \fBshared\fR memory -+@@ -370,7 +370,7 @@ -+ The task's share of the elapsed \*(PU time since the last screen update, expressed -+ as a percentage of total \*(PU time. -+ In a true SMP environment, if 'Irix mode' is \*F, \*(Me will operate in -+-\'Solaris mode' where a task's \*(Pu usage will be divided by the total -++'Solaris mode' where a task's \*(Pu usage will be divided by the total -+ number of \*(PUs. -+ You toggle 'Irix/Solaris' modes with the 'I' \*(CI. -+ -+@@ -498,7 +498,7 @@ -+ .\" ...................................................................... -+ .SS 2b. SELECTING and ORDERING Columns -+ .\" ---------------------------------------------------------------------- -+-After pressing the \*(CIs 'f' (Fields select) or \'o' (Order fields) you will -++After pressing the \*(CIs 'f' (Fields select) or 'o' (Order fields) you will -+ be shown a screen containing the current \fBfields string\fR followed by names -+ and descriptions for all fields. -+ -+@@ -574,7 +574,7 @@ -+ see current status, -+ -+ .TP 7 -+-\ \ \'\fB?\fR\' or \'\fBh\fR\' :\fIHelp\fR -++\ \ \<\fB?\fR\> or \<\fBh\fR\> :\fIHelp\fR -+ There are two help levels available. -+ The first will provide a reminder of all the basic \*(CIs. -+ If \*(Me is\fI secured\fR, that screen will be abbreviated. -+@@ -583,7 +583,7 @@ -+ applicable to \*(AM. -+ -+ .TP 7 -+-\ \ \'\fB=\fR\' :\fIExit_Task_Limits\fR -++\ \ \<\fB=\fR\> :\fIExit_Task_Limits\fR -+ Removes restrictions on which tasks are shown. -+ This command will reverse any 'i' (idle tasks) and 'n' (max tasks) commands -+ that might be active. -+@@ -593,13 +593,13 @@ -+ When operating in \*(AM this command has a slightly broader meaning. -+ -+ .TP 7 -+-\ \ \'\fBA\fR\' :\fIAlternate_Display_Mode_toggle\fR -++\ \ \<\fBA\fR\> :\fIAlternate_Display_Mode_toggle\fR -+ This command will switch between \*(FM and \*(AM. -+-\*(XT 4. ALTERNATE\-DISPLAY Mode and the 'G' \*(CI for insight into -+-\*(CWs and field groups. -++\*(XT 4. ALTERNATE\-DISPLAY Mode and the 'G' \*(CI for insight -++into \*(CWs and field groups. -+ -+ .TP 7 -+-\ \ \'\fBB\fR\' :\fIBold_Disable/Enable_toggle\fR -++\ \ \<\fBB\fR\> :\fIBold_Disable/Enable_toggle\fR -+ This command will influence use of the 'bold' terminfo capability and -+ alters\fB both\fR the \*(SA and \*(TA for the \*(CW. -+ While it is intended primarily for use with dumb terminals, it can be -+@@ -611,7 +611,7 @@ -+ there will be no visual confirmation that they are even on. -+ -+ .TP 7 -+-*\ \'\fBd\fR\' or \'\fBs\fR\' :\fIChange_Delay_Time_interval\fR -++*\ \<\fBd\fR\> or \<\fBs\fR\> :\fIChange_Delay_Time_interval\fR -+ You will be prompted to enter the delay time, in seconds, between -+ display updates. -+ -+@@ -625,32 +625,32 @@ -+ and view the system summary on the second line. -+ -+ .TP 7 -+-\ \ \'\fBG\fR\' :\fIChoose_Another_Window/Field_Group\fR -++\ \ \<\fBG\fR\> :\fIChoose_Another_Window/Field_Group\fR -+ You will be prompted to enter a number between 1 and 4 designating the -+ window/field group which should be made the \*(CW. -+ You will soon grow comfortable with these 4 windows, especially after -+ experimenting with \*(AM. -+ -+ .TP 7 -+-\ \ \'\fBI\fR\' :\fIIrix/Solaris_Mode_toggle\fR -++\ \ \<\fBI\fR\> :\fIIrix/Solaris_Mode_toggle\fR -+ When operating in 'Solaris mode' ('I' toggled \*F), a task's \*(Pu usage -+ will be divided by the total number of \*(PUs. -+ After issuing this command, you'll be informed of the new state of this toggle. -+ -+ .TP 7 -+-\ \ \'\fBu\fR\' :\fIselect a user\fR -++\ \ \<\fBu\fR\> :\fIselect a user\fR -+ You will be prompted for a UID or username. Only processes -+ belonging to the selected user will be displayed. This option -+ matches on the effective UID. -+ -+ .TP 7 -+-\ \ \'\fBU\fR\' :\fIselect a user\fR -++\ \ \<\fBU\fR\> :\fIselect a user\fR -+ You will be prompted for a UID or username. Only processes -+ belonging to the selected user will be displayed. This option -+ matches on the real, effective, saved, and filesystem UID. -+ -+ .TP 7 -+-*\ \'\fBk\fR\' :\fIKill_a_task\fR -++*\ \<\fBk\fR\> :\fIKill_a_task\fR -+ You will be prompted for a PID and then the signal to send. -+ The default signal, as reflected in the prompt, is SIGTERM. -+ However, you can send any signal, via number or name. -+@@ -661,24 +661,24 @@ -+ 2) at the signal prompt, type 0 -+ -+ .TP 7 -+-\ \ \'\fBq\fR\' :\fIQuit\fR -++\ \ \<\fBq\fR\> :\fIQuit\fR -+ -+ .TP 7 -+-*\ \'\fBr\fR\' :\fIRenice_a_Task\fR -++*\ \<\fBr\fR\> :\fIRenice_a_Task\fR -+ You will be prompted for a PID and then the value to nice it to. -+ Entering a positive value will cause a process to lose priority. -+ Conversely, a negative value will cause a process to be viewed more -+ favorably by the kernel. -+ -+ .TP 7 -+-\ \ \'\fBW\fR\' :\fIWrite_the_Configuration_File\fR -++\ \ \<\fBW\fR\> :\fIWrite_the_Configuration_File\fR -+ This will save all of your options and toggles plus the current -+ display mode and delay time. -+ By issuing this command just before quitting \*(Me, you will be able restart -+ later in exactly that same state. -+ -+ .TP 7 -+-\ \ \'\fBZ\fR\' :\fIChange_Color_Mapping -++\ \ \<\fBZ\fR\> :\fIChange_Color_Mapping -+ This key will take you to a separate screen where you can change the -+ colors for the \*(CW, or for all windows. -+ For details regarding this \*(CI \*(Xt 3d. COLOR Mapping. -+@@ -694,25 +694,25 @@ -+ of messages and prompts. -+ -+ These commands always impact just the \*(CW/field group. -+-\*(XT 4. ALTERNATE\-DISPLAY Mode and the 'G' \*(CI for insight into -+-\*(CWs and field groups. -++\*(XT 4. ALTERNATE\-DISPLAY Mode and the 'G' \*(CI for insight -++into \*(CWs and field groups. -+ -+ .TP 7 -+-\ \ \'\fBl\fR\' :\fIToggle_Load_Average/Uptime\fR \*(EM On/Off -++\ \ \<\fBl\fR\> :\fIToggle_Load_Average/Uptime\fR \*(EM On/Off -+ This is also the line containing the program name (possibly an alias) when -+ operating in \*(FM or the \*(CW name when operating in \*(AM. -+ -+ .TP 7 -+-\ \ \'\fBm\fR\' :\fIToggle_Memory/Swap_Usage\fR \*(EM On/Off -++\ \ \<\fBm\fR\> :\fIToggle_Memory/Swap_Usage\fR \*(EM On/Off -+ This command affects two \*(SA lines. -+ -+ .TP 7 -+-\ \ \'\fBt\fR\' :\fIToggle_Task/Cpu_States\fR \*(EM On/Off -++\ \ \<\fBt\fR\> :\fIToggle_Task/Cpu_States\fR \*(EM On/Off -+ This command affects from 2 to many \*(SA lines, depending on the state -+ of the '1' toggle and whether or not \*(Me is running under true SMP. -+ -+ .TP 7 -+-\ \ \'\fB1\fR\' :\fIToggle_Single/Separate_Cpu_States\fR \*(EM On/Off -++\ \ \<\fB1\fR\> :\fIToggle_Single/Separate_Cpu_States\fR \*(EM On/Off -+ This command affects how the 't' command's Cpu States portion is shown. -+ Although this toggle exists primarily to serve massively-parallel SMP machines, -+ it is not restricted to solely SMP environments. -+@@ -744,12 +744,12 @@ -+ .in -+ -+ .TP 7 -+-\ \ \'\fBb\fR\' :\fIBold/Reverse_toggle\fR -++\ \ \<\fBb\fR\> :\fIBold/Reverse_toggle\fR -+ This command will impact how the 'x' and 'y' toggles are displayed. -+ Further, it will only be available when at least one of those toggles is \*O. -+ -+ .TP 7 -+-\ \ \'\fBx\fR\' :\fIColumn_Highlight_toggle\fR -++\ \ \<\fBx\fR\> :\fIColumn_Highlight_toggle\fR -+ Changes highlighting for the current sort field. -+ You probably don't need a constant visual reminder of the sort field and -+ \*(Me hopes that you always run with 'column highlight' \*F, due to the cost -+@@ -759,7 +759,7 @@ -+ visual reminder. -+ -+ .TP 7 -+-\ \ \'\fBy\fR\' :\fIRow_Highlight_toggle\fR -++\ \ \<\fBy\fR\> :\fIRow_Highlight_toggle\fR -+ Changes highlighting for "running" tasks. -+ For additional insight into this task state, \*(Xt 2a. DESCRIPTIONS of Fields, -+ Process Status. -+@@ -768,7 +768,7 @@ -+ The only costs will be a few additional tty escape sequences. -+ -+ .TP 7 -+-\ \ \'\fBz\fR\' :\fIColor/Monochrome_toggle\fR -++\ \ \<\fBz\fR\> :\fIColor/Monochrome_toggle\fR -+ Switches the \*(CW between your last used color scheme and the older form -+ of black-on-white or white-on-black. -+ This command will alter\fB both\fR the \*(SA and \*(TA but does not affect the -+@@ -779,20 +779,20 @@ -+ .B CONTENT\fR of \*(TW -+ .PD 0 -+ .TP 7 -+-\ \ \'\fBc\fR\' :\fICommand_Line/Program_Name_toggle\fR -++\ \ \<\fBc\fR\> :\fICommand_Line/Program_Name_toggle\fR -+ This command will be honored whether or not the 'Command' column -+ is currently visible. -+ Later, should that field come into view, the change you applied will be seen. -+ -+ .TP 7 -+-\ \ \'\fBf\fR\' and \'\fBo\fR\' :\fIFields_select\fR or \fIOrder_fields\fR -++\ \ \<\fBf\fR\> and \<\fBo\fR\> :\fIFields_select\fR or \fIOrder_fields\fR -+ These keys display separate screens where you can change which -+ fields are displayed and their order. -+ For additional information on these \*(CIs -+ \*(Xt 2b. SELECTING and ORDERING Columns. -+ -+ .TP 7 -+-\ \ \'\fBS\fR\' :\fICumulative_Time_Mode_toggle\fR -++\ \ \<\fBS\fR\> :\fICumulative_Time_Mode_toggle\fR -+ When 'Cumulative mode' is \*O, each process is listed with the \*(Pu -+ time that it and its dead children have used. -+ -+@@ -808,7 +808,7 @@ -+ effect, simply ask for help and view the window summary on the second line. -+ -+ .TP 7 -+-\ \ \'\fBu\fR\' :\fIShow_Specific_User_Only\fR -++\ \ \<\fBu\fR\> :\fIShow_Specific_User_Only\fR -+ You will be prompted to enter the name of the user to display. -+ Thereafter, in that \*(TW only matching User ID's will be shown, or possibly -+ no tasks will be shown. -+@@ -821,7 +821,7 @@ -+ .B SIZE\fR of \*(TW -+ .PD 0 -+ .TP 7 -+-\ \ \'\fBi\fR\' :\fIIdle_Processes_toggle\fR -++\ \ \<\fBi\fR\> :\fIIdle_Processes_toggle\fR -+ Displays all tasks or just active tasks. -+ When this toggle is \*F, idled or zombied processes will not be displayed. -+ -+@@ -829,7 +829,7 @@ -+ affect the window's size, as all prior \*(TDs will have already been painted. -+ -+ .TP 7 -+-\ \ \'\fBn\fR\' or \'#\' :\fISet_Maximum_Tasks\fR -++\ \ \<\fBn\fR\> or \<\fB#\fR\> :\fISet_Maximum_Tasks\fR -+ You will be prompted to enter the number of tasks to display. -+ The lessor of your number and available screen rows will be used. -+ -+@@ -868,12 +868,12 @@ -+ .in -+ -+ .TP 7 -+-\ \ \'\fB<\fR\' :\fIMove_Sort_Field_Left\fR -++\ \ \<\fB<\fR\> :\fIMove_Sort_Field_Left\fR -+ Moves the sort column to the left unless the current sort field is -+ the first field being displayed. -+ -+ .TP 7 -+-\ \ \'\fB>\fR\' :\fIMove_Sort_Field_Right\fR -++\ \ \<\fB>\fR\> :\fIMove_Sort_Field_Right\fR -+ Moves the sort column to the right unless the current sort field is -+ the last field being displayed. -+ -+@@ -884,7 +884,7 @@ -+ .in -+ -+ .TP 7 -+-\ \ \'\fBF\fR\' or \'\fBO\fR\' :\fISelect_Sort_Field\fR -++\ \ \<\fBF\fR\> or \<\fBO\fR\> :\fISelect_Sort_Field\fR -+ These keys display a separate screen where you can change which field -+ is used as the sort column. -+ -+@@ -897,7 +897,7 @@ -+ when running \*(Me with column highlighting turned \*F. -+ -+ .TP 7 -+-\ \ \'\fBR\fR\' :\fIReverse/Normal_Sort_Field_toggle\fR -++\ \ \<\fBR\fR\> :\fIReverse/Normal_Sort_Field_toggle\fR -+ Using this \*(CI you can alternate between high-to-low and low-to-high sorts. -+ -+ .PP -+@@ -974,7 +974,7 @@ -+ .\" ...................................................................... -+ .SS 4b. COMMANDS for Windows -+ .TP 7 -+-\ \ \'\fB-\fR\' and \'\fB_\fR\' :\fIShow/Hide_Window(s)_toggles\fR -++\ \ \<\fB-\fR\> and \<\fB_\fR\> :\fIShow/Hide_Window(s)_toggles\fR -+ The '-' key turns the \*(CW's \*(TD \*O and \*F. -+ When \*O, that \*(TA will show a minimum of the columns header you've -+ established with the 'f' and 'o' commands. -+@@ -988,7 +988,7 @@ -+ as the only display element. -+ -+ .TP 7 -+-*\ \'\fB=\fR\' and \'\fB+\fR\' :\fIEqualize_(re-balance)_Window(s)\fR -++*\ \<\fB=\fR\> and \<\fB+\fR\> :\fIEqualize_(re-balance)_Window(s)\fR -+ The '=' key forces the \*(CW's \*(TD to be visible. -+ It also reverses any 'i' (idle tasks) and 'n' (max tasks) commands that might -+ be active. -+@@ -999,7 +999,7 @@ -+ except for the 'i' (idle tasks) and 'n' (max tasks) commands. -+ -+ .TP 7 -+-*\ \'\fBA\fR\' :\fIAlternate_Display_Mode_toggle\fR -++*\ \<\fBA\fR\> :\fIAlternate_Display_Mode_toggle\fR -+ This command will switch between \*(FM and \*(AM. -+ -+ The first time you issue this command, all four \*(TDs will be shown. -+@@ -1007,7 +1007,7 @@ -+ chosen to make visible. -+ -+ .TP 7 -+-*\ \'\fBa\fR\' and \'\fBw\fR\' :\fINext_Window_Forward/Backward\fR -++*\ \<\fBa\fR\> and \<\fBw\fR\> :\fINext_Window_Forward/Backward\fR -+ This will change the \*(CW, which in turn changes the window to which -+ commands are directed. -+ These keys act in a circular fashion so you can reach any desired \*(CW -+@@ -1018,7 +1018,7 @@ -+ the \*(TD is \*F and many commands will be restricted. -+ -+ .TP 7 -+-*\ \'\fBG\fR\' :\fIChoose_Another_Window/Field_Group\fR -++*\ \<\fBG\fR\> :\fIChoose_Another_Window/Field_Group\fR -+ You will be prompted to enter a number between 1 and 4 designating the -+ window/field group which should be made the \*(CW. -+ -+@@ -1027,15 +1027,15 @@ -+ commands. -+ -+ .TP 7 -+-\ \ \'\fBg\fR\' :\fIChange_Window/Field_Group_Name\fR -++\ \ \<\fBg\fR\> :\fIChange_Window/Field_Group_Name\fR -+ You will be prompted for a new name to be applied to the \*(CW. -+ It does not require that the window name be visible -+ (the 'l' toggle to be \*O). -+ -+ .IP "*" 3 -+ The \*(CIs shown with an \*(AS have use beyond \*(AM. -+- \'=', 'A', 'G' are always available -+- \'a', 'w' act the same when color mapping -++ '=', 'A', 'G' are always available -++ 'a', 'w' act the same when color mapping -+ -+ -+ .\" ---------------------------------------------------------------------- -+ -+ -+ -+ -+ -+ ---- procps-3.1.15.orig/debian/patches/10_sysctl_quiet.dpatch -+++ procps-3.1.15/debian/patches/10_sysctl_quiet.dpatch -@@ -0,0 +1,119 @@ -+#! /bin/sh -e -+## 10_sysctl_quiet by Simon Horman -+## -+## All lines beginning with `## DP:' are a description of the patch. -+## DP: Adds quiet -q flag to sysctl -+ -+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -+patch_opts="${patch_opts:--f --no-backup-if-mismatch}" -+ -+if [ $# -ne 1 ]; then -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" -+ exit 1 -+fi -+case "$1" in -+ -patch) patch $patch_opts -p1 < $0;; -+ -unpatch) patch $patch_opts -p1 -R < $0;; -+ *) -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argum -+ent" -+ exit 1;; -+esac -+ -+exit 0 -+@DPATCH@ -+diff -ru procps-3.1.8/sysctl.8 procps-3.1.8.new/sysctl.8 -+--- procps-3.1.8/sysctl.8 2002-12-12 07:51:32.000000000 +0900 -++++ procps-3.1.8.new/sysctl.8 2003-04-15 20:30:46.000000000 +0900 -+@@ -12,9 +12,9 @@ -+ .SH SYNOPSIS -+ .B "sysctl [-n] [-e] variable ..." -+ .br -+-.B "sysctl [-n] [-e] -w variable=value ..." -++.B "sysctl [-n] [-e] [-q] -w variable=value ..." -+ .br -+-.B "sysctl [-n] [-e] -p <filename>" -++.B "sysctl [-n] [-e] [-q] -p <filename>" -+ .br -+ .B "sysctl [-n] [-e] -a" -+ .br -+@@ -45,6 +45,9 @@ -+ .B "-e" -+ Use this option to ignore errors about unknown keys. -+ .TP -++.B "-q" -++Use this option to not display the values set to stdout. -++.TP -+ .B "-w" -+ Use this option when you want to change a sysctl setting. -+ .TP -+diff -ru procps-3.1.8/sysctl.c procps-3.1.8.new/sysctl.c -+--- procps-3.1.8/sysctl.c 2002-12-29 08:26:50.000000000 +0900 -++++ procps-3.1.8.new/sysctl.c 2003-04-15 20:35:08.000000000 +0900 -+@@ -15,6 +15,8 @@ -+ * Changelog: -+ * v1.01: -+ * - added -p <preload> to preload values from a file -++ * Horms: -++ * - added -q to be quiet when modifying values -+ * -+ * Changes by Albert Cahalan, 2002. -+ */ -+@@ -46,6 +48,7 @@ -+ static bool PrintName; -+ static bool PrintNewline; -+ static bool IgnoreError; -++static bool Quiet; -+ -+ /* error messages */ -+ static const char ERR_UNKNOWN_PARAMETER[] = "error: Unknown parameter '%s'\n"; -+@@ -80,9 +83,9 @@ -+ */ -+ static int Usage(const char *restrict const name) { -+ printf("usage: %s [-n] [-e] variable ... \n" -+- " %s [-n] [-e] -w variable=value ... \n" -++ " %s [-n] [-e] [-q] -w variable=value ... \n" -+ " %s [-n] [-e] -a \n" -+- " %s [-n] [-e] -p <file> (default /etc/sysctl.conf) \n" -++ " %s [-n] [-e] [-q] -p <file> (default /etc/sysctl.conf) \n" -+ " %s [-n] [-e] -A\n", name, name, name, name, name); -+ return -1; -+ } -+@@ -290,13 +293,14 @@ -+ fprintf(fp, "%s\n", value); -+ fclose(fp); -+ -+- if (PrintName) { -++ if(Quiet) { -++ ; -++ } else if (PrintName) { -+ fprintf(stdout, "%s = %s\n", outname, value); -++ } else if (PrintNewline) { -++ fprintf(stdout, "%s\n", value); -+ } else { -+- if (PrintNewline) -+- fprintf(stdout, "%s\n", value); -+- else -+- fprintf(stdout, "%s", value); -++ fprintf(stdout, "%s", value); -+ } -+ } -+ -+@@ -377,6 +381,7 @@ -+ PrintName = true; -+ PrintNewline = true; -+ IgnoreError = false; -++ Quiet = false; -+ -+ if (argc < 2) { -+ return Usage(me); -+@@ -419,6 +424,9 @@ -+ preloadfile = *argv; -+ } -+ return Preload(preloadfile); -++ case 'q': -++ Quiet = true; -++ break; -+ case 'a': /* string and integer values (for Linux, all of them) */ -+ case 'A': /* the above, including "opaques" (would be unprintable) */ -+ case 'X': /* the above, with opaques completly printed in hex */ ---- procps-3.1.15.orig/debian/patches/00list -+++ procps-3.1.15/debian/patches/00list -@@ -0,0 +1,5 @@ -+10_sysctl_quiet -+20_procps-fix+attr -+20_ps.1 -+20_top_manpage -+30_remove_test_dir ---- procps-3.1.15.orig/debian/patches/30_remove_test_dir.dpatch -+++ procps-3.1.15/debian/patches/30_remove_test_dir.dpatch -@@ -0,0 +1,2911 @@ -+#! /bin/sh -e -+## 30_remove_test-dir by Craif Small -+## -+## All lines beginning with `## DP:' are a description of the patch. -+## DP: Removing test directory -+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -+patch_opts="${patch_opts:--f --no-backup-if-mismatch}" -+ -+if [ $# -ne 1 ]; then -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" -+ exit 1 -+fi -+case "$1" in -+ -patch) patch $patch_opts -p1 < $0;; -+ -unpatch) patch $patch_opts -p1 -R < $0;; -+ *) -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argum -+ent" -+ exit 1;; -+esac -+ -+exit 0 -+@DPATCH@ -+diff -ruN procps-3.1.15.old/test/clone-army.c procps-3.1.15/test/clone-army.c -+--- procps-3.1.15.old/test/clone-army.c 2003-10-05 04:46:34.000000000 +1000 -++++ procps-3.1.15/test/clone-army.c 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,127 +0,0 @@ -+-// ps fTo sess,pgid,pid,tty,ppid,tpgid,args -C a.out -+- -+-#include <sys/types.h> -+-#include <unistd.h> -+-#include <signal.h> -+-//#include <sys/stat.h> -+-//#include <fcntl.h> -+-//#include <stdlib.h> -+-#include <stdio.h> -+-#include <sched.h> -+- -+-#if 0 -+-#define CLONE_VM 0x00000100 // set if VM shared between processes -+-#define CLONE_FS 0x00000200 // set if fs info shared between processes -+-#define CLONE_FILES 0x00000400 // set if open files shared between processes -+-#define CLONE_SIGHAND 0x00000800 // set if signal handlers and blocked signals shared -+-#define CLONE_IDLETASK 0x00001000 // set if new pid should be 0 (kernel only)*/ -+-#define CLONE_PTRACE 0x00002000 // set if we want to let tracing continue on the child too -+-#define CLONE_VFORK 0x00004000 // set if the parent wants the child to wake it up on mm_release -+-#define CLONE_PARENT 0x00008000 // set if we want to have the same parent as the cloner -+-#define CLONE_THREAD 0x00010000 // Same thread group? -+-#define CLONE_NEWNS 0x00020000 // New namespace group? -+-#define CLONE_SYSVSEM 0x00040000 // share system V SEM_UNDO semantics -+-#define CLONE_SETTLS 0x00080000 // create a new TLS for the child -+-#define CLONE_PARENT_SETTID 0x00100000 // set the TID in the parent -+-#define CLONE_CHILD_CLEARTID 0x00200000 // clear the TID in the child -+-#define CLONE_DETACHED 0x00400000 // parent wants no child-exit signal -+-#define CLONE_UNTRACED 0x00800000 // set if the tracing process can't force CLONE_PTRACE on this clone -+-#define CLONE_CHILD_SETTID 0x01000000 // set the TID in the child -+-#define CLONE_STOPPED 0x02000000 // Start in stopped state -+-#endif -+- -+-#ifndef CLONE_THREAD -+-#define CLONE_THREAD 0x00010000 -+-#endif -+-#ifndef CLONE_DETACHED -+-#define CLONE_DETACHED 0x00400000 -+-#endif -+- -+- -+-// interesting: VM FS FILES SIGHAND PARENT THREAD SYSVSEM DETACHED -+- -+-//#define FLAGS (CLONE_PARENT|CLONE_FS|CLONE_FILES|CLONE_SIGHAND|CLONE_VM|CLONE_THREAD|CLONE_SYSVSEM) -+-#define FLAGS (CLONE_FS|CLONE_FILES|CLONE_SIGHAND|CLONE_VM|CLONE_THREAD|CLONE_DETACHED) -+- -+-// Don't cause rejection: FS FILES SYSVSEM PARENT -+-// Do cause rejection: -+- -+-static void printflags(int pass, unsigned flags){ -+- printf( -+- "%s %08x %s %s %s %s\n", -+- pass?"pass":"FAIL", -+- flags, -+- (flags&CLONE_THREAD) ? "THREAD" : "______", -+- (flags&CLONE_DETACHED) ? "DETACHED" : "________", -+- (flags&CLONE_SIGHAND) ? "SIGHAND" : "_______", -+- (flags&CLONE_SIGHAND) ? "VM" : "__" -+- ); -+-} -+- -+-static unsigned genflags(unsigned flags){ -+- return ( -+- (flags&0x08) ? 0 : CLONE_THREAD -+- )|( -+- (flags&0x04) ? 0 : CLONE_DETACHED -+- )|( -+- (flags&0x02) ? 0 : CLONE_SIGHAND -+- )|( -+- (flags&0x01) ? 0 : CLONE_VM -+- ); -+-} -+- -+-//static pid_t one; -+- -+-//static void die(int signo){ -+-// (void)signo; -+-// _exit(0); -+-//} -+- -+-//static void sigchld_handler(int signo){ -+-// (void)signo; -+-// kill(one,SIGHUP); // kill parent -+-//} -+- -+-static int clone_fn(void *vp){ -+- for(;;) pause(); -+-} -+- -+-static long clone_stack_data[2048]; -+-#ifdef __hppa__ -+-static long *clone_stack = &clone_stack_data[0]; -+-#else -+-static long *clone_stack = &clone_stack_data[2048]; -+-#endif -+- -+-int main(int argc, char *argv[]){ -+- unsigned u; -+- pid_t minime; -+- (void)argc; -+- (void)argv; -+- -+-// one = getpid(); -+-// signal(SIGHUP,die); -+-// if(fork()) hang(); // parent later killed as readyness signal -+- -+- u = 16; -+- -+- while(u--){ -+- unsigned f = genflags(u); -+- minime = clone(clone_fn, clone_stack, f, "arg"); -+- -+- printflags(minime!=-1, f); -+-// if(minime==-1){ -+-// perror("no clone"); -+-// _exit(8); -+-// } -+- -+-// printf("%d begat %d\n",getpid(),minime); -+- } -+- -+- -+-// kill(one,SIGHUP); // let the shell know we're ready -+- -+-// clone_fn(); -+- -+- return 0; -+-} -+diff -ruN procps-3.1.15.old/test/clone-once.c procps-3.1.15/test/clone-once.c -+--- procps-3.1.15.old/test/clone-once.c 2003-10-20 10:56:12.000000000 +1000 -++++ procps-3.1.15/test/clone-once.c 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,97 +0,0 @@ -+-#include <sys/types.h> -+-#include <unistd.h> -+-#include <signal.h> -+-//#include <sys/stat.h> -+-//#include <fcntl.h> -+-//#include <stdlib.h> -+-#include <stdio.h> -+-#include <sched.h> -+- -+-#if 0 -+-#define CLONE_VM 0x00000100 // set if VM shared between processes -+-#define CLONE_FS 0x00000200 // set if fs info shared between processes -+-#define CLONE_FILES 0x00000400 // set if open files shared between processes -+-#define CLONE_SIGHAND 0x00000800 // set if signal handlers and blocked signals shared -+-#define CLONE_IDLETASK 0x00001000 // set if new pid should be 0 (kernel only)*/ -+-#define CLONE_PTRACE 0x00002000 // set if we want to let tracing continue on the child too -+-#define CLONE_VFORK 0x00004000 // set if the parent wants the child to wake it up on mm_release -+-#define CLONE_PARENT 0x00008000 // set if we want to have the same parent as the cloner -+-#define CLONE_THREAD 0x00010000 // Same thread group? -+-#define CLONE_NEWNS 0x00020000 // New namespace group? -+-#define CLONE_SYSVSEM 0x00040000 // share system V SEM_UNDO semantics -+-#define CLONE_SETTLS 0x00080000 // create a new TLS for the child -+-#define CLONE_PARENT_SETTID 0x00100000 // set the TID in the parent -+-#define CLONE_CHILD_CLEARTID 0x00200000 // clear the TID in the child -+-#define CLONE_DETACHED 0x00400000 // parent wants no child-exit signal -+-#define CLONE_UNTRACED 0x00800000 // set if the tracing process can't force CLONE_PTRACE on this clone -+-#define CLONE_CHILD_SETTID 0x01000000 // set the TID in the child -+-#define CLONE_STOPPED 0x02000000 // Start in stopped state -+-#endif -+- -+-#ifndef CLONE_THREAD -+-#define CLONE_THREAD 0x00010000 -+-#endif -+-#ifndef CLONE_DETACHED -+-#define CLONE_DETACHED 0x00400000 -+-#endif -+- -+-//#define FLAGS (CLONE_PARENT|CLONE_FS|CLONE_FILES|CLONE_SIGHAND|CLONE_VM|CLONE_THREAD|CLONE_SYSVSEM) -+-#define FLAGS (CLONE_FS|CLONE_FILES|CLONE_SIGHAND|CLONE_VM|CLONE_THREAD|CLONE_DETACHED) -+- -+-static pid_t one; -+- -+-static void die(int signo){ -+- (void)signo; -+- _exit(0); -+-} -+- -+-//static void sigchld_handler(int signo){ -+-// (void)signo; -+-// kill(one,SIGHUP); // kill parent -+-//} -+- -+-static void hang(void){ -+- for(;;) pause(); -+-} -+- -+-static int clone_fn(void *vp){ -+-// const char msg[] = "I think I'm a clone now!\n"; -+- (void)vp; -+-// write(STDOUT_FILENO, msg, sizeof(msg)-1); -+- hang(); -+- return 0; // keep gcc happy -+-} -+- -+-static long clone_stack_data[2048]; -+-#ifdef __hppa__ -+-static long *clone_stack = &clone_stack_data[0]; -+-#else -+-static long *clone_stack = &clone_stack_data[2048]; -+-#endif -+- -+-int main(int argc, char *argv[]){ -+- pid_t minime; -+- (void)argc; -+- (void)argv; -+- -+- one = getpid(); -+- signal(SIGHUP,die); -+- if(fork()) hang(); // parent later killed as readyness signal -+- -+- -+- minime = clone(clone_fn, clone_stack, FLAGS, "arg"); -+- -+- if(minime==-1){ -+- perror("no clone"); -+- kill(one,SIGKILL); -+- _exit(8); -+- } -+- -+-// printf("%d begat %d\n",getpid(),minime); -+- -+- kill(one,SIGHUP); // let the shell know we're ready -+- -+- hang(); -+- -+- return 0; -+-} -+diff -ruN procps-3.1.15.old/test/fork-you.c procps-3.1.15/test/fork-you.c -+--- procps-3.1.15.old/test/fork-you.c 2003-09-05 14:18:30.000000000 +1000 -++++ procps-3.1.15/test/fork-you.c 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,27 +0,0 @@ -+-#include <sys/types.h> -+-#include <unistd.h> -+-#include <signal.h> -+- -+-static void die(int signo){ -+- (void)signo; -+- _exit(0); -+-} -+- -+-static void hang(void){ -+- for(;;) pause(); -+-} -+- -+-int main(int argc, char *argv[]){ -+- pid_t pid; -+- -+- (void)argv; -+- -+- pid = getpid(); -+- signal(SIGHUP,die); -+- if(fork()) hang(); // parent later killed as readyness signal -+- kill(1,9); // "kill" unkillable init to touch lib pages -+- while(argc--) if(!fork()) hang(); -+- kill(pid,SIGHUP); // kill parent -+- hang(); -+- return 0; -+-} -+diff -ruN procps-3.1.15.old/test/funny-thing.c procps-3.1.15/test/funny-thing.c -+--- procps-3.1.15.old/test/funny-thing.c 2003-09-08 13:55:57.000000000 +1000 -++++ procps-3.1.15/test/funny-thing.c 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,38 +0,0 @@ -+-#include <sys/types.h> -+-#include <unistd.h> -+-#include <signal.h> -+- -+-static pid_t one; -+- -+-static void die(int signo){ -+- (void)signo; -+- _exit(0); -+-} -+- -+-static void hang(void){ -+- for(;;) pause(); -+-} -+- -+-int main(int argc, char *argv[]){ -+- (void)argc; -+- (void)argv; -+- -+- one = getpid(); -+- signal(SIGHUP,die); -+- if(fork()) hang(); // parent later killed as readyness signal -+- -+- // second one exits, to enable setsid(), and the resulting -+- // zombie will be reaped by init after 1st process killed -+- if(!fork()) _exit(0); -+- -+- if(setsid()==-1){ -+- kill(one,SIGKILL); // hopefully the shell will complain -+- _exit(42); // kind of tough to report errors -+- } -+- -+- kill(one,SIGHUP); // let the shell know we're ready -+- -+- hang(); -+- -+- return 0; -+-} -+diff -ruN procps-3.1.15.old/test/gigabyte.c procps-3.1.15/test/gigabyte.c -+--- procps-3.1.15.old/test/gigabyte.c 2003-09-11 10:23:56.000000000 +1000 -++++ procps-3.1.15/test/gigabyte.c 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,74 +0,0 @@ -+-#include <sys/types.h> -+-#include <unistd.h> -+-#include <signal.h> -+-//#include <sys/ioctl.h> -+-//#include <sys/stat.h> -+-//#include <fcntl.h> -+-#include <stdio.h> -+-#include <sys/mman.h> -+- -+-static void die(int signo){ -+- (void)signo; -+- _exit(0); -+-} -+- -+-static void hang(void){ -+- for(;;) pause(); -+-} -+- -+-#ifndef MAP_NORESERVE -+-#define MAP_NORESERVE 0 -+-#endif -+- -+-int main(int argc, char *argv[]){ -+- void *vp; -+- pid_t pid; -+- size_t length = 1024*1024*1024; -+- unsigned maps; // how many mappings to do -+- -+- (void)argc; -+- (void)argv; -+- -+- if(sizeof(void*)==8){ -+- maps = 10; -+- puts("64bit"); -+- }else{ -+- maps = 1; -+- puts("32bit"); -+- } -+- fflush(stdout); -+- -+- pid = getpid(); -+- signal(SIGHUP,die); -+- if(fork()) hang(); // parent later killed as readyness signal -+- -+- -+- while(maps){ -+- vp = mmap( -+- 0, // start -+- length, -+- PROT_READ|PROT_WRITE, -+- MAP_PRIVATE|MAP_NORESERVE|MAP_ANONYMOUS, -+- 0, // fd -+- 0 // offset -+- ); -+- if(vp==MAP_FAILED){ -+- // try a smaller size; maybe fragmentation stopped us -+- length /= 2; -+- maps *= 2; -+- }else{ -+- maps--; -+- } -+- if(maps>200 || length<2*1024*1024){ -+- kill(pid,SIGKILL); // hopefully the shell will complain -+- _exit(88); -+- } -+- } -+- -+- close(0); -+- close(1); -+- close(2); -+- kill(pid,SIGHUP); // kill parent -+- hang(); -+- return 0; -+-} -+diff -ruN procps-3.1.15.old/test/got-no-tty.c procps-3.1.15/test/got-no-tty.c -+--- procps-3.1.15.old/test/got-no-tty.c 2003-09-05 14:17:57.000000000 +1000 -++++ procps-3.1.15/test/got-no-tty.c 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,46 +0,0 @@ -+-#include <sys/types.h> -+-#include <unistd.h> -+-#include <signal.h> -+-#include <sys/ioctl.h> -+-#include <sys/stat.h> -+-#include <fcntl.h> -+-#include <stdio.h> -+- -+-static void die(int signo){ -+- (void)signo; -+- _exit(0); -+-} -+- -+-static void hang(void){ -+- for(;;) pause(); -+-} -+- -+-int main(int argc, char *argv[]){ -+- int fd; -+- pid_t pid; -+- -+- (void)argc; -+- (void)argv; -+- -+- pid = getpid(); -+- signal(SIGHUP,die); -+- if(fork()) hang(); // parent later killed as readyness signal -+- -+- -+- // Use the TIOCNOTTY ioctl to detach from the tty -+- // and, supposedly, set the process group ID to zero. -+- // Reality: PGRP unchanged, TPGID becomes -1, TTY lost. -+- fd = open("/dev/tty", O_RDONLY); -+- if(!fd){ -+- perror("open /dev/tty"); -+- _exit(1); -+- } -+- if(ioctl(fd, TIOCNOTTY)==-1){ -+- perror("open /dev/tty"); -+- _exit(1); -+- } -+- -+- kill(pid,SIGHUP); // kill parent -+- hang(); -+- return 0; -+-} -+diff -ruN procps-3.1.15.old/test/mini-me.c procps-3.1.15/test/mini-me.c -+--- procps-3.1.15.old/test/mini-me.c 2003-09-22 05:50:38.000000000 +1000 -++++ procps-3.1.15/test/mini-me.c 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,97 +0,0 @@ -+-// ps fTo sess,pgid,pid,tty,ppid,tpgid,args -C a.out -+- -+-#include <sys/types.h> -+-#include <unistd.h> -+-#include <signal.h> -+-//#include <sys/stat.h> -+-//#include <fcntl.h> -+-//#include <stdlib.h> -+-#include <stdio.h> -+-#include <sched.h> -+- -+-#if 0 -+-#define CLONE_VM 0x00000100 // set if VM shared between processes -+-#define CLONE_FS 0x00000200 // set if fs info shared between processes -+-#define CLONE_FILES 0x00000400 // set if open files shared between processes -+-#define CLONE_SIGHAND 0x00000800 // set if signal handlers and blocked signals shared -+-#define CLONE_IDLETASK 0x00001000 // set if new pid should be 0 (kernel only)*/ -+-#define CLONE_PTRACE 0x00002000 // set if we want to let tracing continue on the child too -+-#define CLONE_VFORK 0x00004000 // set if the parent wants the child to wake it up on mm_release -+-#define CLONE_PARENT 0x00008000 // set if we want to have the same parent as the cloner -+-#define CLONE_THREAD 0x00010000 // Same thread group? -+-#define CLONE_NEWNS 0x00020000 // New namespace group? -+-#define CLONE_SYSVSEM 0x00040000 // share system V SEM_UNDO semantics -+-#define CLONE_SETTLS 0x00080000 // create a new TLS for the child -+-#define CLONE_PARENT_SETTID 0x00100000 // set the TID in the parent -+-#define CLONE_CHILD_CLEARTID 0x00200000 // clear the TID in the child -+-#define CLONE_DETACHED 0x00400000 // parent wants no child-exit signal -+-#define CLONE_UNTRACED 0x00800000 // set if the tracing process can't force CLONE_PTRACE on this clone -+-#define CLONE_CHILD_SETTID 0x01000000 // set the TID in the child -+-#define CLONE_STOPPED 0x02000000 // Start in stopped state -+-#endif -+- -+-#ifndef CLONE_THREAD -+-#define CLONE_THREAD 0x00010000 -+-#endif -+-#ifndef CLONE_DETACHED -+-#define CLONE_DETACHED 0x00400000 -+-#endif -+- -+-//#define FLAGS (CLONE_PARENT|CLONE_FS|CLONE_FILES|CLONE_SIGHAND|CLONE_VM|CLONE_THREAD|CLONE_SYSVSEM) -+-#define FLAGS (CLONE_FS|CLONE_FILES|CLONE_SIGHAND|CLONE_VM|CLONE_THREAD|CLONE_DETACHED) -+- -+-//static pid_t one; -+- -+-//static void die(int signo){ -+-// (void)signo; -+-// _exit(0); -+-//} -+- -+-//static void sigchld_handler(int signo){ -+-// (void)signo; -+-// kill(one,SIGHUP); // kill parent -+-//} -+- -+-static void hang(void){ -+- for(;;) pause(); -+-} -+- -+-static int clone_fn(void *vp){ -+- const char msg[] = "I think I'm a clone now!\n"; -+- write(STDOUT_FILENO, msg, sizeof(msg)-1); -+- hang(); -+-} -+- -+-static long clone_stack_data[2048]; -+-#ifdef __hppa__ -+-static long *clone_stack = &clone_stack_data[0]; -+-#else -+-static long *clone_stack = &clone_stack_data[2048]; -+-#endif -+- -+-int main(int argc, char *argv[]){ -+- pid_t minime; -+- (void)argc; -+- (void)argv; -+- -+-// one = getpid(); -+-// signal(SIGHUP,die); -+-// if(fork()) hang(); // parent later killed as readyness signal -+- -+- -+- minime = clone(clone_fn, clone_stack, FLAGS, "arg"); -+- -+- if(minime==-1){ -+-// kill(one,SIGKILL); -+- perror("no clone"); -+- _exit(8); -+- } -+- -+- printf("%d begat %d\n",getpid(),minime); -+- -+-// kill(one,SIGHUP); // let the shell know we're ready -+- -+- hang(); -+- -+- return 0; -+-} -+diff -ruN procps-3.1.15.old/test/module.mk procps-3.1.15/test/module.mk -+--- procps-3.1.15.old/test/module.mk 2003-12-25 02:02:52.000000000 +1100 -++++ procps-3.1.15/test/module.mk 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,36 +0,0 @@ -+-# This file gets included into the main Makefile, in the top directory. -+- -+-#INSTALL += $(bin)test $(man1)test.1 -- some data dump thing maybe? -+- -+-# directories for cleaning -+-DIRS += test/ $(wildcard test/*/*/) -+- -+-TEST_C := fork-you the_living_dead got-no-tty sidious sid-breaks-ttys \ -+- gigabyte mini-me funny-thing clone-army clone-once -+-TESTNAMES := $(addprefix test/,$(TEST_C)) -+-TESTOBJ := $(addsuffix .o,$(TESTNAMES)) -+-TESTSRC := $(addsuffix .c,$(TESTNAMES)) test/th.c -+- -+-# files to create -+-ALL += $(TESTNAMES) -+- -+-# files to remove -+-TEST_JUNK := stderr stdout header stderr.test stderr.good -+-CLEAN += $(addprefix test/,$(TEST_JUNK)) $(TESTNAMES) test/th $(wildcard test/*.tmp) -+- -+-TEST_X := module.mk script-child onetest runtests -+-TARFILES += $(TESTSRC) $(addprefix test/,$(TEST_X)) $(wildcard test/*/*) -+- -+-$(TESTNAMES): %: %.o -+- $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -o $@ $^ -+- -+-# add proc/$(SONAME) on the end later if needed -+-$(TESTOBJ): %.o: %.c -+- $(CC) -c $(ALL_CPPFLAGS) $(ALL_CFLAGS) $< -o $@ -+- -+-test/th: test/th.o -+- $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -o $@ $^ -lpthread -+- -+-test/th.o: test/th.c -+- $(CC) -c $(ALL_CPPFLAGS) $(ALL_CFLAGS) $< -o $@ -+- -+diff -ruN procps-3.1.15.old/test/onetest procps-3.1.15/test/onetest -+--- procps-3.1.15.old/test/onetest 2003-12-25 02:02:08.000000000 +1100 -++++ procps-3.1.15/test/onetest 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,70 +0,0 @@ -+-#!/bin/bash -+- -+-unset I_WANT_A_BROKEN_PS -+-unset PS_PERSONALITY -+-unset CMD_ENV -+-unset PS_FORMAT -+- -+-export LANG=C -+-export LC_ALL=C -+-export TZ=GMT -+- -+-TESTNAME=$1 -+- -+-# enlarge as needed in setup to avoid COMMAND becoming COMMA, etc. -+-export COLUMNS=111 -+- -+-: ${LD_LIBRARY_PATH:=../proc} -+-: ${TESTME:=../ps/ps} -+-export LD_LIBRARY_PATH -+-export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH # if ever a darwin port -+- -+- -+- -+-. $TESTNAME/setup -+-$TESTME $ARGS > stdout 2> stderr -+-RESULT=$? -+-if [ x$KILLFN == x1 ] ; then -+- killfn -+-fi -+- -+- -+- -+-if [ x$RESULT != x$GOOD ] ; then -+- echo FAIL $TESTNAME err-$RESULT -+- exit 1 -+-fi -+- -+-rm -f stderr.test ; touch stderr.test -+-if [ -f stderr ] ; then -+- head -3 < stderr > stderr.test -+-fi -+-rm -f stderr.good ; touch stderr.good -+-if [ -f $TESTNAME/stderr ] ; then -+- head -3 < $TESTNAME/stderr > stderr.good -+-fi -+-diff -Naurd stderr.test stderr.good >> /dev/null -+-if [ x$? != x0 ] ; then -+- echo FAIL $TESTNAME wrong-stderr -+- exit 1 -+-fi -+- -+-if [ -f $TESTNAME/header ] ; then -+- (printf ' ' ; head -1 stdout) | tr -s ' ' > header -+- diff -Naurd header $TESTNAME/header >> /dev/null -+- if [ x$? != x0 ] ; then -+- echo FAIL $TESTNAME wrong-header -+- exit 1 -+- fi -+-fi -+- -+-if [ x$EVALFN == x1 ] ; then -+- evalfn -+- if [ x$? != x0 ] ; then -+- echo FAIL $TESTNAME eval-fn -+- exit 1 -+- fi -+-fi -+- -+-echo pass $TESTNAME a-ok -+-exit 0 -+diff -ruN procps-3.1.15.old/test/ps/LT-mix/header procps-3.1.15/test/ps/LT-mix/header -+--- procps-3.1.15.old/test/ps/LT-mix/header 2003-10-02 12:38:29.000000000 +1000 -++++ procps-3.1.15/test/ps/LT-mix/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/LT-mix/setup procps-3.1.15/test/ps/LT-mix/setup -+--- procps-3.1.15.old/test/ps/LT-mix/setup 2003-10-02 12:39:40.000000000 +1000 -++++ procps-3.1.15/test/ps/LT-mix/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-L -T" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/LT-mix/stderr procps-3.1.15/test/ps/LT-mix/stderr -+--- procps-3.1.15.old/test/ps/LT-mix/stderr 2003-10-02 12:40:03.000000000 +1000 -++++ procps-3.1.15/test/ps/LT-mix/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Thread flags conflict; can't use both -L and -T. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/O-O/header procps-3.1.15/test/ps/O-O/header -+--- procps-3.1.15.old/test/ps/O-O/header 2003-10-02 12:01:36.000000000 +1000 -++++ procps-3.1.15/test/ps/O-O/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/O-O/setup procps-3.1.15/test/ps/O-O/setup -+--- procps-3.1.15.old/test/ps/O-O/setup 2003-10-02 12:02:01.000000000 +1000 -++++ procps-3.1.15/test/ps/O-O/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-O wchan -O sess" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/O-O/stderr procps-3.1.15/test/ps/O-O/stderr -+--- procps-3.1.15.old/test/ps/O-O/stderr 2003-10-02 12:05:19.000000000 +1000 -++++ procps-3.1.15/test/ps/O-O/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: option -O can not follow other format options. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/O-o/header procps-3.1.15/test/ps/O-o/header -+--- procps-3.1.15.old/test/ps/O-o/header 2003-10-02 12:06:18.000000000 +1000 -++++ procps-3.1.15/test/ps/O-o/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID WCHAN S TTY TIME COMMAND SESS -+diff -ruN procps-3.1.15.old/test/ps/O-o/setup procps-3.1.15/test/ps/O-o/setup -+--- procps-3.1.15.old/test/ps/O-o/setup 2003-10-02 12:05:41.000000000 +1000 -++++ procps-3.1.15/test/ps/O-o/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-O wchan -o sess" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/aix-pcpu-header/header procps-3.1.15/test/ps/aix-pcpu-header/header -+--- procps-3.1.15.old/test/ps/aix-pcpu-header/header 2003-09-03 07:26:05.000000000 +1000 -++++ procps-3.1.15/test/ps/aix-pcpu-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- %CPU -+diff -ruN procps-3.1.15.old/test/ps/aix-pcpu-header/setup procps-3.1.15/test/ps/aix-pcpu-header/setup -+--- procps-3.1.15.old/test/ps/aix-pcpu-header/setup 2003-09-03 07:24:28.000000000 +1000 -++++ procps-3.1.15/test/ps/aix-pcpu-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o %cpu" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/aix-pcpu-header2/header procps-3.1.15/test/ps/aix-pcpu-header2/header -+--- procps-3.1.15.old/test/ps/aix-pcpu-header2/header 2003-09-03 07:26:30.000000000 +1000 -++++ procps-3.1.15/test/ps/aix-pcpu-header2/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- COMMAND px -+diff -ruN procps-3.1.15.old/test/ps/aix-pcpu-header2/setup procps-3.1.15/test/ps/aix-pcpu-header2/setup -+--- procps-3.1.15.old/test/ps/aix-pcpu-header2/setup 2003-09-03 07:25:22.000000000 +1000 -++++ procps-3.1.15/test/ps/aix-pcpu-header2/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o %cpx" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/bad-format-env/header procps-3.1.15/test/ps/bad-format-env/header -+--- procps-3.1.15.old/test/ps/bad-format-env/header 2003-10-02 12:16:37.000000000 +1000 -++++ procps-3.1.15/test/ps/bad-format-env/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/bad-format-env/setup procps-3.1.15/test/ps/bad-format-env/setup -+--- procps-3.1.15.old/test/ps/bad-format-env/setup 2003-10-02 12:16:22.000000000 +1000 -++++ procps-3.1.15/test/ps/bad-format-env/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,3 +0,0 @@ -+-ARGS= -+-GOOD=0 -+-export PS_FORMAT=booger -+diff -ruN procps-3.1.15.old/test/ps/bad-format-env/stderr procps-3.1.15/test/ps/bad-format-env/stderr -+--- procps-3.1.15.old/test/ps/bad-format-env/stderr 2003-10-02 12:16:13.000000000 +1000 -++++ procps-3.1.15/test/ps/bad-format-env/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+-Warning: $PS_FORMAT ignored. (Unknown user-defined format specifier "booger".) -+diff -ruN procps-3.1.15.old/test/ps/bogus-n-header/header procps-3.1.15/test/ps/bogus-n-header/header -+--- procps-3.1.15.old/test/ps/bogus-n-header/header 2003-09-02 09:37:07.000000000 +1000 -++++ procps-3.1.15/test/ps/bogus-n-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY STAT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bogus-n-header/setup procps-3.1.15/test/ps/bogus-n-header/setup -+--- procps-3.1.15.old/test/ps/bogus-n-header/setup 2003-09-02 09:34:40.000000000 +1000 -++++ procps-3.1.15/test/ps/bogus-n-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-n" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/bogus-n-header/stderr procps-3.1.15/test/ps/bogus-n-header/stderr -+--- procps-3.1.15.old/test/ps/bogus-n-header/stderr 2003-09-02 09:35:37.000000000 +1000 -++++ procps-3.1.15/test/ps/bogus-n-header/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+-Warning: bad syntax, perhaps a bogus '-'? See http://procps.sf.net/faq.html -+diff -ruN procps-3.1.15.old/test/ps/bsd-T/header procps-3.1.15/test/ps/bsd-T/header -+--- procps-3.1.15.old/test/ps/bsd-T/header 2003-09-02 11:54:41.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-T/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY STAT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-T/setup procps-3.1.15/test/ps/bsd-T/setup -+--- procps-3.1.15.old/test/ps/bsd-T/setup 2003-09-02 11:53:24.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-T/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,11 +0,0 @@ -+-ARGS=T -+-GOOD=0 -+-EVALFN=1 -+- -+-# default output is restricted to this tty -+-MYTTY=`tty` -+- -+-evalfn () { -+- PSTTY=`awk '!/TTY/{print $2}' < stdout | uniq` -+- [ /dev/$PSTTY == $MYTTY ] -+-} -+diff -ruN procps-3.1.15.old/test/ps/bsd-j-header/header procps-3.1.15/test/ps/bsd-j-header/header -+--- procps-3.1.15.old/test/ps/bsd-j-header/header 2003-09-02 22:33:49.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-j-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PPID PID PGID SID TTY TPGID STAT UID TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-j-header/setup procps-3.1.15/test/ps/bsd-j-header/setup -+--- procps-3.1.15.old/test/ps/bsd-j-header/setup 2003-09-02 22:32:53.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-j-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="j" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/bsd-j-header2/header procps-3.1.15/test/ps/bsd-j-header2/header -+--- procps-3.1.15.old/test/ps/bsd-j-header2/header 2003-09-02 23:16:25.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-j-header2/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- USER PID PPID PGID SESS JOBC STAT TT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-j-header2/setup procps-3.1.15/test/ps/bsd-j-header2/setup -+--- procps-3.1.15.old/test/ps/bsd-j-header2/setup 2003-09-02 23:15:16.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-j-header2/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,3 +0,0 @@ -+-export CMD_ENV=bsd -+-ARGS="-j" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/bsd-l-header/header procps-3.1.15/test/ps/bsd-l-header/header -+--- procps-3.1.15.old/test/ps/bsd-l-header/header 2003-09-02 22:54:09.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-l-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- F UID PID PPID PRI NI VSZ RSS WCHAN STAT TTY TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-l-header/setup procps-3.1.15/test/ps/bsd-l-header/setup -+--- procps-3.1.15.old/test/ps/bsd-l-header/setup 2003-09-02 22:53:45.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-l-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="l" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/bsd-l-header2/header procps-3.1.15/test/ps/bsd-l-header2/header -+--- procps-3.1.15.old/test/ps/bsd-l-header2/header 2003-09-03 07:26:56.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-l-header2/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- UID PID PPID CPU PRI NI VSZ RSS WCHAN STAT TT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-l-header2/setup procps-3.1.15/test/ps/bsd-l-header2/setup -+--- procps-3.1.15.old/test/ps/bsd-l-header2/setup 2003-09-03 07:21:19.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-l-header2/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,3 +0,0 @@ -+-export CMD_ENV=bsd -+-ARGS="-l" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/bsd-s-header/header procps-3.1.15/test/ps/bsd-s-header/header -+--- procps-3.1.15.old/test/ps/bsd-s-header/header 2003-09-02 22:55:32.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-s-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- UID PID PENDING BLOCKED IGNORED CAUGHT STAT TTY TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-s-header/setup procps-3.1.15/test/ps/bsd-s-header/setup -+--- procps-3.1.15.old/test/ps/bsd-s-header/setup 2003-09-02 22:55:06.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-s-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="s" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/bsd-s-header2/header procps-3.1.15/test/ps/bsd-s-header2/header -+--- procps-3.1.15.old/test/ps/bsd-s-header2/header 2003-09-03 07:21:33.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-s-header2/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- UID PID PENDING BLOCKED IGNORED CAUGHT STAT TTY TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-s-header2/setup procps-3.1.15/test/ps/bsd-s-header2/setup -+--- procps-3.1.15.old/test/ps/bsd-s-header2/setup 2003-09-03 07:21:40.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-s-header2/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,3 +0,0 @@ -+-export CMD_ENV=bsd -+-ARGS="-s" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/bsd-selection/header procps-3.1.15/test/ps/bsd-selection/header -+--- procps-3.1.15.old/test/ps/bsd-selection/header 2003-09-04 16:04:27.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-selection/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY STAT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-selection/setup procps-3.1.15/test/ps/bsd-selection/setup -+--- procps-3.1.15.old/test/ps/bsd-selection/setup 2003-09-13 13:47:22.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-selection/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,25 +0,0 @@ -+-ARGS="m" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-rm -f misc.tmp ready.tmp typescript.tmp -+- -+-./got-no-tty -+-# this'll do but... WHERE ARE THE MAN PAGES FOR PTY STUFF??? -+-(SHELL=`pwd`/script-child script typescript.tmp &>/dev/null) & -+-while [ ! -f ready.tmp ] ; do sleep 0.01 ; done -+-. ready.tmp -+- -+-evalfn () { -+- THIS_TTY=`tty | colrm 1 5` -+- lines2=`awk '{print $2}' < stdout | sort -u | egrep "^($SHELL_TTY|$THIS_TTY)$" | wc -l` -+- lines3=`awk '{print $2}' < stdout | sort -u | egrep "^($SHELL_TTY|$THIS_TTY|\?)$" | wc -l` -+- [ $lines2 == 2 ] && [ $lines3 == 2 ] -+-} -+- -+-killfn () { -+- killall -9 got-no-tty -+- kill -9 $SHELL_PID # the others should freely die -+- rm -f misc.tmp ready.tmp typescript.tmp -+-} -+diff -ruN procps-3.1.15.old/test/ps/bsd-t-1/header procps-3.1.15/test/ps/bsd-t-1/header -+--- procps-3.1.15.old/test/ps/bsd-t-1/header 2003-09-02 11:55:23.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-t-1/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY STAT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-t-1/setup procps-3.1.15/test/ps/bsd-t-1/setup -+--- procps-3.1.15.old/test/ps/bsd-t-1/setup 2003-09-02 11:56:11.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-t-1/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,11 +0,0 @@ -+-# default output is restricted to this tty -+-MYTTY=`tty` -+- -+-ARGS=t$MYTTY -+-GOOD=0 -+-EVALFN=1 -+- -+-evalfn () { -+- PSTTY=`awk '!/TTY/{print $2}' < stdout | uniq` -+- [ /dev/$PSTTY == $MYTTY ] -+-} -+diff -ruN procps-3.1.15.old/test/ps/bsd-t-2/header procps-3.1.15/test/ps/bsd-t-2/header -+--- procps-3.1.15.old/test/ps/bsd-t-2/header 2003-09-02 11:55:26.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-t-2/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY STAT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-t-2/setup procps-3.1.15/test/ps/bsd-t-2/setup -+--- procps-3.1.15.old/test/ps/bsd-t-2/setup 2003-09-02 11:56:54.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-t-2/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,12 +0,0 @@ -+-# Ancient usage: t w/o arg is current tty -+-ARGS=t -+-GOOD=0 -+-EVALFN=1 -+- -+-# default output is restricted to this tty -+-MYTTY=`tty` -+- -+-evalfn () { -+- PSTTY=`awk '!/TTY/{print $2}' < stdout | uniq` -+- [ /dev/$PSTTY == $MYTTY ] -+-} -+diff -ruN procps-3.1.15.old/test/ps/bsd-t-3/header procps-3.1.15/test/ps/bsd-t-3/header -+--- procps-3.1.15.old/test/ps/bsd-t-3/header 2003-09-02 11:55:27.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-t-3/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY STAT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-t-3/setup procps-3.1.15/test/ps/bsd-t-3/setup -+--- procps-3.1.15.old/test/ps/bsd-t-3/setup 2003-09-02 12:25:44.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-t-3/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,19 +0,0 @@ -+-MYTTY=`tty` -+- -+-# two ways to interpret "ps t 42" -+-# -+-# 1. as "ps t" with "ps 42" (PID 42) -+-# 2. as "ps t42" (tty /dev/tty42) -+-# -+-# The command doesn't seem to be legal BSD syntax, but we try... -+-# We use interpretation #2, since BSD isn't known for ORing. -+-# We'll assume PID 1 is "init" and not on /dev/tty1, and that -+-# nothing on tty1 is named "init". -+- -+-ARGS="t 1" -+-GOOD=0 -+-EVALFN=1 -+- -+-evalfn () { -+- ! egrep ' init' stdout >> /dev/null -+-} -+diff -ruN procps-3.1.15.old/test/ps/bsd-t-4/header procps-3.1.15/test/ps/bsd-t-4/header -+--- procps-3.1.15.old/test/ps/bsd-t-4/header 2003-09-02 11:55:29.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-t-4/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY STAT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-t-4/setup procps-3.1.15/test/ps/bsd-t-4/setup -+--- procps-3.1.15.old/test/ps/bsd-t-4/setup 2003-09-02 12:15:34.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-t-4/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,10 +0,0 @@ -+-ARGS=t- -+-GOOD=0 -+-EVALFN=1 -+- -+-# Use 'Y' to avoid shell wildcard problems. -+- -+-evalfn () { -+- PSTTY=`awk '!/TTY/{print $2}' < stdout | uniq | tr '?' 'Y'` -+- [ $PSTTY == 'Y' ] -+-} -+diff -ruN procps-3.1.15.old/test/ps/bsd-u-header/header procps-3.1.15/test/ps/bsd-u-header/header -+--- procps-3.1.15.old/test/ps/bsd-u-header/header 2003-09-02 22:57:35.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-u-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- USER PID %CPU %MEM VSZ RSS TTY STAT START TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-u-header/setup procps-3.1.15/test/ps/bsd-u-header/setup -+--- procps-3.1.15.old/test/ps/bsd-u-header/setup 2003-09-02 22:57:20.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-u-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="u" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/bsd-u-header2/header procps-3.1.15/test/ps/bsd-u-header2/header -+--- procps-3.1.15.old/test/ps/bsd-u-header2/header 2003-09-03 07:27:09.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-u-header2/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- USER PID %CPU %MEM VSZ RSS TT STAT STARTED TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-u-header2/setup procps-3.1.15/test/ps/bsd-u-header2/setup -+--- procps-3.1.15.old/test/ps/bsd-u-header2/setup 2003-09-03 07:22:00.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-u-header2/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,3 +0,0 @@ -+-export CMD_ENV=bsd -+-ARGS="-u" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/bsd-v-header/header procps-3.1.15/test/ps/bsd-v-header/header -+--- procps-3.1.15.old/test/ps/bsd-v-header/header 2003-09-02 22:56:43.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-v-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY STAT TIME MAJFL TRS DRS RSS %MEM COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-v-header/setup procps-3.1.15/test/ps/bsd-v-header/setup -+--- procps-3.1.15.old/test/ps/bsd-v-header/setup 2003-09-02 22:56:10.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-v-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="v" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/bsd-v-header2/header procps-3.1.15/test/ps/bsd-v-header2/header -+--- procps-3.1.15.old/test/ps/bsd-v-header2/header 2003-09-03 07:27:16.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-v-header2/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID STAT TIME SL RE PAGEIN VSZ RSS LIM TSIZ %CPU %MEM COMMAND -+diff -ruN procps-3.1.15.old/test/ps/bsd-v-header2/setup procps-3.1.15/test/ps/bsd-v-header2/setup -+--- procps-3.1.15.old/test/ps/bsd-v-header2/setup 2003-09-03 07:22:17.000000000 +1000 -++++ procps-3.1.15/test/ps/bsd-v-header2/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,3 +0,0 @@ -+-export CMD_ENV=bsd -+-ARGS="-v" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/dynix-F-header/header procps-3.1.15/test/ps/dynix-F-header/header -+--- procps-3.1.15.old/test/ps/dynix-F-header/header 2003-09-02 22:31:23.000000000 +1000 -++++ procps-3.1.15/test/ps/dynix-F-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- UID PID PPID C SZ RSS PSR STIME TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/dynix-F-header/setup procps-3.1.15/test/ps/dynix-F-header/setup -+--- procps-3.1.15.old/test/ps/dynix-F-header/setup 2003-09-02 22:30:43.000000000 +1000 -++++ procps-3.1.15/test/ps/dynix-F-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-F" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/fail-aix-Q/header procps-3.1.15/test/ps/fail-aix-Q/header -+--- procps-3.1.15.old/test/ps/fail-aix-Q/header 2003-10-02 11:31:34.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-aix-Q/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/fail-aix-Q/setup procps-3.1.15/test/ps/fail-aix-Q/setup -+--- procps-3.1.15.old/test/ps/fail-aix-Q/setup 2003-10-02 11:32:11.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-aix-Q/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o %Q" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/fail-aix-Q/stderr procps-3.1.15/test/ps/fail-aix-Q/stderr -+--- procps-3.1.15.old/test/ps/fail-aix-Q/stderr 2003-10-02 11:33:07.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-aix-Q/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Unknown AIX field descriptor. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/fail-aix-improper/header procps-3.1.15/test/ps/fail-aix-improper/header -+--- procps-3.1.15.old/test/ps/fail-aix-improper/header 2003-10-02 11:34:09.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-aix-improper/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/fail-aix-improper/setup procps-3.1.15/test/ps/fail-aix-improper/setup -+--- procps-3.1.15.old/test/ps/fail-aix-improper/setup 2003-10-02 11:34:22.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-aix-improper/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o %" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/fail-aix-improper/stderr procps-3.1.15/test/ps/fail-aix-improper/stderr -+--- procps-3.1.15.old/test/ps/fail-aix-improper/stderr 2003-10-02 11:34:40.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-aix-improper/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Improper AIX field descriptor. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/fail-improper-sort/header procps-3.1.15/test/ps/fail-improper-sort/header -+--- procps-3.1.15.old/test/ps/fail-improper-sort/header 2003-10-02 11:47:57.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-improper-sort/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/fail-improper-sort/setup procps-3.1.15/test/ps/fail-improper-sort/setup -+--- procps-3.1.15.old/test/ps/fail-improper-sort/setup 2003-10-02 11:48:15.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-improper-sort/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="--sort ,," -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/fail-improper-sort/stderr procps-3.1.15/test/ps/fail-improper-sort/stderr -+--- procps-3.1.15.old/test/ps/fail-improper-sort/stderr 2003-10-02 12:22:31.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-improper-sort/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Improper sort list -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/fail-improper-spec/header procps-3.1.15/test/ps/fail-improper-spec/header -+--- procps-3.1.15.old/test/ps/fail-improper-spec/header 2003-10-02 11:37:17.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-improper-spec/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/fail-improper-spec/setup procps-3.1.15/test/ps/fail-improper-spec/setup -+--- procps-3.1.15.old/test/ps/fail-improper-spec/setup 2003-10-02 11:37:34.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-improper-spec/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o ," -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/fail-improper-spec/stderr procps-3.1.15/test/ps/fail-improper-spec/stderr -+--- procps-3.1.15.old/test/ps/fail-improper-spec/stderr 2003-10-02 11:37:52.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-improper-spec/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Improper format list. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/fail-macro-width/header procps-3.1.15/test/ps/fail-macro-width/header -+--- procps-3.1.15.old/test/ps/fail-macro-width/header 2003-10-02 11:42:15.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-macro-width/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/fail-macro-width/setup procps-3.1.15/test/ps/fail-macro-width/setup -+--- procps-3.1.15.old/test/ps/fail-macro-width/setup 2003-10-02 11:42:30.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-macro-width/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o DefBSD:6" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/fail-macro-width/stderr procps-3.1.15/test/ps/fail-macro-width/stderr -+--- procps-3.1.15.old/test/ps/fail-macro-width/stderr 2003-10-02 11:42:46.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-macro-width/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Can't set width for a macro (multi-column) format specifier. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/fail-no-sort-key/header procps-3.1.15/test/ps/fail-no-sort-key/header -+--- procps-3.1.15.old/test/ps/fail-no-sort-key/header 2003-10-02 11:50:26.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-no-sort-key/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/fail-no-sort-key/setup procps-3.1.15/test/ps/fail-no-sort-key/setup -+--- procps-3.1.15.old/test/ps/fail-no-sort-key/setup 2003-10-02 11:50:39.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-no-sort-key/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="--sort" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/fail-no-sort-key/stderr procps-3.1.15/test/ps/fail-no-sort-key/stderr -+--- procps-3.1.15.old/test/ps/fail-no-sort-key/stderr 2003-10-02 11:51:05.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-no-sort-key/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Long sort specification must follow --sort. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/fail-no-width/header procps-3.1.15/test/ps/fail-no-width/header -+--- procps-3.1.15.old/test/ps/fail-no-width/header 2003-10-02 11:40:56.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-no-width/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/fail-no-width/setup procps-3.1.15/test/ps/fail-no-width/setup -+--- procps-3.1.15.old/test/ps/fail-no-width/setup 2003-10-02 11:41:22.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-no-width/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o pid:,f,comm" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/fail-no-width/stderr procps-3.1.15/test/ps/fail-no-width/stderr -+--- procps-3.1.15.old/test/ps/fail-no-width/stderr 2003-10-02 11:40:56.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-no-width/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Column widths must be unsigned decimal numbers. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/fail-nondecimal/header procps-3.1.15/test/ps/fail-nondecimal/header -+--- procps-3.1.15.old/test/ps/fail-nondecimal/header 2003-10-02 11:39:38.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-nondecimal/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/fail-nondecimal/setup procps-3.1.15/test/ps/fail-nondecimal/setup -+--- procps-3.1.15.old/test/ps/fail-nondecimal/setup 2003-10-02 11:40:07.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-nondecimal/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o pid:f,comm" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/fail-nondecimal/stderr procps-3.1.15/test/ps/fail-nondecimal/stderr -+--- procps-3.1.15.old/test/ps/fail-nondecimal/stderr 2003-10-02 11:40:30.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-nondecimal/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Column widths must be unsigned decimal numbers. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/fail-oj/header procps-3.1.15/test/ps/fail-oj/header -+--- procps-3.1.15.old/test/ps/fail-oj/header 2003-09-02 13:47:18.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-oj/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/fail-oj/setup procps-3.1.15/test/ps/fail-oj/setup -+--- procps-3.1.15.old/test/ps/fail-oj/setup 2003-09-02 13:47:54.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-oj/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o pid -j" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/fail-oj/stderr procps-3.1.15/test/ps/fail-oj/stderr -+--- procps-3.1.15.old/test/ps/fail-oj/stderr 2003-09-02 13:49:02.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-oj/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Can't use output modifiers with user-defined output -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/fail-unknown-sort/header procps-3.1.15/test/ps/fail-unknown-sort/header -+--- procps-3.1.15.old/test/ps/fail-unknown-sort/header 2003-10-02 11:49:27.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-unknown-sort/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/fail-unknown-sort/setup procps-3.1.15/test/ps/fail-unknown-sort/setup -+--- procps-3.1.15.old/test/ps/fail-unknown-sort/setup 2003-10-02 11:49:41.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-unknown-sort/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="--sort booger" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/fail-unknown-sort/stderr procps-3.1.15/test/ps/fail-unknown-sort/stderr -+--- procps-3.1.15.old/test/ps/fail-unknown-sort/stderr 2003-10-02 11:50:09.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-unknown-sort/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Unknown sort specifier. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/fail-unknown-spec/header procps-3.1.15/test/ps/fail-unknown-spec/header -+--- procps-3.1.15.old/test/ps/fail-unknown-spec/header 2003-10-02 11:35:33.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-unknown-spec/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/fail-unknown-spec/setup procps-3.1.15/test/ps/fail-unknown-spec/setup -+--- procps-3.1.15.old/test/ps/fail-unknown-spec/setup 2003-10-02 11:35:52.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-unknown-spec/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o boogers" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/fail-unknown-spec/stderr procps-3.1.15/test/ps/fail-unknown-spec/stderr -+--- procps-3.1.15.old/test/ps/fail-unknown-spec/stderr 2003-10-02 11:36:05.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-unknown-spec/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Unknown user-defined format specifier "boogers". -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/fail-xx/header procps-3.1.15/test/ps/fail-xx/header -+--- procps-3.1.15.old/test/ps/fail-xx/header 2003-09-02 09:43:13.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-xx/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/fail-xx/setup procps-3.1.15/test/ps/fail-xx/setup -+--- procps-3.1.15.old/test/ps/fail-xx/setup 2003-09-02 09:41:38.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-xx/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="x -x" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/fail-xx/stderr procps-3.1.15/test/ps/fail-xx/stderr -+--- procps-3.1.15.old/test/ps/fail-xx/stderr 2003-09-02 09:42:04.000000000 +1000 -++++ procps-3.1.15/test/ps/fail-xx/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Unsupported SysV option. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/hpux-H-simple/setup procps-3.1.15/test/ps/hpux-H-simple/setup -+--- procps-3.1.15.old/test/ps/hpux-H-simple/setup 2003-09-03 10:15:28.000000000 +1000 -++++ procps-3.1.15/test/ps/hpux-H-simple/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS="-HC fork-you -o comm=" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-./fork-you 3 4 5 6 7 8 9 -+- -+-evalfn () { -+- diff -Naurd stdout $TESTNAME/stdout >> /dev/null -+-} -+- -+-killfn () { -+- killall -9 fork-you -+-} -+diff -ruN procps-3.1.15.old/test/ps/hpux-H-simple/stdout procps-3.1.15/test/ps/hpux-H-simple/stdout -+--- procps-3.1.15.old/test/ps/hpux-H-simple/stdout 2003-09-03 09:51:00.000000000 +1000 -++++ procps-3.1.15/test/ps/hpux-H-simple/stdout 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,9 +0,0 @@ -+-fork-you -+- fork-you -+- fork-you -+- fork-you -+- fork-you -+- fork-you -+- fork-you -+- fork-you -+- fork-you -+diff -ruN procps-3.1.15.old/test/ps/jyclf-header/header procps-3.1.15/test/ps/jyclf-header/header -+--- procps-3.1.15.old/test/ps/jyclf-header/header 2003-09-02 13:57:34.000000000 +1000 -++++ procps-3.1.15/test/ps/jyclf-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- S UID PID PPID PGID SID CLS PRI RSS SZ WCHAN STIME TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/jyclf-header/setup procps-3.1.15/test/ps/jyclf-header/setup -+--- procps-3.1.15.old/test/ps/jyclf-header/setup 2003-09-02 13:55:34.000000000 +1000 -++++ procps-3.1.15/test/ps/jyclf-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-jyclf" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/linux-lf-header/header procps-3.1.15/test/ps/linux-lf-header/header -+--- procps-3.1.15.old/test/ps/linux-lf-header/header 2003-09-02 14:03:14.000000000 +1000 -++++ procps-3.1.15/test/ps/linux-lf-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- F S USER PID PPID C PRI NI P SZ WCHAN STIME TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/linux-lf-header/setup procps-3.1.15/test/ps/linux-lf-header/setup -+--- procps-3.1.15.old/test/ps/linux-lf-header/setup 2003-09-02 14:04:14.000000000 +1000 -++++ procps-3.1.15/test/ps/linux-lf-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,3 +0,0 @@ -+-export CMD_ENV=linux -+-ARGS="-lf" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/mH-mix/header procps-3.1.15/test/ps/mH-mix/header -+--- procps-3.1.15.old/test/ps/mH-mix/header 2003-10-02 12:38:52.000000000 +1000 -++++ procps-3.1.15/test/ps/mH-mix/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/mH-mix/setup procps-3.1.15/test/ps/mH-mix/setup -+--- procps-3.1.15.old/test/ps/mH-mix/setup 2003-10-02 12:39:25.000000000 +1000 -++++ procps-3.1.15/test/ps/mH-mix/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="mH" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/mH-mix/stderr procps-3.1.15/test/ps/mH-mix/stderr -+--- procps-3.1.15.old/test/ps/mH-mix/stderr 2003-10-02 12:40:18.000000000 +1000 -++++ procps-3.1.15/test/ps/mH-mix/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Thread flags conflict; can't use H with m or -m. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/mH-mix2/header procps-3.1.15/test/ps/mH-mix2/header -+--- procps-3.1.15.old/test/ps/mH-mix2/header 2003-10-02 12:38:58.000000000 +1000 -++++ procps-3.1.15/test/ps/mH-mix2/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/mH-mix2/setup procps-3.1.15/test/ps/mH-mix2/setup -+--- procps-3.1.15.old/test/ps/mH-mix2/setup 2003-10-02 12:39:15.000000000 +1000 -++++ procps-3.1.15/test/ps/mH-mix2/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-m H" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/mH-mix2/stderr procps-3.1.15/test/ps/mH-mix2/stderr -+--- procps-3.1.15.old/test/ps/mH-mix2/stderr 2003-10-02 12:40:20.000000000 +1000 -++++ procps-3.1.15/test/ps/mH-mix2/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Thread flags conflict; can't use H with m or -m. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/mm-mix/header procps-3.1.15/test/ps/mm-mix/header -+--- procps-3.1.15.old/test/ps/mm-mix/header 2003-10-02 12:37:41.000000000 +1000 -++++ procps-3.1.15/test/ps/mm-mix/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/mm-mix/setup procps-3.1.15/test/ps/mm-mix/setup -+--- procps-3.1.15.old/test/ps/mm-mix/setup 2003-10-02 12:37:57.000000000 +1000 -++++ procps-3.1.15/test/ps/mm-mix/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-m m" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/mm-mix/stderr procps-3.1.15/test/ps/mm-mix/stderr -+--- procps-3.1.15.old/test/ps/mm-mix/stderr 2003-10-02 12:38:11.000000000 +1000 -++++ procps-3.1.15/test/ps/mm-mix/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Thread flags conflict; can't use both m and -m. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/multi-sort/header procps-3.1.15/test/ps/multi-sort/header -+--- procps-3.1.15.old/test/ps/multi-sort/header 2003-10-02 12:08:50.000000000 +1000 -++++ procps-3.1.15/test/ps/multi-sort/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/multi-sort/setup procps-3.1.15/test/ps/multi-sort/setup -+--- procps-3.1.15.old/test/ps/multi-sort/setup 2003-10-02 12:09:10.000000000 +1000 -++++ procps-3.1.15/test/ps/multi-sort/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="--sort wchan --sort sess" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/multi-sort/stderr procps-3.1.15/test/ps/multi-sort/stderr -+--- procps-3.1.15.old/test/ps/multi-sort/stderr 2003-10-02 12:09:23.000000000 +1000 -++++ procps-3.1.15/test/ps/multi-sort/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Multiple sort options. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/o-O/header procps-3.1.15/test/ps/o-O/header -+--- procps-3.1.15.old/test/ps/o-O/header 2003-10-02 12:03:27.000000000 +1000 -++++ procps-3.1.15/test/ps/o-O/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/o-O/setup procps-3.1.15/test/ps/o-O/setup -+--- procps-3.1.15.old/test/ps/o-O/setup 2003-10-02 12:04:40.000000000 +1000 -++++ procps-3.1.15/test/ps/o-O/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o wchan -O sess" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/o-O/stderr procps-3.1.15/test/ps/o-O/stderr -+--- procps-3.1.15.old/test/ps/o-O/stderr 2003-10-02 12:06:35.000000000 +1000 -++++ procps-3.1.15/test/ps/o-O/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: option -O can not follow other format options. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/o-o/header procps-3.1.15/test/ps/o-o/header -+--- procps-3.1.15.old/test/ps/o-o/header 2003-10-02 12:07:18.000000000 +1000 -++++ procps-3.1.15/test/ps/o-o/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- WCHAN SESS -+diff -ruN procps-3.1.15.old/test/ps/o-o/setup procps-3.1.15/test/ps/o-o/setup -+--- procps-3.1.15.old/test/ps/o-o/setup 2003-10-02 12:07:08.000000000 +1000 -++++ procps-3.1.15/test/ps/o-o/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o wchan -o sess" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/old-m-1/header procps-3.1.15/test/ps/old-m-1/header -+--- procps-3.1.15.old/test/ps/old-m-1/header 2003-09-02 09:46:21.000000000 +1000 -++++ procps-3.1.15/test/ps/old-m-1/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY MAJFLT MINFLT TRS DRS SIZE SWAP RSS SHRD LIB DT COMMAND -+diff -ruN procps-3.1.15.old/test/ps/old-m-1/setup procps-3.1.15/test/ps/old-m-1/setup -+--- procps-3.1.15.old/test/ps/old-m-1/setup 2003-09-02 09:46:06.000000000 +1000 -++++ procps-3.1.15/test/ps/old-m-1/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,3 +0,0 @@ -+-export CMD_ENV=old -+-ARGS="-m" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/old-m-2/header procps-3.1.15/test/ps/old-m-2/header -+--- procps-3.1.15.old/test/ps/old-m-2/header 2003-09-02 09:47:13.000000000 +1000 -++++ procps-3.1.15/test/ps/old-m-2/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY MAJFLT MINFLT TRS DRS SIZE SWAP RSS SHRD LIB DT COMMAND -+diff -ruN procps-3.1.15.old/test/ps/old-m-2/setup procps-3.1.15/test/ps/old-m-2/setup -+--- procps-3.1.15.old/test/ps/old-m-2/setup 2003-09-02 09:47:47.000000000 +1000 -++++ procps-3.1.15/test/ps/old-m-2/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,4 +0,0 @@ -+-export CMD_ENV=unix -+-export PS_PERSONALITY=old -+-ARGS="-m" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/old-m-3/header procps-3.1.15/test/ps/old-m-3/header -+--- procps-3.1.15.old/test/ps/old-m-3/header 2003-09-02 09:47:15.000000000 +1000 -++++ procps-3.1.15/test/ps/old-m-3/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY MAJFLT MINFLT TRS DRS SIZE SWAP RSS SHRD LIB DT COMMAND -+diff -ruN procps-3.1.15.old/test/ps/old-m-3/setup procps-3.1.15/test/ps/old-m-3/setup -+--- procps-3.1.15.old/test/ps/old-m-3/setup 2003-09-02 09:47:58.000000000 +1000 -++++ procps-3.1.15/test/ps/old-m-3/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,3 +0,0 @@ -+-export CMD_ENV=old -+-ARGS="m" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/old-m-4/header procps-3.1.15/test/ps/old-m-4/header -+--- procps-3.1.15.old/test/ps/old-m-4/header 2003-09-02 09:47:16.000000000 +1000 -++++ procps-3.1.15/test/ps/old-m-4/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY MAJFLT MINFLT TRS DRS SIZE SWAP RSS SHRD LIB DT COMMAND -+diff -ruN procps-3.1.15.old/test/ps/old-m-4/setup procps-3.1.15/test/ps/old-m-4/setup -+--- procps-3.1.15.old/test/ps/old-m-4/setup 2003-09-02 09:50:11.000000000 +1000 -++++ procps-3.1.15/test/ps/old-m-4/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,3 +0,0 @@ -+-export I_WANT_A_BROKEN_PS= -+-ARGS="-m" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/pcpu-sort-threaded/setup procps-3.1.15/test/ps/pcpu-sort-threaded/setup -+--- procps-3.1.15.old/test/ps/pcpu-sort-threaded/setup 2003-10-19 13:48:43.000000000 +1000 -++++ procps-3.1.15/test/ps/pcpu-sort-threaded/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,8 +0,0 @@ -+-ARGS="-e --sort=pcpu -o cp=" -+-GOOD=0 -+-EVALFN=1 -+- -+-evalfn () { -+- sort -n < stdout > sorted.tmp -+- diff -Naurd stdout sorted.tmp >> /dev/null -+-} -+diff -ruN procps-3.1.15.old/test/ps/suv-conflicts/header procps-3.1.15/test/ps/suv-conflicts/header -+--- procps-3.1.15.old/test/ps/suv-conflicts/header 2003-10-02 12:12:30.000000000 +1000 -++++ procps-3.1.15/test/ps/suv-conflicts/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/suv-conflicts/setup procps-3.1.15/test/ps/suv-conflicts/setup -+--- procps-3.1.15.old/test/ps/suv-conflicts/setup 2003-10-02 12:13:26.000000000 +1000 -++++ procps-3.1.15/test/ps/suv-conflicts/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="suv" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/suv-conflicts/stderr procps-3.1.15/test/ps/suv-conflicts/stderr -+--- procps-3.1.15.old/test/ps/suv-conflicts/stderr 2003-10-02 12:13:41.000000000 +1000 -++++ procps-3.1.15/test/ps/suv-conflicts/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Conflicting format options. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/sysv-selection/header procps-3.1.15/test/ps/sysv-selection/header -+--- procps-3.1.15.old/test/ps/sysv-selection/header 2003-09-04 16:13:34.000000000 +1000 -++++ procps-3.1.15/test/ps/sysv-selection/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/sysv-selection/setup procps-3.1.15/test/ps/sysv-selection/setup -+--- procps-3.1.15.old/test/ps/sysv-selection/setup 2003-09-13 13:59:04.000000000 +1000 -++++ procps-3.1.15/test/ps/sysv-selection/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,25 +0,0 @@ -+-ARGS="-m" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-rm -f misc.tmp ready.tmp typescript.tmp -+- -+-./got-no-tty -+-# this'll do but... WHERE ARE THE MAN PAGES FOR PTY STUFF??? -+-(SHELL=`pwd`/script-child script typescript.tmp &>/dev/null) & -+-while [ ! -f ready.tmp ] ; do sleep 0.01 ; done -+-. ready.tmp -+- -+-evalfn () { -+- THIS_TTY=`tty | colrm 1 5` -+- lines1=`awk '{print $2}' < stdout | sort -u | egrep "^($THIS_TTY)$" | wc -l` -+- lines3=`awk '{print $2}' < stdout | sort -u | egrep "^($SHELL_TTY|$THIS_TTY|\?)$" | wc -l` -+- [ $lines1 == 1 ] && [ $lines3 == 1 ] -+-} -+- -+-killfn () { -+- killall -9 got-no-tty -+- kill -9 $SHELL_PID # the others should freely die -+- rm -f misc.tmp ready.tmp typescript.tmp -+-} -+diff -ruN procps-3.1.15.old/test/ps/thread-nosort-H/header procps-3.1.15/test/ps/thread-nosort-H/header -+--- procps-3.1.15.old/test/ps/thread-nosort-H/header 2003-10-20 10:57:52.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-nosort-H/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY STAT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/thread-nosort-H/setup procps-3.1.15/test/ps/thread-nosort-H/setup -+--- procps-3.1.15.old/test/ps/thread-nosort-H/setup 2003-10-20 10:50:16.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-nosort-H/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS="-C clone-once H" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-./clone-once -+- -+-evalfn () { -+- [ `wc -l < stdout` == 3 ] -+-} -+- -+-killfn () { -+- killall -9 clone-once -+-} -+diff -ruN procps-3.1.15.old/test/ps/thread-nosort-HL/header procps-3.1.15/test/ps/thread-nosort-HL/header -+--- procps-3.1.15.old/test/ps/thread-nosort-HL/header 2003-10-20 10:57:52.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-nosort-HL/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID LWP TTY STAT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/thread-nosort-HL/setup procps-3.1.15/test/ps/thread-nosort-HL/setup -+--- procps-3.1.15.old/test/ps/thread-nosort-HL/setup 2003-10-20 10:50:16.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-nosort-HL/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS="-C clone-once H -L" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-./clone-once -+- -+-evalfn () { -+- [ `wc -l < stdout` == 3 ] -+-} -+- -+-killfn () { -+- killall -9 clone-once -+-} -+diff -ruN procps-3.1.15.old/test/ps/thread-nosort-Hm/setup procps-3.1.15/test/ps/thread-nosort-Hm/setup -+--- procps-3.1.15.old/test/ps/thread-nosort-Hm/setup 2003-10-20 10:50:16.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-nosort-Hm/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-C clone-once Hm" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/thread-nosort-Hm/stderr procps-3.1.15/test/ps/thread-nosort-Hm/stderr -+--- procps-3.1.15.old/test/ps/thread-nosort-Hm/stderr 2003-10-20 10:58:35.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-nosort-Hm/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Thread flags conflict; can't use H with m or -m. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/thread-nosort-L/header procps-3.1.15/test/ps/thread-nosort-L/header -+--- procps-3.1.15.old/test/ps/thread-nosort-L/header 2003-10-20 10:57:52.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-nosort-L/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID LWP TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/thread-nosort-L/setup procps-3.1.15/test/ps/thread-nosort-L/setup -+--- procps-3.1.15.old/test/ps/thread-nosort-L/setup 2003-10-20 10:50:16.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-nosort-L/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS="-C clone-once -L" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-./clone-once -+- -+-evalfn () { -+- [ `wc -l < stdout` == 3 ] -+-} -+- -+-killfn () { -+- killall -9 clone-once -+-} -+diff -ruN procps-3.1.15.old/test/ps/thread-nosort-default/header procps-3.1.15/test/ps/thread-nosort-default/header -+--- procps-3.1.15.old/test/ps/thread-nosort-default/header 2003-10-20 10:57:53.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-nosort-default/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/thread-nosort-default/setup procps-3.1.15/test/ps/thread-nosort-default/setup -+--- procps-3.1.15.old/test/ps/thread-nosort-default/setup 2003-10-20 10:50:16.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-nosort-default/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS="-C clone-once" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-./clone-once -+- -+-evalfn () { -+- [ `wc -l < stdout` == 2 ] -+-} -+- -+-killfn () { -+- killall -9 clone-once -+-} -+diff -ruN procps-3.1.15.old/test/ps/thread-nosort-m/header procps-3.1.15/test/ps/thread-nosort-m/header -+--- procps-3.1.15.old/test/ps/thread-nosort-m/header 2003-10-20 10:57:53.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-nosort-m/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY STAT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/thread-nosort-m/setup procps-3.1.15/test/ps/thread-nosort-m/setup -+--- procps-3.1.15.old/test/ps/thread-nosort-m/setup 2003-10-20 10:50:16.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-nosort-m/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS="-C clone-once m" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-./clone-once -+- -+-evalfn () { -+- [ `wc -l < stdout` == 4 ] -+-} -+- -+-killfn () { -+- killall -9 clone-once -+-} -+diff -ruN procps-3.1.15.old/test/ps/thread-nosort-mL/header procps-3.1.15/test/ps/thread-nosort-mL/header -+--- procps-3.1.15.old/test/ps/thread-nosort-mL/header 2003-10-20 10:57:53.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-nosort-mL/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID LWP TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/thread-nosort-mL/setup procps-3.1.15/test/ps/thread-nosort-mL/setup -+--- procps-3.1.15.old/test/ps/thread-nosort-mL/setup 2003-10-20 10:50:16.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-nosort-mL/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS="-C clone-once -mL" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-./clone-once -+- -+-evalfn () { -+- [ `wc -l < stdout` == 4 ] -+-} -+- -+-killfn () { -+- killall -9 clone-once -+-} -+diff -ruN procps-3.1.15.old/test/ps/thread-sorted-H/header procps-3.1.15/test/ps/thread-sorted-H/header -+--- procps-3.1.15.old/test/ps/thread-sorted-H/header 2003-10-20 10:57:53.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-sorted-H/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY STAT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/thread-sorted-H/setup procps-3.1.15/test/ps/thread-sorted-H/setup -+--- procps-3.1.15.old/test/ps/thread-sorted-H/setup 2003-10-20 10:45:59.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-sorted-H/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS="-C clone-once --sort=pid H" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-./clone-once -+- -+-evalfn () { -+- [ `wc -l < stdout` == 3 ] -+-} -+- -+-killfn () { -+- killall -9 clone-once -+-} -+diff -ruN procps-3.1.15.old/test/ps/thread-sorted-HL/header procps-3.1.15/test/ps/thread-sorted-HL/header -+--- procps-3.1.15.old/test/ps/thread-sorted-HL/header 2003-10-20 10:57:53.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-sorted-HL/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID LWP TTY STAT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/thread-sorted-HL/setup procps-3.1.15/test/ps/thread-sorted-HL/setup -+--- procps-3.1.15.old/test/ps/thread-sorted-HL/setup 2003-10-20 10:45:16.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-sorted-HL/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS="-C clone-once --sort=pid H -L" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-./clone-once -+- -+-evalfn () { -+- [ `wc -l < stdout` == 3 ] -+-} -+- -+-killfn () { -+- killall -9 clone-once -+-} -+diff -ruN procps-3.1.15.old/test/ps/thread-sorted-Hm/setup procps-3.1.15/test/ps/thread-sorted-Hm/setup -+--- procps-3.1.15.old/test/ps/thread-sorted-Hm/setup 2003-10-20 10:47:00.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-sorted-Hm/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-C clone-once --sort=pid Hm" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/thread-sorted-Hm/stderr procps-3.1.15/test/ps/thread-sorted-Hm/stderr -+--- procps-3.1.15.old/test/ps/thread-sorted-Hm/stderr 2003-10-20 10:58:47.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-sorted-Hm/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Thread flags conflict; can't use H with m or -m. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/thread-sorted-L/header procps-3.1.15/test/ps/thread-sorted-L/header -+--- procps-3.1.15.old/test/ps/thread-sorted-L/header 2003-10-20 10:57:53.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-sorted-L/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID LWP TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/thread-sorted-L/setup procps-3.1.15/test/ps/thread-sorted-L/setup -+--- procps-3.1.15.old/test/ps/thread-sorted-L/setup 2003-10-20 10:45:35.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-sorted-L/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS="-C clone-once --sort=pid -L" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-./clone-once -+- -+-evalfn () { -+- [ `wc -l < stdout` == 3 ] -+-} -+- -+-killfn () { -+- killall -9 clone-once -+-} -+diff -ruN procps-3.1.15.old/test/ps/thread-sorted-default/header procps-3.1.15/test/ps/thread-sorted-default/header -+--- procps-3.1.15.old/test/ps/thread-sorted-default/header 2003-10-20 10:57:53.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-sorted-default/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/thread-sorted-default/setup procps-3.1.15/test/ps/thread-sorted-default/setup -+--- procps-3.1.15.old/test/ps/thread-sorted-default/setup 2003-10-20 10:47:53.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-sorted-default/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS="-C clone-once --sort=pid" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-./clone-once -+- -+-evalfn () { -+- [ `wc -l < stdout` == 2 ] -+-} -+- -+-killfn () { -+- killall -9 clone-once -+-} -+diff -ruN procps-3.1.15.old/test/ps/thread-sorted-m/header procps-3.1.15/test/ps/thread-sorted-m/header -+--- procps-3.1.15.old/test/ps/thread-sorted-m/header 2003-10-20 10:57:53.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-sorted-m/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY STAT TIME COMMAND -+diff -ruN procps-3.1.15.old/test/ps/thread-sorted-m/setup procps-3.1.15/test/ps/thread-sorted-m/setup -+--- procps-3.1.15.old/test/ps/thread-sorted-m/setup 2003-10-20 10:42:59.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-sorted-m/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS="-C clone-once --sort=pid m" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-./clone-once -+- -+-evalfn () { -+- [ `wc -l < stdout` == 4 ] -+-} -+- -+-killfn () { -+- killall -9 clone-once -+-} -+diff -ruN procps-3.1.15.old/test/ps/thread-sorted-mL/header procps-3.1.15/test/ps/thread-sorted-mL/header -+--- procps-3.1.15.old/test/ps/thread-sorted-mL/header 2003-10-20 10:57:54.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-sorted-mL/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID LWP TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/thread-sorted-mL/setup procps-3.1.15/test/ps/thread-sorted-mL/setup -+--- procps-3.1.15.old/test/ps/thread-sorted-mL/setup 2003-10-20 10:44:46.000000000 +1000 -++++ procps-3.1.15/test/ps/thread-sorted-mL/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS="-C clone-once --sort=pid -mL" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-./clone-once -+- -+-evalfn () { -+- [ `wc -l < stdout` == 4 ] -+-} -+- -+-killfn () { -+- killall -9 clone-once -+-} -+diff -ruN procps-3.1.15.old/test/ps/unix-comm/setup procps-3.1.15/test/ps/unix-comm/setup -+--- procps-3.1.15.old/test/ps/unix-comm/setup 2003-09-02 10:33:46.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-comm/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,7 +0,0 @@ -+-ARGS= -+-GOOD=0 -+-EVALFN=1 -+- -+-evalfn () { -+- grep "ps$" stdout >> /dev/null -+-} -+diff -ruN procps-3.1.15.old/test/ps/unix-doc/setup procps-3.1.15/test/ps/unix-doc/setup -+--- procps-3.1.15.old/test/ps/unix-doc/setup 2003-09-03 13:38:37.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-doc/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,37 +0,0 @@ -+-# The UNIX+POSIX standard requires that, except for "args" and "comm", -+-# the documentation must warn about any implementation-defined -+-# format specifiers that may contain blanks. -+-# -+-# Using "ps L" to grab the list isn't proper, but it's needed. -+-# -+-# This is our list for the man page: -+-# -+-#args COMMAND -+-#cmd CMD -+-#comm COMMAND -+-#command COMMAND -+-#fname COMMAND -+-#ucmd CMD -+-#ucomm COMMAND -+-#lstart STARTED -+-#bsdstart START -+-#start STARTED -+- -+-# It gets to 819 last I checked -+-export COLUMNS=1111 -+- -+-biglist=`$TESTME L \ -+- | egrep -v '^(comm|args|cmd|comm|command|fname|ucmd|ucomm|lstart|bsdstart|start) ' \ -+- | awk '{printf("%s,",$1);}'` -+-numcols=`echo $biglist | tr -dc , | wc -c` -+- -+-ARGS=-eo$biglist -+-GOOD=0 -+-EVALFN=1 -+- -+-evalfn () { -+- while read -a myarray; do -+- [ ${#myarray[*]} == $numcols ] || return 1 -+- done < stdout -+- return 0 -+-} -+diff -ruN procps-3.1.15.old/test/ps/unix-f-args/setup procps-3.1.15/test/ps/unix-f-args/setup -+--- procps-3.1.15.old/test/ps/unix-f-args/setup 2003-09-02 10:33:18.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-f-args/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,7 +0,0 @@ -+-ARGS="-f" -+-GOOD=0 -+-EVALFN=1 -+- -+-evalfn () { -+- grep "ps -f$" stdout >> /dev/null -+-} -+diff -ruN procps-3.1.15.old/test/ps/unix-f-header/header procps-3.1.15/test/ps/unix-f-header/header -+--- procps-3.1.15.old/test/ps/unix-f-header/header 2003-09-02 08:40:35.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-f-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- UID PID PPID C STIME TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/unix-f-header/setup procps-3.1.15/test/ps/unix-f-header/setup -+--- procps-3.1.15.old/test/ps/unix-f-header/setup 2003-09-02 08:37:18.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-f-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-f" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/unix-fl-header/header procps-3.1.15/test/ps/unix-fl-header/header -+--- procps-3.1.15.old/test/ps/unix-fl-header/header 2003-09-02 08:53:56.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-fl-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- F S UID PID PPID C PRI NI ADDR SZ WCHAN STIME TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/unix-fl-header/setup procps-3.1.15/test/ps/unix-fl-header/setup -+--- procps-3.1.15.old/test/ps/unix-fl-header/setup 2003-09-02 08:55:32.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-fl-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-fl" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/unix-header/header procps-3.1.15/test/ps/unix-header/header -+--- procps-3.1.15.old/test/ps/unix-header/header 2003-09-02 08:53:56.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/unix-header/setup procps-3.1.15/test/ps/unix-header/setup -+--- procps-3.1.15.old/test/ps/unix-header/setup 2003-09-02 08:55:09.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS= -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/unix-l-header/header procps-3.1.15/test/ps/unix-l-header/header -+--- procps-3.1.15.old/test/ps/unix-l-header/header 2003-09-02 08:53:56.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-l-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- F S UID PID PPID C PRI NI ADDR SZ WCHAN TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/unix-l-header/setup procps-3.1.15/test/ps/unix-l-header/setup -+--- procps-3.1.15.old/test/ps/unix-l-header/setup 2003-09-02 08:55:49.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-l-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-l" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/unix-lf-header/header procps-3.1.15/test/ps/unix-lf-header/header -+--- procps-3.1.15.old/test/ps/unix-lf-header/header 2003-09-02 08:53:56.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-lf-header/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- F S UID PID PPID C PRI NI ADDR SZ WCHAN STIME TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/unix-lf-header/setup procps-3.1.15/test/ps/unix-lf-header/setup -+--- procps-3.1.15.old/test/ps/unix-lf-header/setup 2003-09-02 08:55:39.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-lf-header/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-lf" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/unix-o-header-all/header procps-3.1.15/test/ps/unix-o-header-all/header -+--- procps-3.1.15.old/test/ps/unix-o-header-all/header 2003-09-02 09:23:24.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-o-header-all/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- COMMAND COMMAND ELAPSED GROUP NI %CPU PGID PID PPID RGROUP RUSER TIME TT USER VSZ -+diff -ruN procps-3.1.15.old/test/ps/unix-o-header-all/setup procps-3.1.15/test/ps/unix-o-header-all/setup -+--- procps-3.1.15.old/test/ps/unix-o-header-all/setup 2003-09-02 09:23:11.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-o-header-all/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o args,comm,etime,group,nice,pcpu,pgid,pid,ppid,rgroup,ruser,time,tty,user,vsz" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/unix-o-header-dup/header procps-3.1.15/test/ps/unix-o-header-dup/header -+--- procps-3.1.15.old/test/ps/unix-o-header-dup/header 2003-09-02 09:16:50.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-o-header-dup/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TT PID PPID -+diff -ruN procps-3.1.15.old/test/ps/unix-o-header-dup/setup procps-3.1.15/test/ps/unix-o-header-dup/setup -+--- procps-3.1.15.old/test/ps/unix-o-header-dup/setup 2003-09-02 09:16:22.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-o-header-dup/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o pid,tty -o pid,ppid" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/unix-o-header-evil/header procps-3.1.15/test/ps/unix-o-header-evil/header -+--- procps-3.1.15.old/test/ps/unix-o-header-evil/header 2003-09-02 12:39:36.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-o-header-evil/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PPID PID FOO,tty PPID -+diff -ruN procps-3.1.15.old/test/ps/unix-o-header-evil/setup procps-3.1.15/test/ps/unix-o-header-evil/setup -+--- procps-3.1.15.old/test/ps/unix-o-header-evil/setup 2003-09-02 12:39:19.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-o-header-evil/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-o ppid -o pid,ppid=FOO,tty -o ppid" -+-GOOD=0 -+diff -ruN procps-3.1.15.old/test/ps/unix-o-header-nil/setup procps-3.1.15/test/ps/unix-o-header-nil/setup -+--- procps-3.1.15.old/test/ps/unix-o-header-nil/setup 2003-09-02 10:08:33.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-o-header-nil/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,7 +0,0 @@ -+-ARGS="-o pid=" -+-GOOD=0 -+-EVALFN=1 -+- -+-evalfn () { -+- ! grep PID stdout >> /dev/null -+-} -+diff -ruN procps-3.1.15.old/test/ps/unix-selection/header procps-3.1.15/test/ps/unix-selection/header -+--- procps-3.1.15.old/test/ps/unix-selection/header 2003-09-04 16:13:48.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-selection/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- PID TTY TIME CMD -+diff -ruN procps-3.1.15.old/test/ps/unix-selection/setup procps-3.1.15/test/ps/unix-selection/setup -+--- procps-3.1.15.old/test/ps/unix-selection/setup 2003-09-13 14:00:48.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-selection/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,25 +0,0 @@ -+-ARGS= -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-rm -f misc.tmp ready.tmp typescript.tmp -+- -+-./got-no-tty -+-# this'll do but... WHERE ARE THE MAN PAGES FOR PTY STUFF??? -+-(SHELL=`pwd`/script-child script typescript.tmp &>/dev/null) & -+-while [ ! -f ready.tmp ] ; do sleep 0.01 ; done -+-. ready.tmp -+- -+-evalfn () { -+- THIS_TTY=`tty | colrm 1 5` -+- lines1=`awk '{print $2}' < stdout | sort -u | egrep "^($THIS_TTY)$" | wc -l` -+- lines3=`awk '{print $2}' < stdout | sort -u | egrep "^($SHELL_TTY|$THIS_TTY|\?)$" | wc -l` -+- [ $lines1 == 1 ] && [ $lines3 == 1 ] -+-} -+- -+-killfn () { -+- killall -9 got-no-tty -+- kill -9 $SHELL_PID # the others should freely die -+- rm -f misc.tmp ready.tmp typescript.tmp -+-} -+diff -ruN procps-3.1.15.old/test/ps/unix-tty-default/setup procps-3.1.15/test/ps/unix-tty-default/setup -+--- procps-3.1.15.old/test/ps/unix-tty-default/setup 2003-09-02 11:36:37.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-tty-default/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS= -+-GOOD=0 -+-EVALFN=1 -+- -+-# default output is restricted to this tty -+-MYTTY=`tty` -+- -+-evalfn () { -+- PSTTY=`awk '!/TTY/{print $2}' < stdout | uniq` -+- if [ /dev/$PSTTY != $MYTTY ] ; then -+- return 1 -+- fi -+- return 0 -+-} -+diff -ruN procps-3.1.15.old/test/ps/unix-tty-name/setup procps-3.1.15/test/ps/unix-tty-name/setup -+--- procps-3.1.15.old/test/ps/unix-tty-name/setup 2003-09-02 10:42:55.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-tty-name/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,9 +0,0 @@ -+-ARGS="-otty= -p$$" -+-GOOD=0 -+-EVALFN=1 -+- -+-evalfn () { -+- MYTTY=`tty` -+- PSTTY=`printf /dev/ ; cat stdout` -+- [ $MYTTY == $PSTTY ] -+-} -+diff -ruN procps-3.1.15.old/test/ps/unix-tty-names/setup procps-3.1.15/test/ps/unix-tty-names/setup -+--- procps-3.1.15.old/test/ps/unix-tty-names/setup 2003-09-02 11:17:09.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-tty-names/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,26 +0,0 @@ -+-ARGS="-eotty=" -+-GOOD=0 -+-EVALFN=1 -+- -+-# the UNIX spec allows: -+-# -+-# /dev/ttyS0 as ttyS0 -+-# /dev/ttyS0 as S0 (OK to chop a leading "tty") -+-# /dev/console as console -+-# /foo/bar as bar or /foo/bar (poorly unspecified) -+-# -nothing- as ? or - (poorly unspecified, we use '?') -+-# -+-# Also, the format must agree with what "who" uses. -+-# Linux "who" doesn't strip "tty" off of /dev/ttyS0, etc., -+-# so that's illegal in a Linux environment. -+-# -+-# junk the '?' to avoid shell wildcard expansion -+- -+-evalfn () { -+- for i in `tr -d '?' < stdout | sort -u` ; do -+- if [ ! -c /dev/$i -a ! -c /$i ] ; then -+- return 1 -+- fi -+- done -+- return 0 -+-} -+diff -ruN procps-3.1.15.old/test/ps/unix-vsz/setup procps-3.1.15/test/ps/unix-vsz/setup -+--- procps-3.1.15.old/test/ps/unix-vsz/setup 2003-09-11 10:24:38.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-vsz/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,27 +0,0 @@ -+-# The standard describes the "vsz" format as: -+-# The size of the process in (virtual) memory -+-# in 1024 byte units as a decimal integer. -+-# -+-# It's hard to tell 1000-byte from 1024-byte units, -+-# but easy to tell 1024-byte from 512-byte or 2 kB. -+-# On a 64-bit system, watch for 4 GB troubles as well. -+- -+-# throw in the PID to ensure whitespace on the left -+-ARGS="-C gigabyte -o pid= -o vsz=" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-BITSIZE=`./gigabyte` -+- -+-evalfn () { -+- if [ $BITSIZE == 32bit ] ; then -+- egrep ' 1......$' stdout >> /dev/null -+- else -+- egrep ' 1.......$' stdout >> /dev/null -+- fi -+-} -+- -+-killfn () { -+- killall -9 gigabyte -+-} -+diff -ruN procps-3.1.15.old/test/ps/unix-wchan/setup procps-3.1.15/test/ps/unix-wchan/setup -+--- procps-3.1.15.old/test/ps/unix-wchan/setup 2003-09-02 12:25:15.000000000 +1000 -++++ procps-3.1.15/test/ps/unix-wchan/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,11 +0,0 @@ -+-ARGS="-eowchan=" -+-GOOD=0 -+-EVALFN=1 -+- -+-# Make sure we're getting back real wchan data, -+-# not just "WCHAN", "-", "0", "*", and hex digits. -+-# Assumes usage of letters [g-z]. -+- -+-evalfn () { -+- egrep '[g-z]' stdout >> /dev/null -+-} -+diff -ruN procps-3.1.15.old/test/ps/y-needs-l/header procps-3.1.15/test/ps/y-needs-l/header -+--- procps-3.1.15.old/test/ps/y-needs-l/header 2003-10-02 12:10:34.000000000 +1000 -++++ procps-3.1.15/test/ps/y-needs-l/header 1970-01-01 10:00:00.000000000 +1000 -+@@ -1 +0,0 @@ -+- -+\ No newline at end of file -+diff -ruN procps-3.1.15.old/test/ps/y-needs-l/setup procps-3.1.15/test/ps/y-needs-l/setup -+--- procps-3.1.15.old/test/ps/y-needs-l/setup 2003-10-02 12:10:45.000000000 +1000 -++++ procps-3.1.15/test/ps/y-needs-l/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,2 +0,0 @@ -+-ARGS="-y" -+-GOOD=1 -+diff -ruN procps-3.1.15.old/test/ps/y-needs-l/stderr procps-3.1.15/test/ps/y-needs-l/stderr -+--- procps-3.1.15.old/test/ps/y-needs-l/stderr 2003-10-02 12:10:56.000000000 +1000 -++++ procps-3.1.15/test/ps/y-needs-l/stderr 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,23 +0,0 @@ -+-ERROR: Modifier -y without format -l makes no sense. -+-********* simple selection ********* ********* selection by list ********* -+--A all processes -C by command name -+--N negate selection -G by real group ID (supports names) -+--a all w/ tty except session leaders -U by real user ID (supports names) -+--d all except session leaders -g by session leader OR by group name -+--e all processes -p by process ID -+-T all processes on this terminal -s processes in the sessions given -+-a all w/ tty, including other users -t by tty -+-g all, even group leaders! -u by effective user ID (supports names) -+-r only running processes U processes for specified users -+-x processes w/o controlling ttys t by tty -+-*********** output format ********** *********** long options *********** -+--o,o user-defined -f full --Group --User --pid --cols --ppid -+--j,j job control s signal --group --user --sid --rows -+--O,O preloaded -o v virtual memory --cumulative --format --deselect -+--l,l long u user-oriented --sort --tty --forest --version -+--F extra full X registers --heading --no-heading -+- ********* misc options ********* -+--V,V show version L list format codes f ASCII art forest -+--m,m show threads S children in sum -y change -l format -+--n,N set namelist file c true command name n numeric WCHAN,UID -+--w,w wide output e show environment -H process hierarchy -+diff -ruN procps-3.1.15.old/test/ps/zombie-args/setup procps-3.1.15/test/ps/zombie-args/setup -+--- procps-3.1.15.old/test/ps/zombie-args/setup 2003-09-04 13:43:31.000000000 +1000 -++++ procps-3.1.15/test/ps/zombie-args/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,18 +0,0 @@ -+-ARGS="-H -C the_living_dead -o args" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-# the -H is just to ensure predictable output ordering -+- -+-# assumes that the processes won't get swapped out before ps runs -+- -+-./the_living_dead -+- -+-evalfn () { -+- diff -Naurd stdout $TESTNAME/stdout >> /dev/null -+-} -+- -+-killfn () { -+- killall -9 the_living_dead -+-} -+diff -ruN procps-3.1.15.old/test/ps/zombie-args/stdout procps-3.1.15/test/ps/zombie-args/stdout -+--- procps-3.1.15.old/test/ps/zombie-args/stdout 2003-09-04 13:44:01.000000000 +1000 -++++ procps-3.1.15/test/ps/zombie-args/stdout 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,3 +0,0 @@ -+-COMMAND -+-./the_living_dead -+- [the_living_dead] <defunct> -+diff -ruN procps-3.1.15.old/test/ps/zombie-comm/setup procps-3.1.15/test/ps/zombie-comm/setup -+--- procps-3.1.15.old/test/ps/zombie-comm/setup 2003-09-04 13:43:44.000000000 +1000 -++++ procps-3.1.15/test/ps/zombie-comm/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,16 +0,0 @@ -+-ARGS="-H -C the_living_dead -o comm" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-# the -H is just to ensure predictable output ordering -+- -+-./the_living_dead -+- -+-evalfn () { -+- diff -Naurd stdout $TESTNAME/stdout >> /dev/null -+-} -+- -+-killfn () { -+- killall -9 the_living_dead -+-} -+diff -ruN procps-3.1.15.old/test/ps/zombie-comm/stdout procps-3.1.15/test/ps/zombie-comm/stdout -+--- procps-3.1.15.old/test/ps/zombie-comm/stdout 2003-09-04 13:44:12.000000000 +1000 -++++ procps-3.1.15/test/ps/zombie-comm/stdout 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,3 +0,0 @@ -+-COMMAND -+-the_living_dead -+- the_living_dead <defunct> -+diff -ruN procps-3.1.15.old/test/ps/zombie-wchan/setup procps-3.1.15/test/ps/zombie-wchan/setup -+--- procps-3.1.15.old/test/ps/zombie-wchan/setup 2003-09-04 13:52:41.000000000 +1000 -++++ procps-3.1.15/test/ps/zombie-wchan/setup 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,14 +0,0 @@ -+-ARGS="-C the_living_dead -o wchan,stat,comm" -+-GOOD=0 -+-EVALFN=1 -+-KILLFN=1 -+- -+-./the_living_dead -+- -+-evalfn () { -+- egrep 'exit.*Z.*defunct' stdout >> /dev/null -+-} -+- -+-killfn () { -+- killall -9 the_living_dead -+-} -+diff -ruN procps-3.1.15.old/test/runtests procps-3.1.15/test/runtests -+--- procps-3.1.15.old/test/runtests 2003-09-03 12:09:08.000000000 +1000 -++++ procps-3.1.15/test/runtests 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,4 +0,0 @@ -+-#!/bin/bash -+- -+-export TESTME=${PSPROG:-../ps/ps} -+-for i in ps/*-* ; do ./onetest $i ; done -+diff -ruN procps-3.1.15.old/test/script-child procps-3.1.15/test/script-child -+--- procps-3.1.15.old/test/script-child 2003-09-04 14:43:28.000000000 +1000 -++++ procps-3.1.15/test/script-child 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,10 +0,0 @@ -+-#!/bin/bash -+-# -+-# usage: -+-# SHELL=/path/to/this/script script trashfile -+- -+-echo SCRIPT_PID=$PPID > misc.tmp -+-echo SHELL_PID=$$ >> misc.tmp -+-echo SHELL_TTY=`/usr/bin/tty | colrm 1 5` >> misc.tmp -+-mv misc.tmp ready.tmp # atomic op -+-while /bin/true ; do sleep 42 ; done -+diff -ruN procps-3.1.15.old/test/sid-breaks-ttys.c procps-3.1.15/test/sid-breaks-ttys.c -+--- procps-3.1.15.old/test/sid-breaks-ttys.c 2003-09-08 13:28:24.000000000 +1000 -++++ procps-3.1.15/test/sid-breaks-ttys.c 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,38 +0,0 @@ -+-#include <sys/types.h> -+-#include <unistd.h> -+-#include <signal.h> -+- -+-static pid_t one; -+- -+-static void die(int signo){ -+- (void)signo; -+- _exit(0); -+-} -+- -+-static void hang(void){ -+- for(;;) pause(); -+-} -+- -+-int main(int argc, char *argv[]){ -+- (void)argc; -+- (void)argv; -+- -+- one = getpid(); -+- signal(SIGHUP,die); -+- if(fork()) hang(); // parent later killed as readyness signal -+- -+- // second one exits, to enable setsid(), and the resulting -+- // zombie will be reaped by init after 1st process killed -+- if(fork()) _exit(0); -+- -+- if(setsid()==-1){ -+- kill(one,SIGKILL); // hopefully the shell will complain -+- _exit(42); // kind of tough to report errors -+- } -+- -+- kill(one,SIGHUP); // let the shell know we're ready -+- -+- hang(); -+- -+- return 0; -+-} -+diff -ruN procps-3.1.15.old/test/sidious.c procps-3.1.15/test/sidious.c -+--- procps-3.1.15.old/test/sidious.c 2003-09-08 13:58:20.000000000 +1000 -++++ procps-3.1.15/test/sidious.c 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,77 +0,0 @@ -+-// ps fTo sess,pgid,pid,tty,ppid,tpgid,args -C a.out -+- -+-#include <sys/types.h> -+-#include <unistd.h> -+-#include <signal.h> -+-#include <sys/stat.h> -+-#include <fcntl.h> -+-#include <stdlib.h> // undocumented grantpt,unlockpt,ptsname,openpt,posix_openpt -+-//#include <pty.h> // undocumented openpty,forkpty -+- -+-static pid_t one; -+- -+-static void die(int signo){ -+- (void)signo; -+- _exit(0); -+-} -+- -+-//static void sigchld_handler(int signo){ -+-// (void)signo; -+-// kill(one,SIGHUP); // kill parent -+-//} -+- -+-static void hang(void){ -+- for(;;) pause(); -+-} -+- -+-int main(int argc, char *argv[]){ -+- int master; -+- int slave; -+- -+- (void)argc; -+- (void)argv; -+- -+- one = getpid(); -+- signal(SIGHUP,die); -+- if(fork()) hang(); // parent later killed as readyness signal -+- -+- // second one exits, to enable setsid(), and the resulting -+- // zombie will be reaped by init after 1st process killed -+- if(fork()) _exit(0); -+- -+- -+- master = open("/dev/ptmx", O_RDWR|O_NOCTTY); -+- -+- // could fork, but don't bother -+- // (won't be doing anything with the master side) -+- -+- // could change child's UID, but don't bother -+- // (would make the tests require running as root) -+- -+- // not in the man pages!!! -+- grantpt(master); -+- unlockpt(master); -+- -+- if(setsid()==-1){ -+- kill(one,SIGKILL); // hopefully the shell will complain -+- _exit(42); // kind of tough to report errors -+- } -+- -+- slave = open(ptsname(master), O_RDWR); -+-#ifdef I_PUSH -+- // push STREAMS tty stuff, just to have an example of it -+- ioctl(slave, I_PUSH, "ptem"); -+- ioctl(slave, I_PUSH, "ldterm"); -+-#endif -+-#ifdef TIOCSCTTY -+- // On SysV, slave open got us a TTY. On BSD, we must do this: -+- ioctl(fd, TIOCSCTTY, NULL); -+-#endif -+- -+- -+- kill(one,SIGHUP); // let the shell know we're ready -+- -+- hang(); -+- -+- return 0; -+-} -+diff -ruN procps-3.1.15.old/test/th.c procps-3.1.15/test/th.c -+--- procps-3.1.15.old/test/th.c 2003-09-14 01:35:42.000000000 +1000 -++++ procps-3.1.15/test/th.c 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,16 +0,0 @@ -+-#include <unistd.h> -+-#include <pthread.h> -+- -+-void *hanger(void *vp){ -+- (void)vp; -+- for(;;) pause(); -+-} -+- -+-int main(int argc, char *argv[]){ -+- pthread_t thread; -+- (void)argc; -+- (void)argv; -+- pthread_create(&thread, NULL, hanger, NULL); -+- hanger(NULL); -+- return 0; // keep gcc happy -+-} -+diff -ruN procps-3.1.15.old/test/the_living_dead.c procps-3.1.15/test/the_living_dead.c -+--- procps-3.1.15.old/test/the_living_dead.c 2003-09-04 13:36:54.000000000 +1000 -++++ procps-3.1.15/test/the_living_dead.c 1970-01-01 10:00:00.000000000 +1000 -+@@ -1,39 +0,0 @@ -+-#include <sys/types.h> -+-#include <unistd.h> -+-#include <signal.h> -+- -+-static pid_t one; -+- -+-static void die(int signo){ -+- (void)signo; -+- _exit(0); -+-} -+- -+-static void sigchld_handler(int signo){ -+- (void)signo; -+- kill(one,SIGHUP); // kill parent -+-} -+- -+-static void hang(void){ -+- for(;;) pause(); -+-} -+- -+-int main(int argc, char *argv[]){ -+- pid_t three; -+- -+- (void)argc; -+- (void)argv; -+- -+- one = getpid(); -+- signal(SIGHUP,die); -+- if(fork()) hang(); // parent later killed as readyness signal -+- -+- three = fork(); -+- if(three){ -+- signal(SIGCHLD,sigchld_handler); -+- kill(three,SIGHUP); // create the zombie -+- } -+- -+- hang(); -+- return 0; -+-} ---- procps-3.1.15.orig/debian/control -+++ procps-3.1.15/debian/control -@@ -0,0 +1,31 @@ -+Source: procps -+Section: base -+Priority: required -+Maintainer: Craig Small <csmall@debian.org> -+Build-Depends: debhelper (>> 4.1.1), libncurses5-dev, make (>= 3.78.1-8), dpatch -+Standards-Version: 3.6.0 -+ -+Package: procps -+Architecture: any -+Provides: watch -+Depends: ${shlibs:Depends} -+Conflicts: watch, libproc-dev (<< 1:1.2.6-2), w-bassman (<< 1.0-3), procps-nonfree, pgrep (<< 3.3-5) -+Replaces: watch, bsdutils (<< 2.9x-1) -+Recommends: psmisc -+Description: The /proc file system utilities -+ These are utilities to browse the /proc filesystem, which is not a real file -+ system but a way for the kernel to provide information about the status of -+ entries in its process table. (e.g. running, stopped or "zombie") -+ Both command line and full screen utilities are provided. Ncurses is needed -+ for the full screen utilities. More information can be found at procps -+ website http://procps.sf.net/ -+ -+Package: libproc-dev -+Architecture: any -+Section: libdevel -+Priority: optional -+Depends: libc6-dev, procps (= ${Source-Version}) -+Description: library for accessing process information from /proc -+ These are the header files for libproc. Some packages using libproc -+ to access process information from /proc need these to compile. -+ ---- procps-3.1.15.orig/debian/rules -+++ procps-3.1.15/debian/rules -@@ -0,0 +1,99 @@ -+#!/usr/bin/make -f -+# Sample debian/rules that uses debhelper. -+# GNU copyright 1997 to 1999 by Joey Hess. -+ -+# Uncomment this to turn on verbose mode. -+#export DH_VERBOSE=1 -+ -+# Include dpatch stuff -+include /usr/share/dpatch/dpatch.make -+ -+PACKAGE="procps" -+ -+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) -+ INSTALL_PROGRAM += -s -+endif -+ -+ -+build: build-stamp -+ -+build-stamp: patch-stamp -+ dh_testdir -+ -+ # Add here commands to compile the package. -+ mkdir static -+ SHARED=0 $(MAKE) proc/libproc.a -+ mv proc/libproc.a static -+ $(MAKE) clean -+ $(MAKE) W_SHOWFROM=\-DW_SHOWFROM -+ -+ touch build-stamp -+ -+clean: clean1 unpatch -+clean1: -+ dh_testdir -+ dh_testroot -+ rm -f build-stamp -+ -+ # Add here commands to clean up after the build process. -+ -$(MAKE) clean -+ -rm -rf static -+ -+ dh_clean -+ -+install: build -+ dh_testdir -+ dh_testroot -+ dh_clean -k -+ dh_installdirs -+ -+ # Add here commands to install the package into debian/procps. -+ $(MAKE) ln_f="ln -sf" ldconfig=echo DESTDIR=$(CURDIR)/debian/procps install -+ install --mode 644 -o root -g root debian/sysctl.conf $(CURDIR)/debian/procps/etc -+ # Rename w as there are two of them -+ (cd $(CURDIR)/debian/procps/usr/bin && mv w w.procps ) -+ (cd $(CURDIR)/debian/procps/usr/share/man/man1 && mv w.1 w.procps.1 ) -+ -+ # Work-around until proc includes fixed -+ (cp proc/*.h $(CURDIR)/debian/procps/usr/include/proc) -+ cp static/libproc.a $(CURDIR)/debian/libproc-dev/usr/lib -+ -+ dh_movefiles --sourcedir=debian/procps -+ rmdir $(CURDIR)/debian/procps/usr/include/proc -+ -+# Build architecture-independent files here. -+binary-indep: build install -+# We have nothing to do by default. -+ -+# Build architecture-dependent files here. -+binary-arch: build install -+ dh_testdir -+ dh_testroot -+# dh_installdebconf -+ dh_installdocs -+ dh_installexamples -+ dh_installmenu -+# dh_installlogrotate -+# dh_installemacsen -+# dh_installpam -+# dh_installmime -+ dh_installinit --update-rcd-params='start 30 S .' --init-script='procps.sh' -+# dh_installcron -+ dh_installman -+ dh_installinfo -+# dh_undocumented -+ dh_installchangelogs NEWS -+ dh_link -+ dh_strip -+ dh_compress -+ dh_fixperms -+ dh_makeshlibs -V "procps (>= 3.1.14), procps (<< 3.1.15)" -+ dh_installdeb -+# dh_perl -+ dh_shlibdeps -Lprocps -ldebian/procps/lib -+ dh_gencontrol -+ dh_md5sums -+ dh_builddeb -+ -+binary: binary-indep binary-arch -+.PHONY: build clean binary-indep binary-arch binary install patch unpatch clean1 ---- procps-3.1.15.orig/debian/changelog -+++ procps-3.1.15/debian/changelog -@@ -0,0 +1,743 @@ -+procps (1:3.1.15-2) unstable; urgency=low -+ -+ * Removed offending test directory Closes: #227933 -+ -+ -- Craig Small <csmall@debian.org> Tue, 20 Jan 2004 10:20:44 +1100 -+ -+procps (1:3.1.15-1) unstable; urgency=low -+ -+ * Now uses dpatch to handle the various patches -+ * New upstream release -+ - Supports SELINUX flags for kernel v2.6 Closes: #193648 -+ - Hide kernel PID bug Closes: #217278, #219730, #217525, #224470 -+ - Fixed top auto-margins problem Closes: #217559 -+ * Fix top manual page Closes: #225089 -+ * Patch so SELINUX flags work in v2.4 kernels -+ * Extra +s in ps.1 removed Closes: #218220 -+ * Added patch so sysctl has quiet -q flag Closes: #189100 -+ -+ -- Craig Small <csmall@debian.org> Fri, 26 Dec 2003 18:02:59 +1100 -+ -+procps (1:3.1.14-1) unstable; urgency=low -+ -+ * New upstream release -+ -+ -- Craig Small <csmall@debian.org> Wed, 22 Oct 2003 11:59:53 +1000 -+ -+procps (1:3.1.13-1) unstable; urgency=low -+ -+ * New upstream release -+ -+ -- Craig Small <csmall@debian.org> Wed, 24 Sep 2003 16:10:42 +1000 -+ -+procps (1:3.1.12-1) unstable; urgency=low -+ -+ * New upstream release -+ ps: $PS_FORMAT works properly Closes: #201575 -+ man page: /var/run/utmp, not /etc/utmp Closes: #206583 -+ required flags moved out of CFLAGS Closes: #205429 -+ -+ -+ -- Craig Small <csmall@debian.org> Sat, 13 Sep 2003 21:11:09 +1000 -+ -+procps (1:3.1.11-2) unstable; urgency=low -+ -+ * Made shlibs have a specific version Closes: #199118 -+ * libproc.a is back in libproc-dev, use it -+ * Added README to libproc-dev for people who use the library -+ -+ -- Craig Small <csmall@debian.org> Wed, 20 Aug 2003 15:31:59 +1000 -+ -+procps (1:3.1.11-1) unstable; urgency=low -+ -+ * 3.1.11 New upstream version -+ - handle GPLONLY_ symbols Closes: #143549, #188374 -+ * freeproc now defined Closes: #189047 -+ * warning in readproc.c fixed Closes: #197346 -+ * Removed optarg and optind defines Closes: #197343 -+ * Fixed saved_start_time warning Closes: #197342 -+ -+ -- Craig Small <csmall@debian.org> Thu, 24 Jul 2003 17:02:36 +1000 -+ -+procps (1:3.1.9-1) unstable; urgency=low -+ -+ * New upstream source -+ * memory sizes fixed for 64-bit w/ gcc 3.x Closes: #194376, #191933 -+ * Doesn't segfault if /proc not mounted Closes: #172735 -+ * No warning in top about memory key Closes: #188271 -+ * More info in kill man page Closes: #182414 -+ * Document the different oO options Closes: #169301 -+ * Updated stabndards version to 3.5.9 -+ * Changed disk to backing storage Closes: #175925 -+ -+ -- Craig Small <csmall@debian.org> Mon, 2 Jun 2003 02:31:03 +1000 -+ -+procps (1:3.1.8-1) unstable; urgency=low -+ -+ * New upstream release -+ watch man page fixed, Closes #182246 -+ * Changed section for libproc-dev -+ -+ -- Craig Small <csmall@debian.org> Tue, 1 Apr 2003 10:19:05 +1000 -+ -+procps (1:3.1.6-1) unstable; urgency=low -+ -+ * New upstream release -+ - watch has --no-title option Closes: #179862 -+ - ps -C can compare very long names Closes: #178127 -+ * Fixed descriptions in manual pages Closes: #179046 -+ * w wont crash if /proc unreadable Closes: #169398 -+ -+ -- Craig Small <csmall@debian.org> Sat, 22 Feb 2003 21:33:45 +1100 -+ -+procps (1:3.1.5-1) unstable; urgency=low -+ -+ * New upstream version -+ - watch don't drop empty lines Closes: #171005 -+ - top has old sort keys Closes: #167249 -+ - now count Inact_laundry as needed Closes: #172163 -+ -+ -- Craig Small <csmall@debian.org> Mon, 6 Jan 2003 13:49:32 +1100 -+ -+procps (1:3.1.3-1) unstable; urgency=low -+ -+ * New upstream source -+ -+ -- Craig Small <csmall@debian.org> Fri, 13 Dec 2002 16:16:36 +1100 -+ -+procps (1:3.1.1-1) unstable; urgency=low -+ -+ * New upstream source -+ - vmstats reports memort counts Closes: #169774 -+ -+ -- Craig Small <csmall@debian.org> Wed, 4 Dec 2002 15:57:13 +1100 -+ -+procps (1:3.1.0-1) unstable; urgency=low -+ -+ * New upstream version -+ - vmstat displays IO-wait time instead of bogus "w" -+ - when IO-wait hidden, count as idle, not as sys -+ - pmap command added (like Sun has) -+ * Manual pages cleaned up Closes: #165970, #164481 -+ -+ -- Craig Small <csmall@debian.org> Mon, 11 Nov 2002 12:03:46 +1100 -+ -+procps (1:3.0.5-1) unstable; urgency=low -+ -+ * New upstream version -+ - top tolerates super-wide displays Closes: #165497 -+ - ELF note warning gone for some kernels Closes: #165900 -+ - Fix ps and top man pages a bit, dropped bugs severity. -+ -+ -- Craig Small <csmall@debian.org> Tue, 29 Oct 2002 22:04:36 +1100 -+ -+procps (1:3.0.4-1) unstable; urgency=low -+ -+ * New upstream version -+ - ELF note warning removed Closes: #165093, #165343 -+ - top works for most TERM= settings Closes: #164864, #164956 -+ * w has FROM column again by default Closes: #165252 -+ * debhelper dependency version fixed Closes: #165083 -+ * ps.1 looks a bit better now Closes: #16448 -+ -+ -- Craig Small <csmall@debian.org> Mon, 21 Oct 2002 08:30:04 +1000 -+ -+procps (1:3.0.3-1) unstable; urgency=low -+ -+ * New upstream version -+ - w works with KOI8 locale Closes: #153043 -+ - fix top for non-SMP 2.2.xx and 2.0.xx Closes: #164231 -+ - negative idle time fixed Closes: #126260 -+ - sysctl handles new vlan interface Closes: #140386 -+ - vmstat documentation update Closes: #157935, #155684 -+ - "skill -n blah blah blah" lets you test options Closes: #158630 -+ - fixed ps --sort crash Closes: #164226 -+ - vmstat compiles with latest gcc-3.x Closes: #164348 -+ - bad (int*) cast in top removed Closes: #164468 -+ - Support new/improved statistics interfaces in 2.5 /proc Closes: #164013 -+ - top defaults to old layout and sort by pid Closes: #164277 -+ - rant moved out of top.1 man page Closes: #164520 -+ - top runs much faster Closes: #87779 -+ -+ -- Craig Small <csmall@debian.org> Sat, 12 Oct 2002 21:44:23 +1000 -+ -+procps (1:3.0.0-2) unstable; urgency=low -+ -+ * Fixed pkill and skill, auto* is so broken. Closes: #163940, #163944 -+ * Moved libproc.so.3 into /lib as it's needed early Closes: #163981,#163899 -+ -+ -- Craig Small <csmall@debian.org> Thu, 10 Oct 2002 07:19:45 +1000 -+ -+procps (1:3.0.0-1) unstable; urgency=low -+ -+ * New upstream source Closes: #163698 -+ - top has SMP Closes: #162316, #62282, #94896, #98277, #117040, #117735 -+ - SELINUX support Closes: #142892 -+ - top defaults to signal 15 to kill pids with Closes: #72158 -+ - 64-bit time reduces the overflow problem Closes: #82382, #155908 -+ - "w" program better at determining what a user is doing -+ Closes: #88758, 115529 -+ - oldps is gone Closes: #101917 -+ - Handles /proc/tty/drivers Closes: #108654, #154046 -+ - Supports scanf where locale uses , for decimal point Closes: #126873 -+ - uptime --help now calls itself uptime Closes: #128880 -+ - ps faster Closes: #147731 -+ - top calculates screen better Closes: #162296 -+ - top allows sorts by pid or swapped memory Closes: #79868, #159446 -+ - support for s/390 Closes: #126295 -+ - statm buffer size increased Closes: #145085 -+ - new top has no typos Closes: #148918 -+ - new top can handle lots of tasks Closes: #70900 -+ * Fixed init.d file so it follows policy Closes: #121945 -+ -+ -- Craig Small <csmall@debian.org> Tue, 8 Oct 2002 12:29:45 +1000 -+ -+procps (1:2.0.7-10) unstable; urgency=low -+ -+ * Fixes ps crash when system.map is exact multiple of 1024 -+ Thankyou Colin for the patch! Closes: #109237, #142292 -+ -+ -- Craig Small <csmall@eye-net.com.au> Fri, 12 Apr 2002 21:02:04 +1000 -+ -+procps (1:2.0.7-9) unstable; urgency=low -+ -+ * Sanity checking for Number of CPU Closes: #127561, #122617 -+ This will keep the m68k and ARM boys happy. -+ * uptime usage fixed Closes: #138351 -+ * kill man page NAME updated Closes: #119400 -+ * Better explanation for load average in uptime(1) Closes: #140902 -+ * utmp in correct location in w(1) Closes: #115725 -+ -+ -- Craig Small <csmall@eye-net.com.au> Mon, 8 Apr 2002 14:18:20 +1000 -+ -+procps (1:2.0.7-8) unstable; urgency=low -+ -+ * Removed -ggdb Closes: #117203 -+ -+ -- Craig Small <csmall@eye-net.com.au> Sat, 27 Oct 2001 07:02:38 +1000 -+ -+procps (1:2.0.7-7) unstable; urgency=low -+ -+ * Added os/390 patches Closes: #113494 -+ * w manpage now gives correct location for utmp Closes: #110723 -+ * watch wrap-around problem fixed Closes: #111759 -+ * Programs are compilied -O2 Closes: #108652 -+ -+ -- Craig Small <csmall@eye-net.com.au> Wed, 26 Sep 2001 08:08:43 +1000 -+ -+procps (1:2.0.7-6) unstable; urgency=low -+ -+ * Re-fixed command line interpretation Closes: #103101 -+ -+ -- Craig Small <csmall@eye-net.com.au> Tue, 10 Jul 2001 17:32:02 +1000 -+ -+procps (1:2.0.7-5) unstable; urgency=low -+ -+ * watch now copys strings better. Closes: #95404, #97948, #99780 -+ * skill.1 loads tbl Closes: #92242, #67899 -+ * long usernames are shown Closes: #86205, #94957 -+ * Remove /etc/rcS.d/S30procps with good ole rm Closes: #92184 -+ * /etc/init.d/procps.sh calls itself that Closes: #93302 -+ * Cannot write config in secure mode Closes: #93948 -+ -+ -- Craig Small <csmall@debian.org> Sun, 29 Apr 2001 14:55:20 +1000 -+ -+procps (1:2.0.7-4) unstable; urgency=low -+ -+ * watch doesnt crash with long command lines Closes: #88592, #87693 -+ * bumped up a buffer in a proc read Closes: #85775 -+ * Now we use 24 hour time Closes: #85640 -+ * pgrep calls itself pgrep Closes: #86630 -+ * Corrected symlink in libproc-dev Closes: #87865 -+ -+ -- Craig Small <csmall@debian.org> Mon, 19 Mar 2001 10:13:27 +1100 -+ -+procps (1:2.0.7-3) unstable; urgency=low -+ -+ * Conflicts with pgrep, so no more conflicts Closes: #82835 -+ * Minor fixes to ps.1 manpage Closes: #81921 -+ * watch highlighs correctly Closes: #77737 -+ * top wont die with evil HOMEs, Closes: #81452 -+ * removed reference to suidregister -+ * Remore -L reference in kill.1 Closes: #85913 -+ -+ -- Craig Small <csmall@debian.org> Thu, 8 Feb 2001 12:44:58 +1100 -+ -+procps (1:2.0.7-2) unstable; urgency=medium -+ -+ * Moved kill back again, dammit why is the makefile so broken -+ Closes: #82747 -+ * Watch uses locale Closes: #82739 -+ * top's scanf is protected from evil locale problems Closes: #82671, #69128 -+ (Big thankyou to Guillaume for lending a test account) -+ -+ -- Craig Small <csmall@debian.org> Fri, 19 Jan 2001 09:15:36 +1100 -+ -+procps (1:2.0.7-1) unstable; urgency=medium -+ -+ * New upstream version (010114) -+ - Merges 2.0.7 code from RedHat Closes: #80832 -+ - Made note that Shared memory report will be junk due to kernel -+ Closes: #77818 -+ - Remove html and null stuff from man page Closes: #81920 -+ - vsize is kB in man page Closes: #82210 -+ - man pages look better Closes: #70055, #70941 -+ - vmstat increase Closes: #77886 -+ - w tries harder to find things Closes: #24531 -+ - 15 char user names Closes: #71211 -+ * No HOME overflow in top Closes: 81452 -+ * Added menu Hints Closes: #80051, #82324 -+ -+ -+ -- Craig Small <csmall@debian.org> Wed, 17 Jan 2001 08:57:24 +1100 -+ -+procps (1:2.0.6-9) unstable; urgency=medium -+ -+ * added libncurses5-dev to build-depends, Closes: #67533 -+ * Put kill back into /bin Closes #67580, #67582 -+ * Put 2.0.6-7 ps.1 back in Closes: #67451 -+ -+ -- Craig Small <csmall@debian.org> Tue, 25 Jul 2000 08:13:21 +1000 -+ -+procps (1:2.0.6-8) unstable; urgency=low -+ -+ * New upstream source: -+ * - sysctl EOF bug fixed Closes: #62877 -+ * - stop crashes with unmounted /proc Closes: #63512, #55177 -+ * - Versions checking tolerates RH /proc/ksyms Closes: #59798 -+ * - Top works better with SMP Closes: #34734, #56547, #59703 -+ -+ -- Craig Small <csmall@debian.org> Fri, 14 Jul 2000 22:33:44 +1000 -+ -+procps (1:2.0.6-7) unstable; urgency=low -+ -+ * Fixed missing version Closes: #62207, #62484, #59112 -+ * Stop crashes with umounted /proc Closes: #63512, #55177 -+ * Nicer man pages Closes: #63495, #59406 -+ * Fixed sysctl eof bug Closes: #62877 -+ * watch wraps properly Closes: #60913 -+ * watch handles tabs Closes: #46213 -+ * watch honors locale settings Closes: #63762 -+ * now versioned replaces line for bsdutils -+ -+ -- Craig Small <csmall@debian.org> Mon, 29 May 2000 13:31:54 +1000 -+ -+procps (1:2.0.6-6) unstable; urgency=low -+ -+ * New patchlevel (000221) -+ * ps 'f' ASCII art forest fixed. Closes: #57134, #58644 -+ * let insane people run ps setuid. Closes: #56701 -+ * note that kernel 2.3 is now faster. Closes: #49130 -+ * top with WCHAN was leaking memory. Closes: #58172, #52257, #56889 -+ * can show current CPU. Closes: #37023 -+ * w looks better now. Closes: #55952 -+ * init.d/procps removed if exists. Closes: #55137, #55852 -+ * Fixed skill/snice man page (thanks man-db maint!) Closes: #53736, #46743 -+ * Fixed ps man page Closes: #58365 -+ -+ -- Craig Small <csmall@debian.org> Wed, 23 Feb 2000 10:31:37 +1100 -+ -+procps (1:2.0.6-5) unstable; urgency=low -+ -+ * New upstream source -+ * kill "_R(smp_|smp2gig_|2gig_)?[0-9a-fA-F]{8,}" Closes: #54394, #53208 -+ * added type 'S' and scan past machine types Closes: #54396 -+ * Fixed w(1) manpage Closes: #54709 -+ * top now agrees with ps for RSS Closes: #52679 -+ -+ -- Craig Small <csmall@debian.org> Tue, 11 Jan 2000 08:23:56 +1100 -+ -+procps (1:2.0.6-4) unstable; urgency=low -+ -+ * procps init.d script quietly dies if not /etc/default/rcS Closes: -+ #52839 -+ * Put the NEWS changelog back in Closes: #52678 -+ * Fixed that damn Rsmp annoying message bug Closes: #48686 -+ * Remove /etc/init.d/procps Closes: #53818 -+ -+ -- Craig Small <csmall@debian.org> Mon, 20 Dec 1999 11:14:53 +1100 -+ -+procps (1:2.0.6-3) unstable; urgency=low -+ -+ * Patched ps so it complains if you chmod 711 /proc Closes: #52481 -+ * Did the same for top. -+ * Ditto for oldps. -+ * Changed and int to a char* Closes: #52482 -+ * sysctl.conf file references sysctl.conf (5) not 8 Closes: #52385 -+ * props init.d script changed to procps.sh Closes: #52228 -+ -+ -- Craig Small <csmall@debian.org> Mon, 13 Dec 1999 11:57:01 +1100 -+ -+procps (1:2.0.6-2) unstable; urgency=low -+ -+ * Changed psmisc from reccomends to suggests -+ * %MEM now works, Closes: #50010 #50055 #50148 #50356 -+ * top doesn't crash with > 204 processes Closes: #50055 -+ * Another libproc fd leak fixed Closes: #45398 -+ * ps silently ignores m and -m for future compatibility Closes: #48308 -+ * Added a sysctl.conf and other files as suggested Closes: #51098 -+ * Fix start field instability -+ * ps.1 fixed Closes: #35137 -+ -+ -- Craig Small <csmall@debian.org> Tue, 7 Dec 1999 14:42:51 +1100 -+ -+procps (1:2.0.6-1) unstable; urgency=low -+ -+ * New upstream -+ * sysctl crash fixed, Closes: #49015 -+ * libproc file descriptor leak fixed, Closes: #45398 -+ * False positive System.map mismatches killed, Closes: #49047 -+ * Supports 64 Hz for StrongARM/Shark Closes: #47461 -+ * pr_time fixed, Closes: #46223 -+ * libc num cpu workaround back in, Closes: #49039 -+ * Fixed kill manpage, Closes: #47018 -+ * This version definitely, absolutely has kill, Closes: #46762 -+ -+ -+ -- Craig Small <csmall@debian.org> Fri, 5 Nov 1999 12:46:05 +1100 -+ -+procps (1:2.0.3-5) unstable; urgency=low -+ -+ * Changed conflicts with replaces -+ -+ -- Craig Small <csmall@debian.org> Wed, 6 Oct 1999 14:36:48 +1000 -+ -+procps (1:2.0.3-4) unstable; urgency=low -+ -+ * support SMP systems with versioned kernel modules Closes: #45621, #46465 -+ * Added kill to this (it is removed from bsdutils). -+ * We now need kill manpage, Closes: #46004 -+ -+ -- Craig Small <csmall@debian.org> Tue, 5 Oct 1999 10:28:01 +1000 -+ -+procps (1:2.0.3-3) unstable; urgency=low -+ -+ * System.map support for non-i386 Closes: #45592, #45250 -+ * Do not require /proc/ksyms Closes: #45128, #45132, #45619 -+ * Alternative w.1 points to the right spot, Closes: #45331 -+ * Copyright for skill and snice and ps fixed, Closes: #45119 -+ -+ -- Craig Small <csmall@debian.org> Tue, 21 Sep 1999 16:31:59 +1000 -+ -+procps (1:2.0.3-2) unstable; urgency=medium -+ -+ * Now with top! Closes: #45106 -+ -+ -- Craig Small <csmall@debian.org> Wed, 15 Sep 1999 11:12:34 +1000 -+ -+procps (1:2.0.3-1) unstable; urgency=low -+ -+ * New upstream source -+ * Debian personality does m flag Closes: #44832 -+ * Corrected typo in top.1 Closes: #44836 -+ * New improved watch Closes: #29970 -+ -+ -- Craig Small <csmall@debian.org> Mon, 13 Sep 1999 16:59:16 +1000 -+ -+procps (1:2.0.2-4) unstable; urgency=high -+ -+ * Fixed the nasty ps formatting problem (Bug #40859 #40856 #40839 ) -+ -+ -- Craig Small <csmall@debian.org> Wed, 7 Jul 1999 08:41:54 +1000 -+ -+procps (1:2.0.2-3) unstable; urgency=low -+ -+ * New upstream patches/source -+ * SMB Hz wierdness fixed (Bug #33023 #33284) -+ * non-tty output does not get chopped at 80 columns (bug #36688) -+ * BSD personalities set the default selection and output format (bug #36698) -+ * Fixed collumn spacing problem (Bug #35309) -+ * Work around for borken libs that return 0 processors (Bug #36902) -+ * skill now uses process name not command line (Bug #19208) -+ -+ -- Craig Small <csmall@debian.org> Mon, 5 Jul 1999 07:29:47 +1000 -+ -+procps (1:2.0.2-2) unstable; urgency=low -+ -+ * Removed kill and manual page (Bug #36421 #36551 #36375) -+ * Put in patch for bogus sysconf return (Bug #36494 #36532 #36581) -+ -+ -- Craig Small <csmall@debian.org> Wed, 28 Apr 1999 09:04:59 +1000 -+ -+procps (1:2.0.2-1) unstable; urgency=low -+ -+ * New upstream version (Bug #34394 #27291 #34250 #34956 #35240 #35247 -+ #35520 #35756 #34580 ) -+ -+ -- Craig Small <csmall@debian.org> Mon, 19 Apr 1999 13:26:48 +1000 -+ -+procps (1:2.0.0-1) unstable; urgency=low -+ -+ * New upstream version (Bug #33083 23347 33462 10556 33266 33371 ) -+ -+ -+ -- Craig Small <csmall@debian.org> Mon, 15 Mar 1999 14:21:57 +1100 -+ -+procps (1:1.9.0-2) unstable; urgency=low -+ -+ * top now resumes (Bug #32106 ) -+ * debhelper text problem fixed in postinst (Bug #32963 #33122 #33003 33117 ) -+ * oldps and ps now use alternatives (Bug #33083 ) -+ * ps s format now not ugly (Bug #28266 ) -+ * watch command line help and man page correct (Bug #31702 ) -+ * sessreg removed from package (Bug #32294 ) -+ * ps doesn't display extra spaces (Bug #27799 ) -+ * top has spaces in command lines again (Bug #33060 ) -+ * ps now has personality (Bug #22923 #18429 ) -+ * moved non-free skill and snice to non-free package. -+ -+ -- Craig Small <csmall@debian.org> Tue, 9 Feb 1999 15:10:58 +1100 -+ -+procps (1:1.9.0-1) unstable; urgency=low -+ -+ * New Upstream source -+ -+ -- Craig Small <csmall@debian.org> Thu, 4 Feb 1999 14:48:37 +1100 -+ -+procps (1:1.2.9-3) unstable; urgency=low -+ -+ * Linked to ncurses4 -+ -+ -- Craig Small <csmall@debian.org> Fri, 30 Oct 1998 14:13:02 +1100 -+ -+procps (1:1.2.9-2) unstable; urgency=low -+ -+ * top now has spaces in between command lines (Bug #28178 ) -+ * --version or -V now shows proper version. -+ -+ -- Craig Small <csmall@debian.org> Mon, 26 Oct 1998 08:55:59 +1100 -+ -+procps (1:1.2.9-1) unstable; urgency=low -+ -+ * New upstream version (Bug #27573 ) -+ * Menu entry changed from System to Menu/System (Bug #27438 ) -+ * Char variables changed to int for powerpc (Bug #26624 ) -+ * libproc now nulls allocated structure (Bug #26225 ) -+ * No longer uses psdevtab (yay!) (Bug #25388 ) -+ * ps doesn't double space command line parameters (Bug #25306 #24293 ) -+ * ps now silently ignores g flag for those BSD heads (Bug #24075 ) -+ -+ -- Craig Small <csmall@debian.org> Fri, 9 Oct 1998 09:15:11 +1000 -+ -+procps (1:1.2.7-2) unstable; urgency=low -+ -+ * Top can suspend twice (or three times even) (Bug #22997 ) -+ * Libraries properly built (Bug #20010 ) -+ -+ -- Craig Small <csmall@debian.org> Mon, 1 Jun 1998 09:16:09 +1000 -+ -+procps (1:1.2.7-1) frozen unstable; urgency=high -+ -+ * New upstream source, fixes security bug (Bug #21475) -+ -+ -- Craig Small <csmall@debian.org> Thu, 23 Apr 1998 08:04:54 +1000 -+ -+procps (1:1.2.6-2) unstable; urgency=low -+ -+ * Fixed Shared library dependencies (bugs #18388 #18394 18392 ) -+ * Conflicts with earlier versions of w-bassman (bug #18389 ) -+ -+ -- Craig Small <csmall@debian.org> Mon, 23 Feb 1998 09:05:54 +1100 -+ -+procps (1:1.2.6-1) unstable; urgency=low -+ -+ * New upstream source. -+ * xload is undiverted (Bug #17102 ) -+ * ps_fields.7.gz removed (Bug #18090 ) -+ * Colour patches removed, color-related bugs gone (Bug #18008 #17217 #18090 ) -+ * POSIX patches removed, cmd line bugs gone (Bug #15537 ) -+ * w is now an alternative w.procps (Bug #17960 ) -+ * skill now works with process names (Bug #17087 ) -+ * ps and top man pages have their field descriptions (Bug #17360 ) -+ * ps u fixed (Bug #17313 ) -+ * Source code is no longer FUBAR (Bug #17892 ) -+ * top now redraws screen after config screen (Bug #11896 ) -+ * Circular dependency removed (Bug #16966 ) -+ * top does mess up screens with wrong cmd line (Bug #17230 ) -+ * top suspends with ctrl-Z (Bug #16703 ) -+ -+ -- Craig Small <csmall@debian.org> Tue, 17 Feb 1998 08:31:21 +1100 -+ -+procps (1:1.2.5-2) unstable; urgency=low -+ -+ * Moved /bin into /bin/ps (Bug #17001 ) -+ -+ -- Craig Small <csmall@debian.org> Tue, 13 Jan 1998 07:50:43 +1100 -+ -+procps (1:1.2.5-1) unstable; urgency=low -+ -+ * TTY selection works ( #16724 ) -+ * top and ps now accept --colour and *_COLOURS -+ * xproc copyright file not compressed ( #14491 ) -+ * All #include <proc/*.h> now #include "proc/*.h" ( #13482 ) -+ * Copyright doesn't mention psmisc now ( #16704 ) -+ * Moved ps back into /bin ( #16737 #16705 ) -+ * New upstream source ( #16795 ) -+ -+ -- Craig Small <csmall@debian.org> Mon, 12 Jan 1998 08:35:10 +1100 -+ -+procps (1:1.2.2-1) unstable; urgency=low -+ -+ * New maintainer -+ * Updated upstream source to 1.2.2 (instead of 1.2) -+ * Merged Helmut's color/command line patches into upstream. -+ * Copyright file is not compressed ( #14493 #14415 ) -+ * psdatabase refreshed when installing ( #10693 ) -+ * Fixed +/- line in free ( #10785 #10870 #11566 #12027 #12245 #12374 ) -+ * w collumns corrected ( #10898 #13117 ) -+ * top saves sort type ( #11553 ) -+ * Linked to libc6 ( #11725 ) -+ * top doesn't coredump with S option ( #11855 ) -+ * skill works with given patch ( #12023 ) -+ * libproc-dev has proper sym link ( #12697 ) -+ * top -h doesn't change terminal settings ( #13513 ) -+ * ps -s has "CAUGHT" not "CATCHED" ( #14342 ) -+ * ps_colors.7 and ps_fields.7 reformatted ( #14109 #14544 #14545 ) -+ * ps checks for tty before using colors ( #14596 ) -+ * top sets stop signal handler later, stopping race ( #14769 ) -+ * When using POSIX personality, processes show up ( #14780 ) -+ * top checks for valid term type ( #15807 ) -+ * xproc now Depends on procps-1.2.*-* ( #10762 #13347 ) -+ * xproc dependencies fixed ( #12698 ) -+ -+ -- Craig Small <csmall@debian.org> Tue, 30 Dec 1997 11:33:54 +1100 -+ -+procps (1.12.2.1) unstable; urgency=low -+ -+ * Non-maintainer release, built for libc6. -+ * Added in free.c from new procps version 1.2.3 (from sunsite), seems to -+ fix all the problems with free reporting bogus valus. -+ -+ -- Joey Hess <joeyh@master.debian.org> Fri, 24 Oct 1997 13:34:35 -0400 -+ -+procps (1.12.2) stable unstable; urgency=low -+ -+ * fixed meminfo handling again, as the fix wouldn't work on pre-2.1.x -+ kernels. -+ * fixed free to use the meminfo routines from libproc. -+ -+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Fri, 13 Jun 1997 22:42:14 +0200 -+ -+procps (1.12.1) stable unstable; urgency=low -+ -+ * fixed several bugs -+ * replaced utmp handling to support wrappers. -+ * added /proc/meminfo support for 2.1.x kernels. -+ -+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Tue, 10 Jun 1997 23:59:41 +0200 -+ -+procps (1.11.6) frozen unstable; urgency=medium -+ -+ * psmisc 1.14 : new upstream version (mainly bugfixes) -+ * added a lot of new serial device major numbers to the device lookup -+ code. Somehow it seems there are new serial devices every other week. -+ * fixed a bug in top: broken .toprc may cause a segmentation fault. -+ -+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Sun, 4 May 1997 09:50:30 +0200 -+ -+procps (1.11.5) frozen unstable; urgency=medium -+ -+ * minor changes to make it compile with libc6 -+ * fix top behaviour on machines having nonstandard NR_TASKS up to 4k -+ tasks -+ -+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Fri, 18 Apr 1997 02:07:46 +0200 -+ -+procps (1.11.4) unstable; urgency=medium -+ -+ * strip libproc.so from unneeded symbols (Bug# 8311) -+ * fixed watch.1 example (Bug# 8169) -+ * partly fixed fuser sigsegv core dump (Bug# 8004) -+ * menu entries for xproc and procps (Bug# 8325) -+ * divertions for xmem and xload. (Bug# 7565) -+ -+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Sun, 13 Apr 1997 20:55:05 +0200 -+ -+procps (1.11.3) unstable; urgency=low -+ -+ * fixed uptime again, minor Makefile changes -+ -+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Fri, 21 Feb 1997 16:22:04 +0100 -+ -+procps (1.11.2) unstable; urgency=medium -+ -+ * fixed typo in ps_fields.7 (Bug#5457) -+ * fixed typo in debian/rules (Bug #5585) -+ * fixed bug in w introduced in 1.11.1 (Bugs #5489, #5694, #5695, #5705). -+ * added support for non-standard serial devices (long overdue - Bug -+ #5771). -+ * fixed uptime option handling (Bug #6099). -+ * fixed top problems with missing/corrupted utmp (Bug #5819). -+ * fixed manpage problems (Bug #5936). -+ -+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Wed, 19 Feb 1997 18:49:26 +0100 -+ -+procps (1.11.1) unstable; urgency=low -+ -+ * fixed bug in w <username> -+ * automatic resize if field length is exceeded. This changed the shared -+ library, so popping the major number. -+ * fixed numeric WCHAN output on Alphas and stupid bug in ps (again, -+ thanks to H. Koenig). -+ * fixed top memory statistics for systems with more than 100M memory or -+ swap. -+ -+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Tue, 12 Nov 1996 02:57:18 +0100 -+ -+procps (1.10.1) unstable; urgency=low -+ -+ * merged in ALPHA & Sparc patches -+ (from ftp.azstarnet.com:/pub/linux/axp/glibc) -+ * fixed ps --deselect/-N for pid lists -+ * use shared libs from now on, install shlibs again -+ * manpages for libproc -+ * static lib compiled without -fPIC -+ * added libproc package for development installing libproc headers, -+ manpages and static library. -+ * fixed PROC_REAL bug when PROC_FILLSTATUS isn't set. -+ * fixed color bug in ps --forest -+ * added xproc package for xload, xmem, xidle, xcpustate -+ (XConsole left out as we use xconsole & klogd on debian) -+ * adapted xload manpage for xidle and xmem -+ * fixed xmem to cope with newer kernels (where shared pages are counted -+ once for each additional reference) -+ * fixed top change_fields bug (a field needs 24, not 21 spaces) -+ * fixed several Alpha bugs (thanks to Harald Koenig) -+ * due to popular demand, the old format for time intervals is back. -+ for all program using this, a toggle command line option has been -+ provided. The default behaviour depends on the compile time option -+ NEW_TIME_DEFAULT (see main Makefile) -+ -+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Wed, 23 Oct 1996 21:30:54 +0200 -+ -+procps (1.09.2) unstable; urgency=low -+ -+ * fixed cpu nice % in summary -+ * fixed topsetup initialisation in top.h I messed up in last revision -+ * fixed pipe output bug -+ * fixed --deselect bug in SVR4/POSIX mode -+ -+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Sun, 20 Oct 1996 13:57:11 +0200 -+ -+procps (1.09.1) unstable; urgency=low -+ -+ * fixed ps -w bug displaying too many empty lines -+ * fixed SIGSEGV bug in ps -www -+ * fixed bug in top not calculating length of the command/args/env fields -+ at the field selection screen in some circumstances. -+ * fixed SIGSEGV bug when using environ field -+ -+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Sat, 12 Oct 1996 07:59:29 +0200 -+ -+procps (1.09) experimental; urgency=low -+ -+ * This is an experimental release of the procps suite. A lot of features have -+ been added since the 1.01(a) release: -+ - support for both BSD and POSIX (SVR4) style command line options. -+ - completely configurable display of information. -+ - colour markup of processes exceeding limits or belonging to a user. -+ Please take a look at /usr/doc/procps/NEWS and the manpages for a concise -+ list. This is how the next upstream release of procps may look -+ (i.e. it will look like this if there is not too much resistance). -+ -+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Sat, 5 Oct 1996 14:26:57 +0200 ---- procps-3.1.15.orig/kill.1 -+++ procps-3.1.15/kill.1 -@@ -10,16 +10,11 @@ - kill \- send a signal to a process - - .SH SYNOPSIS --.TS --l l. --kill pid ... Send SIGTERM to every process listed. --kill -signal pid ... Send a signal to every process listed. --kill -s signal pid ... Send a signal to every process listed. --kill -l List all signal names. --kill -L List all signal names in a nice table. --kill -l signal Convert a signal number into a name. --kill -V,--version Show version of program --.TE -+\fBkill\fR [ -\fBsignal\fR | -s \fBsignal\fR ] \fBpid\fR ... -+.br -+\fBkill\fR [ -L | -V, --version ] -+.br -+\fBkill\fR -l [ \fBsignal\fR ] - - .SH DESCRIPTION - The default signal for kill is TERM. Use -l or -L to list available signals. -@@ -105,7 +100,7 @@ - .fi - .PP - .SH "SEE ALSO" --pkill(1) skill(1) kill(2) renice(1) nice(1) signal(7) killall(1) -+.BR pkill (1), skill (1), kill (2), renice (1), nice (1), signal (7), killall (1). - - .SH STANDARDS - This command meets appropriate standards. The -L flag is Linux-specific. ---- procps-3.1.15.orig/tload.c -+++ procps-3.1.15/tload.c -@@ -30,9 +30,6 @@ - static int dly=5; - static jmp_buf jb; - --extern int optind; --extern char *optarg; -- - static void alrm(int signo) - { - (void)signo; ---- procps-3.1.15.orig/pgrep.c -+++ procps-3.1.15/pgrep.c -@@ -367,7 +367,8 @@ - preg = do_regcomp (); - - if (opt_newest) saved_start_time = 0ULL; -- if (opt_oldest) saved_start_time = ~0ULL; -+ else -+ saved_start_time = ~0ULL; - if (opt_newest) saved_pid = 0; - if (opt_oldest) saved_pid = INT_MAX; - ---- procps-3.1.15.orig/top.1 -+++ procps-3.1.15/top.1 -@@ -430,8 +430,8 @@ - The number of\fB major\fR page faults that have occurred for a task. - A page fault occurs when a process attempts to read from or write to a virtual - page that is not currently present in its address space. --A major page fault is when disk access is involved in making that --page available. -+A major page fault is when backing storage access (such as a disk) is involved -+in making that page available. - - .TP 3 - v:\fB nDRT\fR \*(EM Dirty Pages count diff --git a/recipes/procps/procps-3.2.1/install.patch b/recipes/procps/procps-3.2.1/install.patch deleted file mode 100644 index 2d16c26f17..0000000000 --- a/recipes/procps/procps-3.2.1/install.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- procps-3.1.15/Makefile~install 2003-12-24 03:01:55.000000000 +0100 -+++ procps-3.1.15/Makefile 2004-02-11 00:45:59.000000000 +0100 -@@ -147,7 +147,7 @@ - ###### install - - $(BINFILES) : all -- $(install) --mode a=rx --strip $(notdir $@) $@ -+ $(install) --mode a=rx $(notdir $@) $@ - - $(MANFILES) : all - $(install) --mode a=r $(notdir $@) $@ diff --git a/recipes/procps/procps-3.2.5/pagesz-not-constant.patch b/recipes/procps/procps-3.2.5/pagesz-not-constant.patch deleted file mode 100644 index 8e9e1ebfe1..0000000000 --- a/recipes/procps/procps-3.2.5/pagesz-not-constant.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: procps-3.2.1/proc/devname.c -=================================================================== ---- procps-3.2.1.orig/proc/devname.c 2004-03-18 05:43:50.000000000 +1100 -+++ procps-3.2.1/proc/devname.c 2005-04-02 10:40:17.462138000 +1000 -@@ -227,7 +227,7 @@ - - /* number --> name */ - unsigned dev_to_tty(char *restrict ret, unsigned chop, dev_t dev_t_dev, int pid, unsigned int flags) { -- static char buf[PAGE_SIZE]; -+ static char buf[4096]; - char *restrict tmp = buf; - unsigned dev = dev_t_dev; - unsigned i = 0; -@@ -249,7 +249,7 @@ - if((flags&ABBREV_TTY) && !strncmp(tmp,"tty", 3) && tmp[3]) tmp += 3; - if((flags&ABBREV_PTS) && !strncmp(tmp,"pts/", 4) && tmp[4]) tmp += 4; - /* gotta check before we chop or we may chop someone else's memory */ -- if(chop + (unsigned long)(tmp-buf) <= sizeof buf) -+ if(chop + (unsigned long)(tmp-buf) < sizeof buf) - tmp[chop] = '\0'; - /* replace non-ASCII characters with '?' and return the number of chars */ - for(;;){ diff --git a/recipes/procps/procps-3.2.7/install.patch b/recipes/procps/procps-3.2.7/install.patch deleted file mode 100644 index 9f1ef6915d..0000000000 --- a/recipes/procps/procps-3.2.7/install.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- procps-3.2.5.virgin/Makefile 2005-01-26 05:55:26.000000000 +0100 -+++ procps-3.2.5/Makefile 2005-08-03 04:55:26.346984488 +0200 -@@ -30,7 +30,10 @@ - install := install -D --owner 0 --group 0 - - # Lame x86-64 /lib64 and /usr/lib64 abomination: --lib64 := lib$(shell [ -d /lib64 ] && echo 64) -+# lib64 := lib$(shell [ -d /lib64 ] && echo 64) -+ -+# Equally lame hack to work around makefile lameness when the host arch is 64bit, but the target is not. -+lib64 := lib - - usr/bin := $(DESTDIR)/usr/bin/ - bin := $(DESTDIR)/bin/ -@@ -211,10 +214,10 @@ - ###### install - - $(BINFILES) : all -- $(install) --mode a=rx $(notdir $@) $@ -+ $(install) -m 555 $(notdir $@) $@ - - $(MANFILES) : all -- $(install) --mode a=r $(notdir $@) $@ -+ $(install) -m 444 $(notdir $@) $@ - - install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL)) - cd $(usr/bin) && $(ln_f) skill snice diff --git a/recipes/procps/procps-3.2.7/pagesz-not-constant.patch b/recipes/procps/procps-3.2.7/pagesz-not-constant.patch deleted file mode 100644 index 8e9e1ebfe1..0000000000 --- a/recipes/procps/procps-3.2.7/pagesz-not-constant.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: procps-3.2.1/proc/devname.c -=================================================================== ---- procps-3.2.1.orig/proc/devname.c 2004-03-18 05:43:50.000000000 +1100 -+++ procps-3.2.1/proc/devname.c 2005-04-02 10:40:17.462138000 +1000 -@@ -227,7 +227,7 @@ - - /* number --> name */ - unsigned dev_to_tty(char *restrict ret, unsigned chop, dev_t dev_t_dev, int pid, unsigned int flags) { -- static char buf[PAGE_SIZE]; -+ static char buf[4096]; - char *restrict tmp = buf; - unsigned dev = dev_t_dev; - unsigned i = 0; -@@ -249,7 +249,7 @@ - if((flags&ABBREV_TTY) && !strncmp(tmp,"tty", 3) && tmp[3]) tmp += 3; - if((flags&ABBREV_PTS) && !strncmp(tmp,"pts/", 4) && tmp[4]) tmp += 4; - /* gotta check before we chop or we may chop someone else's memory */ -- if(chop + (unsigned long)(tmp-buf) <= sizeof buf) -+ if(chop + (unsigned long)(tmp-buf) < sizeof buf) - tmp[chop] = '\0'; - /* replace non-ASCII characters with '?' and return the number of chars */ - for(;;){ diff --git a/recipes/procps/procps-3.2.7/procmodule.patch b/recipes/procps/procps-3.2.7/procmodule.patch deleted file mode 100644 index fabfabaa59..0000000000 --- a/recipes/procps/procps-3.2.7/procmodule.patch +++ /dev/null @@ -1,36 +0,0 @@ -*** procps-3.2.5/proc/module.mk.orig Sun Jul 24 11:53:49 2005 ---- procps-3.2.5/proc/module.mk Sun Jul 24 11:54:32 2005 -*************** -*** 96,102 **** - #################### install rules ########################### - - $(lib)$(SOFILE) : proc/$(SONAME) -! $(install) --mode a=rx $< $@ - - ifneq ($(SOLINK),$(SOFILE)) - .PHONY: $(lib)$(SOLINK) ---- 96,102 ---- - #################### install rules ########################### - - $(lib)$(SOFILE) : proc/$(SONAME) -! $(install) -m 555 $< $@ - - ifneq ($(SOLINK),$(SOFILE)) - .PHONY: $(lib)$(SOLINK) -*************** -*** 115,121 **** - $(ldconfig) - - $(usr/lib)$(ANAME) : proc/$(ANAME) -! $(install) --mode a=r $< $@ - - # Junk anyway... supposed to go in /usr/include/$(NAME) - #INSTALL += $(addprefix $(include),$(HDRFILES)) ---- 115,121 ---- - $(ldconfig) - - $(usr/lib)$(ANAME) : proc/$(ANAME) -! $(install) -m 444 $< $@ - - # Junk anyway... supposed to go in /usr/include/$(NAME) - #INSTALL += $(addprefix $(include),$(HDRFILES)) diff --git a/recipes/procps/procps-3.2.7/psmodule.patch b/recipes/procps/procps-3.2.7/psmodule.patch deleted file mode 100644 index f298c1c1c4..0000000000 --- a/recipes/procps/procps-3.2.7/psmodule.patch +++ /dev/null @@ -1,21 +0,0 @@ -*** procps-3.2.5/ps/module.mk.orig Sun Jul 24 11:54:40 2005 ---- procps-3.2.5/ps/module.mk Sun Jul 24 11:55:02 2005 -*************** -*** 33,40 **** - - - $(bin)ps: ps/ps -! $(install) --mode a=rx $< $@ - - $(man1)ps.1 : ps/ps.1 -! $(install) --mode a=r $< $@ - -rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz ---- 33,40 ---- - - - $(bin)ps: ps/ps -! $(install) -m 555 $< $@ - - $(man1)ps.1 : ps/ps.1 -! $(install) -m 444 $< $@ - -rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz diff --git a/recipes/procps/procps-3.2.5/install.patch b/recipes/procps/procps-3.2.8/install.patch index 9f1ef6915d..9f1ef6915d 100644 --- a/recipes/procps/procps-3.2.5/install.patch +++ b/recipes/procps/procps-3.2.8/install.patch diff --git a/recipes/procps/procps-3.2.7/linux-limits.patch b/recipes/procps/procps-3.2.8/linux-limits.patch index dcd66163ad..dcd66163ad 100644 --- a/recipes/procps/procps-3.2.7/linux-limits.patch +++ b/recipes/procps/procps-3.2.8/linux-limits.patch diff --git a/recipes/procps/procps-3.2.1/pagesz-not-constant.patch b/recipes/procps/procps-3.2.8/pagesz-not-constant.patch index 8e9e1ebfe1..8e9e1ebfe1 100644 --- a/recipes/procps/procps-3.2.1/pagesz-not-constant.patch +++ b/recipes/procps/procps-3.2.8/pagesz-not-constant.patch diff --git a/recipes/procps/procps-3.2.5/procmodule.patch b/recipes/procps/procps-3.2.8/procmodule.patch index fabfabaa59..fabfabaa59 100644 --- a/recipes/procps/procps-3.2.5/procmodule.patch +++ b/recipes/procps/procps-3.2.8/procmodule.patch diff --git a/recipes/procps/procps-3.2.7/procps.init b/recipes/procps/procps-3.2.8/procps.init index 739dcf4be7..739dcf4be7 100644 --- a/recipes/procps/procps-3.2.7/procps.init +++ b/recipes/procps/procps-3.2.8/procps.init diff --git a/recipes/procps/procps-3.2.5/psmodule.patch b/recipes/procps/procps-3.2.8/psmodule.patch index f298c1c1c4..f298c1c1c4 100644 --- a/recipes/procps/procps-3.2.5/psmodule.patch +++ b/recipes/procps/procps-3.2.8/psmodule.patch diff --git a/recipes/procps/procps-3.2.7/sysctl.conf b/recipes/procps/procps-3.2.8/sysctl.conf index 34e7488bf7..34e7488bf7 100644 --- a/recipes/procps/procps-3.2.7/sysctl.conf +++ b/recipes/procps/procps-3.2.8/sysctl.conf diff --git a/recipes/procps/procps.inc b/recipes/procps/procps.inc index 2de32d2c83..1db030d752 100644 --- a/recipes/procps/procps.inc +++ b/recipes/procps/procps.inc @@ -8,9 +8,64 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "ncurses" -FILES_${PN} += "${base_libdir}/libproc-*.so" +INC_PR = "r9" -SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \ +SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz;name=tarball \ + file://sysctl.conf \ + file://procps.init \ file://install.patch;patch=1" -inherit autotools +inherit autotools update-rc.d + +INITSCRIPT_NAME = "procps.sh" +INITSCRIPT_PARAMS = "start 30 S ." + +FILES_${PN} += "${base_libdir}/libproc-*.so" + +FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \ + ${bindir}/free.${PN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \ + ${bindir}/snice ${bindir}/vmstat ${bindir}/slabtop ${bindir}/pkill ${bindir}/skill ${bindir}/tload \ + ${base_sbindir}/sysctl.${PN}" + +CONFFILES_${PN} = "${sysconfdir}/sysctl.conf" + +EXTRA_OEMAKE = "CFLAGS=-I${STAGING_INCDIR} \ + CPPFLAGS=-I${STAGING_INCDIR} \ + LDFLAGS="${LDFLAGS}" \ + CURSES=-lncurses \ + install='install -D' \ + ldconfig=echo" + +do_install_append () { + install -d ${D}${sysconfdir}/init.d + install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/sysctl.conf + install -m 0755 ${WORKDIR}/procps.init ${D}${sysconfdir}/init.d/procps.sh + + mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN} + mv ${D}${bindir}/top ${D}${bindir}/top.${PN} + mv ${D}${base_bindir}/kill ${D}${base_bindir}/kill.${PN} + mv ${D}${base_bindir}/ps ${D}${base_bindir}/ps.${PN} + mv ${D}${bindir}/free ${D}${bindir}/free.${PN} + mv ${D}${base_sbindir}/sysctl ${D}${base_sbindir}/sysctl.${PN} + mv ${D}${bindir}/pkill ${D}${bindir}/pkill.${PN} +} + +pkg_postinst() { + update-alternatives --install ${bindir}/top top top.${PN} 90 + update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 90 + update-alternatives --install ${base_bindir}/ps ps ps.${PN} 90 + update-alternatives --install ${base_bindir}/kill kill kill.${PN} 90 + update-alternatives --install ${bindir}/free free free.${PN} 90 + update-alternatives --install ${base_sbindir}/sysctl sysctl sysctl.${PN} 90 + update-alternatives --install ${bindir}/pkill pkill pkill.${PN} 90 +} + +pkg_postrm() { + update-alternatives --remove top top.${PN} + update-alternatives --remove ps ps.${PN} + update-alternatives --remove uptime uptime.${PN} + update-alternatives --remove kill kill.${PN} + update-alternatives --remove free free.${PN} + update-alternatives --remove sysctl sysctl.${PN} + update-alternatives --remove pkill pkill.${PN} +} diff --git a/recipes/procps/procps_3.1.15.bb b/recipes/procps/procps_3.1.15.bb deleted file mode 100644 index 01114e80dc..0000000000 --- a/recipes/procps/procps_3.1.15.bb +++ /dev/null @@ -1,9 +0,0 @@ -require procps.inc - -SRC_URI += "file://procps_${PV}-2.diff;patch=1" - -EXTRA_OEMAKE = "CFLAGS=-I${STAGING_INCDIR} \ - LDFLAGS=-L${STAGING_LIBDIR} -Wl,--rpath-link,${STAGING_LIBDIR} \ - CURSES=-lncurses \ - install='install -D' \ - ldconfig=echo" diff --git a/recipes/procps/procps_3.2.1.bb b/recipes/procps/procps_3.2.1.bb deleted file mode 100644 index 33df399c5f..0000000000 --- a/recipes/procps/procps_3.2.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -require procps.inc - -PR = "r1" - -SRC_URI += "file://pagesz-not-constant.patch;patch=1" - -EXTRA_OEMAKE = "CFLAGS=-I${STAGING_INCDIR} \ - LDFLAGS=-L${STAGING_LIBDIR} -Wl,--rpath-link,${STAGING_LIBDIR} \ - CURSES=-lncurses \ - install='install -D' \ - ldconfig=echo" diff --git a/recipes/procps/procps_3.2.5.bb b/recipes/procps/procps_3.2.5.bb deleted file mode 100644 index de7524b2cb..0000000000 --- a/recipes/procps/procps_3.2.5.bb +++ /dev/null @@ -1,45 +0,0 @@ -require procps.inc - -PR = "r5" - -SRC_URI += "file://procmodule.patch;patch=1 \ - file://psmodule.patch;patch=1" - -FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \ - ${bindir}/free.${PN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \ - ${bindir}/snice ${bindir}/vmstat ${bindir}/slabtop ${bindir}/pkill ${bindir}/skill ${bindir}/tload \ - ${base_sbindir}/sysctl.${PN}" - -EXTRA_OEMAKE = "CFLAGS=-I${STAGING_INCDIR} \ - CPPFLAGS=-I${STAGING_INCDIR} \ - LDFLAGS=-L${STAGING_LIBDIR} -Wl,--rpath-link,${STAGING_LIBDIR} \ - CURSES=-lncurses \ - install='install -D' \ - ldconfig=echo" - -do_install_append () { - mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN} - mv ${D}${bindir}/top ${D}${bindir}/top.${PN} - mv ${D}${base_bindir}/kill ${D}${base_bindir}/kill.${PN} - mv ${D}${base_bindir}/ps ${D}${base_bindir}/ps.${PN} - mv ${D}${bindir}/free ${D}${bindir}/free.${PN} - mv ${D}${base_sbindir}/sysctl ${D}${base_sbindir}/sysctl.${PN} -} - -pkg_postinst() { - update-alternatives --install ${bindir}/top top top.${PN} 90 - update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 90 - update-alternatives --install ${base_bindir}/ps ps ps.${PN} 90 - update-alternatives --install ${base_bindir}/kill kill kill.${PN} 90 - update-alternatives --install ${bindir}/free free free.${PN} 90 - update-alternatives --install ${base_sbindir}/sysctl sysctl sysctl.${PN} 90 -} - -pkg_postrm() { - update-alternatives --remove top top.${PN} - update-alternatives --remove ps ps.${PN} - update-alternatives --remove uptime uptime.${PN} - update-alternatives --remove kill kill.${PN} - update-alternatives --remove free free.${PN} - update-alternatives --remove sysctl sysctl.${PN} -} diff --git a/recipes/procps/procps_3.2.7.bb b/recipes/procps/procps_3.2.7.bb deleted file mode 100644 index b31b683708..0000000000 --- a/recipes/procps/procps_3.2.7.bb +++ /dev/null @@ -1,67 +0,0 @@ -require procps.inc - -PR = "r9" - -inherit update-rc.d - -INITSCRIPT_NAME = "procps.sh" -INITSCRIPT_PARAMS = "start 30 S ." - -SRC_URI += "file://procmodule.patch;patch=1 \ - file://psmodule.patch;patch=1 \ - file://linux-limits.patch;patch=1 \ - file://sysctl.conf \ - file://procps.init \ - " - -FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \ - ${bindir}/free.${PN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \ - ${bindir}/snice ${bindir}/vmstat ${bindir}/slabtop ${bindir}/pkill ${bindir}/skill ${bindir}/tload \ - ${base_sbindir}/sysctl.${PN}" - -CONFFILES_${PN} = "${sysconfdir}/sysctl.conf" - -EXTRA_OEMAKE = "CFLAGS=-I${STAGING_INCDIR} \ - CPPFLAGS=-I${STAGING_INCDIR} \ - usr/bin=${D}${bindir}/ \ - bin=${D}${base_bindir}/ \ - usr/proc/bin=${D}${bindir}/ \ - LDFLAGS="${LDFLAGS}" \ - CURSES=-lncurses \ - install='install -D' \ - ldconfig=echo" - -do_install_append () { - install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/sysctl.conf - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/procps.init ${D}${sysconfdir}/init.d/procps.sh - - mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN} - mv ${D}${bindir}/top ${D}${bindir}/top.${PN} - mv ${D}${base_bindir}/kill ${D}${base_bindir}/kill.${PN} - mv ${D}${base_bindir}/ps ${D}${base_bindir}/ps.${PN} - mv ${D}${bindir}/free ${D}${bindir}/free.${PN} - mv ${D}${base_sbindir}/sysctl ${D}${base_sbindir}/sysctl.${PN} - mv ${D}${bindir}/pkill ${D}${bindir}/pkill.${PN} -} - -pkg_postinst() { - update-alternatives --install ${bindir}/top top top.${PN} 90 - update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 90 - update-alternatives --install ${base_bindir}/ps ps ps.${PN} 90 - update-alternatives --install ${base_bindir}/kill kill kill.${PN} 90 - update-alternatives --install ${bindir}/free free free.${PN} 90 - update-alternatives --install ${base_sbindir}/sysctl sysctl sysctl.${PN} 90 - update-alternatives --install ${bindir}/pkill pkill pkill.${PN} 90 -} - -pkg_postrm() { - update-alternatives --remove top top.${PN} - update-alternatives --remove ps ps.${PN} - update-alternatives --remove uptime uptime.${PN} - update-alternatives --remove kill kill.${PN} - update-alternatives --remove free free.${PN} - update-alternatives --remove sysctl sysctl.${PN} - update-alternatives --remove pkill pkill.${PN} -} diff --git a/recipes/procps/procps_3.2.8.bb b/recipes/procps/procps_3.2.8.bb new file mode 100644 index 0000000000..22f54c3692 --- /dev/null +++ b/recipes/procps/procps_3.2.8.bb @@ -0,0 +1,11 @@ +require procps.inc + +PR = "${INC_PR}.0" + +SRC_URI += "file://procmodule.patch;patch=1 \ + file://psmodule.patch;patch=1 \ + file://linux-limits.patch;patch=1 \ + " + +SRC_URI[tarball.md5sum] = "9532714b6846013ca9898984ba4cd7e0" +SRC_URI[tarball.sha256sum] = "11ed68d8a4433b91cd833deb714a3aa849c02aea738c42e6b4557982419c1535" diff --git a/recipes/qt4/qt4-embedded_4.6.2.bb b/recipes/qt4/qt4-embedded_4.6.2.bb index 94ecd01bc6..8583752d6d 100644 --- a/recipes/qt4/qt4-embedded_4.6.2.bb +++ b/recipes/qt4/qt4-embedded_4.6.2.bb @@ -1,6 +1,8 @@ require qt4-embedded.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" + +QT_CONFIG_FLAGS_append_armv6 = " -no-neon " require qt-${PV}.inc diff --git a/recipes/schroedinger/files/Makefile.patch b/recipes/schroedinger/files/Makefile.patch new file mode 100644 index 0000000000..d749c884e1 --- /dev/null +++ b/recipes/schroedinger/files/Makefile.patch @@ -0,0 +1,15 @@ +Index: schroedinger-1.0.5/schroedinger/Makefile.am +=================================================================== +--- schroedinger-1.0.5.orig/schroedinger/Makefile.am ++++ schroedinger-1.0.5/schroedinger/Makefile.am +@@ -53,9 +53,7 @@ pkginclude_HEADERS = \ + schroutils.h \ + schrovideoformat.h \ + schrovirtframe.h \ +- schrowavelet.h \ +- schrobitstream.h \ +- schromotion.h ++ schrowavelet.h + + noinst_HEADERS = \ + schrooil.h \ diff --git a/recipes/schroedinger/files/configure.ac.patch b/recipes/schroedinger/files/configure.ac.patch new file mode 100644 index 0000000000..ac5e7eebec --- /dev/null +++ b/recipes/schroedinger/files/configure.ac.patch @@ -0,0 +1,13 @@ +Index: schroedinger-1.0.9/configure.ac +=================================================================== +--- schroedinger-1.0.9.orig/configure.ac ++++ schroedinger-1.0.9/configure.ac +@@ -54,7 +54,7 @@ if test "x${HAVE_ORC}" != xyes ; then + AC_ERROR([orc-0.4 >= $ORC_VER is required]) + fi + SCHRO_PKG_DEPS="$SCHRO_PKG_DEPS orc-0.4 >= $ORC_VER" +-ORCC=`$PKG_CONFIG --variable=orcc orc-0.4` ++ORCC=$STAGING_DIR`$PKG_CONFIG --variable=orcc orc-0.4` + AC_SUBST(ORCC) + + AC_ARG_WITH([thread], diff --git a/recipes/schroedinger/gst-plugin-schroedinger_1.0.5.bb b/recipes/schroedinger/gst-plugin-schroedinger_1.0.9.bb index 64660bb7f2..0a95646a61 100644 --- a/recipes/schroedinger/gst-plugin-schroedinger_1.0.5.bb +++ b/recipes/schroedinger/gst-plugin-schroedinger_1.0.9.bb @@ -1,9 +1,10 @@ require schroedinger.inc -PR = "r2" +PR = "r0" DEPENDS += "gstreamer gst-plugins-base" -SRC_URI = "http://www.diracvideo.org/download/schroedinger/schroedinger-${PV}.tar.gz" +SRC_URI[schroedingertargz.md5sum] = "d67ec48b7c506db8c8b49156bf409e60" +SRC_URI[schroedingertargz.sha256sum] = "345abcaa72ff0f2e9c1075e22f7141475ee4e6eea23a7f568b69ffc13cc1c723" S = "${WORKDIR}/schroedinger-${PV}" diff --git a/recipes/schroedinger/schroedinger.inc b/recipes/schroedinger/schroedinger.inc index f907613fd1..90f7ca658b 100644 --- a/recipes/schroedinger/schroedinger.inc +++ b/recipes/schroedinger/schroedinger.inc @@ -1,10 +1,15 @@ HOMEPAGE = "http://schrodinger.sourceforge.net/" LICENSE = "MPL GPL LGPL MIT" -DEPENDS = "liboil" +DEPENDS = "liboil orc-native orc" -PR = "r2" +PR = "r0" -SRC_URI = "http://www.diracvideo.org/download/schroedinger/${P}.tar.gz" +SRC_URI = "http://www.diracvideo.org/download/schroedinger/${P}.tar.gz;name=schroedingertargz" +SRC_URI[schroedingertargz.md5sum] = "d67ec48b7c506db8c8b49156bf409e60" +SRC_URI[schroedingertargz.sha256sum] = "345abcaa72ff0f2e9c1075e22f7141475ee4e6eea23a7f568b69ffc13cc1c723" +SRC_URI += "file://configure.ac.patch;patch=1" + +EXTRA_OECONF += "STAGING_DIR=${STAGING_DIR_NATIVE}" inherit autotools diff --git a/recipes/schroedinger/schroedinger_1.0.5.bb b/recipes/schroedinger/schroedinger_1.0.9.bb index 476c2965e6..d9b919169b 100644 --- a/recipes/schroedinger/schroedinger_1.0.5.bb +++ b/recipes/schroedinger/schroedinger_1.0.9.bb @@ -1,9 +1,12 @@ require schroedinger.inc -PR = "r3" +PR = "r0" inherit autotools_stage +SRC_URI[schroedingertargz.md5sum] = "d67ec48b7c506db8c8b49156bf409e60" +SRC_URI[schroedingertargz.sha256sum] = "345abcaa72ff0f2e9c1075e22f7141475ee4e6eea23a7f568b69ffc13cc1c723" + AUTOTOOLS_STAGE_PKGCONFIG = "1" PACKAGES =+ "gst-plugin-schroedinger-dbg gst-plugin-schroedinger-dev gst-plugin-schroedinger" diff --git a/recipes/streamripper/streamripper_1.61.10.bb b/recipes/streamripper/streamripper_1.64.6.bb index fe691400ac..f8141cf06c 100644 --- a/recipes/streamripper/streamripper_1.61.10.bb +++ b/recipes/streamripper/streamripper_1.64.6.bb @@ -4,7 +4,9 @@ LICENSE = "GPL" DEPENDS= "libogg libvorbis" RDEPENDS= "libogg libvorbis" -SRC_URI = "${SOURCEFORGE_MIRROR}/streamripper/streamripper-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/streamripper/streamripper-${PV}.tar.gz;name=src" +SRC_URI[src.md5sum] = "a37a1a8b8f9228522196a122a1c2dd32" +SRC_URI[src.sha256sum] = "c1d75f2e9c7b38fd4695be66eff4533395248132f3cc61f375196403c4d8de42" EXTRA_OECONF="--disable-oggtest \ --disable-vorbistest \ diff --git a/recipes/sysvinit/sysvinit_2.86.bb b/recipes/sysvinit/sysvinit_2.86.bb index e546726ab9..df75fe72af 100644 --- a/recipes/sysvinit/sysvinit_2.86.bb +++ b/recipes/sysvinit/sysvinit_2.86.bb @@ -1,6 +1,6 @@ DESCRIPTION = "System-V like init." SECTION = "base" -LICENSE = "GPL" +LICENSE = "GPLv2+" HOMEPAGE = "http://freshmeat.net/projects/sysvinit/" PR = "r57" diff --git a/recipes/tslib/tslib.inc b/recipes/tslib/tslib.inc index 81f2a4eaa6..4d75c5a45f 100644 --- a/recipes/tslib/tslib.inc +++ b/recipes/tslib/tslib.inc @@ -2,7 +2,7 @@ DESCRIPTION = "tslib is a plugin-based flexible touchscreen access library." HOMEPAGE = "http://tslib.berlios.de/" AUTHOR = "Russell King w/ plugins by Chris Larson et. al." SECTION = "base" -LICENSE = "LGPL" +LICENSE = "LGPLv2" INC_PR = "r23" SRC_URI += "\ diff --git a/recipes/tslib/tslib/htc-msm7/ts.conf b/recipes/tslib/tslib/htc-msm7/ts.conf new file mode 100644 index 0000000000..1b0da937e8 --- /dev/null +++ b/recipes/tslib/tslib/htc-msm7/ts.conf @@ -0,0 +1,25 @@ +# Uncomment if you wish to use the linux input layer event interface +module_raw input + +# Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d +# module_raw collie + +# Uncomment if you're using a Sharp Zaurus SL-C700/C750/C760/C860 +# module_raw corgi + +# Uncomment if you're using a device with a UCB1200/1300/1400 TS interface +# module_raw ucb1x00 + +# Uncomment if you're using an HP iPaq h3600 or similar +# module_raw h3600 + +# Uncomment if you're using a Hitachi Webpad +# module_raw mk712 + +# Uncomment if you're using an IBM Arctic II +# module_raw arctic2 + +module pthres pmin=1 +module variance delta=30 +module dejitter delta=100 +module linear diff --git a/recipes/tslib/tslib/htc-msm7/tslib.sh b/recipes/tslib/tslib/htc-msm7/tslib.sh new file mode 100644 index 0000000000..d6141f8d66 --- /dev/null +++ b/recipes/tslib/tslib/htc-msm7/tslib.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +# FIXME: Use /dev/input/touchscreen, once we have this logic on all hotplug system +# Yes, hardcoding the event node is wrong, will fix this eventually +TSLIB_TSDEVICE=/dev/input/event1 + +export TSLIB_TSDEVICE diff --git a/recipes/tslib/tslib_1.0.bb b/recipes/tslib/tslib_1.0.bb index 58a0e35bd1..4c2a56c435 100644 --- a/recipes/tslib/tslib_1.0.bb +++ b/recipes/tslib/tslib_1.0.bb @@ -2,6 +2,6 @@ SRC_URI = "http://download.berlios.de/tslib/${BP}.tar.bz2 \ file://fix_version.patch;patch=1 \ file://tslib-nopressure.patch;patch=1 \ file://tslib-pluginsld.patch;patch=1" -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" include tslib.inc diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb index b63edbdf67..61095613e4 100644 --- a/recipes/u-boot/u-boot_git.bb +++ b/recipes/u-boot/u-boot_git.bb @@ -12,6 +12,7 @@ SRCREV_afeb9260 = "6b8edfde22acc574b5532e9f086e6a7287a9bc78" SRCREV_afeb9260-180 = "6b8edfde22acc574b5532e9f086e6a7287a9bc78" SRCREV_palmpre = "6b8edfde22acc574b5532e9f086e6a7287a9bc78" SRCREV_cm-t35 = "3c014f1586d5bfe30dca7549396915c83f31cd30" +SRCREV_p2020ds = "f20393c5e787b3776c179d20f82a86bda124d651" SRC_URI_append_afeb9260 = " file://AFEB9260-network-fix.patch;patch=1" SRC_URI_append_afeb9260-180 = " file://AFEB9260-network-fix.patch;patch=1" SRC_URI_append_cm-t35 = "file://cm-t35/cm-t35.patch;patch=1" diff --git a/recipes/udev/udev.inc b/recipes/udev/udev.inc index 86f851db05..14d10b45cc 100644 --- a/recipes/udev/udev.inc +++ b/recipes/udev/udev.inc @@ -1,6 +1,6 @@ DESCRIPTION ?= "udev is a program which dynamically creates and removes device nodes from \ /dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel." -LICENSE = "GPL" +LICENSE = "GPLv2+" SRC_URI += " \ file://udev.rules \ diff --git a/recipes/udev/udev_141.bb b/recipes/udev/udev_141.bb index e2b71d10f1..55ccb23f85 100644 --- a/recipes/udev/udev_141.bb +++ b/recipes/udev/udev_141.bb @@ -1,7 +1,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \ /dev/, handles hotplug events and loads drivers at boot time. It replaces \ the hotplug package and requires a kernel not older than 2.6.12." -LICENSE = "GPL" +LICENSE = "GPLv2+" # Untested DEFAULT_PREFERENCE = "-1" diff --git a/recipes/udev/udev_151.bb b/recipes/udev/udev_151.bb index 1aca146f87..884ba8f256 100644 --- a/recipes/udev/udev_151.bb +++ b/recipes/udev/udev_151.bb @@ -1,9 +1,9 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \ /dev/, handles hotplug events and loads drivers at boot time. It replaces \ the hotplug package and requires a kernel not older than 2.6.12." -LICENSE = "GPL" +LICENSE = "GPLv2+" -PR = "r4" +PR = "r5" # Untested DEFAULT_PREFERENCE = "-1" @@ -69,7 +69,7 @@ FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug" # udev installs binaries under $(udev_prefix)/lib/udev, even if ${libdir} # is ${prefix}/lib64 -FILES_${PN} += "/lib/udev/* ${libdir}/ConsoleKit" +FILES_${PN} += "/lib/udev* ${libdir}/ConsoleKit" FILES_${PN}-dbg += "/lib/udev/.debug" do_install () { @@ -104,6 +104,9 @@ do_install () { install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts + + mkdir -p ${D}${base_libdir} + ln -sf ${libdir}/udev ${D}${base_libdir}/ } do_install_append_h2200() { diff --git a/recipes/udns/files/fix-cc-check.patch b/recipes/udns/files/fix-cc-check.patch new file mode 100644 index 0000000000..0811849d0a --- /dev/null +++ b/recipes/udns/files/fix-cc-check.patch @@ -0,0 +1,36 @@ +--- a/configure.lib 2007-01-07 21:59:09.000000000 +0100 ++++ b/configure.lib 2010-03-04 11:38:32.000000000 +0100 +@@ -125,7 +125,7 @@ + echo 'int main(int argc, char **argv) { return 0; }' >conftest.c + + if [ -n "$CC" ]; then +- if ac_run $CC -o conftest conftest.c && ac_run ./conftest; then ++ if ac_run $CC -o conftest conftest.c; then + ac_result "\$CC ($CC)" + else + ac_result no +@@ -133,7 +133,7 @@ + fi + else + for cc in gcc cc ; do +- if ac_run $cc -o conftest conftest.c && ac_run ./conftest; then ++ if ac_run $cc -o conftest conftest.c; then + ac_result "$cc" + CC=$cc + break +@@ -161,15 +161,6 @@ + ccld="$cc" + if [ -n "$LDFLAGS" ]; then ccld="$ccld $LDFLAGS"; fi + if [ -n "$LIBS" ]; then ccld="$ccld $LIBS"; fi +- if ac_yesno "whenever the C compiler ($ccld) +- can produce executables" \ +- ac_compile_run <<EOF +-int main() { return 0; } +-EOF +- then : +- else +- ac_fatal "no working C compiler found" +- fi + LD='$(CC)' + [ -n "$AR" ] || AR=ar + [ -n "$ARFLAGS" ] || ARFLAGS=rv diff --git a/recipes/udns/udns_0.0.9.bb b/recipes/udns/udns_0.0.9.bb new file mode 100644 index 0000000000..ba95652855 --- /dev/null +++ b/recipes/udns/udns_0.0.9.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "DNS Resolver Library" +HOMEPAGE = "http://www.corpit.ru/mjt/udns.html" +PR = "r0" + +SRC_URI = " \ + http://www.corpit.ru/mjt/${PN}/${PN}_${PV}.tar.gz;name=udns \ + file://fix-cc-check.patch;patch=1 \ +" +SRC_URI[udns.md5sum] = "78843added6f6b690bc6019ab8ef03c9" +SRC_URI[udns.sha256sum] = "cfc5f9b5387f96e48fc9c7aa5ef6511809e6c72c0df0d533cf150016816eaad2" + +S = ${WORKDIR}/${PN}-${PV} + +TARGET_CC_ARCH += "${LDFLAGS}" + +# Package is using configure and Makefile.in, but not autotools in general ... + +do_configure() { + ./configure --disable-ipv6 +} + +do_compile() { + oe_runmake shared static +} + +do_install() { + oe_libinstall -so -a libudns ${D}${libdir} + ln -s libudns.so.0 ${D}${libdir}/libudns_s.so + install -d ${D}${includedir} + install -m 0644 ${S}/udns.h ${D}${includedir} +} diff --git a/recipes/unrar/files/makefile.unix.patch b/recipes/unrar/files/makefile.unix.patch new file mode 100644 index 0000000000..ce72351d4b --- /dev/null +++ b/recipes/unrar/files/makefile.unix.patch @@ -0,0 +1,21 @@ +--- a/makefile.unix 2009-05-03 07:18:45.000000000 +0200 ++++ b/makefile.unix 2010-03-15 13:31:31.000000000 +0100 +@@ -9,8 +9,8 @@ + #CXX=g++ + #CXXFLAGS=-O2 + DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE +-STRIP=strip +-DESTDIR=/usr ++#STRIP=strip ++#DESTDIR=/usr + + # Linux using LCC + #CXX=lcc +@@ -136,6 +136,7 @@ + $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) + + install-unrar: ++ install -d $(DESTDIR)/bin + install unrar $(DESTDIR)/bin + + uninstall-unrar: diff --git a/recipes/unrar/unrar-native_3.4.3.bb b/recipes/unrar/unrar-native_3.4.3.bb deleted file mode 100644 index 4b87691e89..0000000000 --- a/recipes/unrar/unrar-native_3.4.3.bb +++ /dev/null @@ -1,14 +0,0 @@ -require unrar.inc -inherit native - -do_stage() { - install unrar ${STAGING_BINDIR} -} - -do_package() { - : -} - -do_install() { - : -} diff --git a/recipes/unrar/unrar.inc b/recipes/unrar/unrar.inc deleted file mode 100644 index 4887ac9fb2..0000000000 --- a/recipes/unrar/unrar.inc +++ /dev/null @@ -1,7 +0,0 @@ -SRC_URI = "http://www.rarlab.com/rar/unrarsrc-${PV}.tar.gz" -S = "${WORKDIR}/unrar" - -do_compile() { - oe_runmake -f makefile.unix -} - diff --git a/recipes/unrar/unrar_3.4.3.bb b/recipes/unrar/unrar_3.4.3.bb deleted file mode 100644 index 39d81990e2..0000000000 --- a/recipes/unrar/unrar_3.4.3.bb +++ /dev/null @@ -1,6 +0,0 @@ -require unrar.inc - -do_install() { - install -d ${D}${bindir} - install -m 0755 unrar ${D}${bindir} -} diff --git a/recipes/unrar/unrar_3.9.9.bb b/recipes/unrar/unrar_3.9.9.bb new file mode 100644 index 0000000000..21e1f23d53 --- /dev/null +++ b/recipes/unrar/unrar_3.9.9.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "RAR archivers" +HOMEPAGE = "http://www.rarlab.com/" +PR = "r0" + +SRC_URI = "http://www.rarlab.com/rar/unrarsrc-${PV}.tar.gz;name=unrar \ + file://makefile.unix.patch;patch=1" +SRC_URI[unrar.md5sum] = "4271fc8710d299341c969666492b305c" +SRC_URI[unrar.sha256sum] = "460d4c014f5aaaa9b1c810dca180f07e155678b322169e20f4e51c616fa0e7ff" + +S = "${WORKDIR}/unrar" + +BBCLASSEXTEND = "native" +NATIVE_INSTALL_WORKS = "1" + +EXTRA_OEMAKE = "-f makefile.unix DESTDIR=${D}${exec_prefix}" + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake install +} diff --git a/recipes/usbutils/usbutils_0.70.bb b/recipes/usbutils/usbutils_0.70.bb index 7ec23278fa..4dfad5602e 100644 --- a/recipes/usbutils/usbutils_0.70.bb +++ b/recipes/usbutils/usbutils_0.70.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Host side USB console utilities." SECTION = "base" DEPENDS += "virtual/libusb0" -LICENSE = "GPL" +LICENSE = "GPLv2" PRIORITY = "optional" DEFAULT_PREFERENCE = "1" diff --git a/recipes/usbutils/usbutils_0.73.bb b/recipes/usbutils/usbutils_0.73.bb index ebbc306007..e10f1eb2f3 100644 --- a/recipes/usbutils/usbutils_0.73.bb +++ b/recipes/usbutils/usbutils_0.73.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Host side USB console utilities." SECTION = "base" DEPENDS += "virtual/libusb0" -LICENSE = "GPL" +LICENSE = "GPLv2" PRIORITY = "optional" DEFAULT_PREFERENCE = "1" diff --git a/recipes/usbutils/usbutils_0.82.bb b/recipes/usbutils/usbutils_0.82.bb index 436331dd5a..bcbb2671bf 100644 --- a/recipes/usbutils/usbutils_0.82.bb +++ b/recipes/usbutils/usbutils_0.82.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Host side USB console utilities." SECTION = "base" DEPENDS += "virtual/libusb0" -LICENSE = "GPL" +LICENSE = "GPLv2" PRIORITY = "optional" SRC_URI = "${SOURCEFORGE_MIRROR}/linux-usb/usbutils-${PV}.tar.gz \ diff --git a/recipes/usbutils/usbutils_0.86.bb b/recipes/usbutils/usbutils_0.86.bb index 436331dd5a..bcbb2671bf 100644 --- a/recipes/usbutils/usbutils_0.86.bb +++ b/recipes/usbutils/usbutils_0.86.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Host side USB console utilities." SECTION = "base" DEPENDS += "virtual/libusb0" -LICENSE = "GPL" +LICENSE = "GPLv2" PRIORITY = "optional" SRC_URI = "${SOURCEFORGE_MIRROR}/linux-usb/usbutils-${PV}.tar.gz \ diff --git a/recipes/usbutils/usbutils_cvs.bb b/recipes/usbutils/usbutils_cvs.bb index 9ef25c4984..e53d3db57d 100644 --- a/recipes/usbutils/usbutils_cvs.bb +++ b/recipes/usbutils/usbutils_cvs.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Host side USB console utilities." SECTION = "base" DEPENDS += "virtual/libusb0" -LICENSE = "GPL" +LICENSE = "GPLv2" PRIORITY = "optional" PV = "0.71+cvs${SRCDATE}" PR = "r4" diff --git a/recipes/xorg-driver/xf86-input-evtouch/21_more_calibration_fixups.patch b/recipes/xorg-driver/xf86-input-evtouch/02_calibration_1.6.patch index abb9e51a49..c461758115 100644 --- a/recipes/xorg-driver/xf86-input-evtouch/21_more_calibration_fixups.patch +++ b/recipes/xorg-driver/xf86-input-evtouch/02_calibration_1.6.patch @@ -1,7 +1,27 @@ -diff -u xf86-input-evtouch-0.8.8/evtouch.c xf86-input-evtouch-0.8.8/evtouch.c ---- xf86-input-evtouch-0.8.8/evtouch.c -+++ xf86-input-evtouch-0.8.8/evtouch.c -@@ -305,7 +305,7 @@ +From: Thomas Jaeger <ThJaeger@gmail.com> +Date: Sun, 22 Mar 2009 20:58:58 -0400 +Subject: Make calibration work on xserver-1.6 + +Stolen from Ubuntu. + +Index: xserver-xorg-input-evtouch/ev_calibrate.c +=================================================================== +--- xserver-xorg-input-evtouch.orig/ev_calibrate.c ++++ xserver-xorg-input-evtouch/ev_calibrate.c +@@ -218,7 +218,7 @@ + int cap_style = CapButt; /* style of the line's edje and */ + int join_style = JoinBevel; /* joined lines. */ + +- int event_mask = ExposureMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask; ++ int event_mask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask; + + int depth; + int screen_num; +Index: xserver-xorg-input-evtouch/evtouch.c +=================================================================== +--- xserver-xorg-input-evtouch.orig/evtouch.c ++++ xserver-xorg-input-evtouch/evtouch.c +@@ -306,7 +306,7 @@ } if (pos_changed == 1) { @@ -19,15 +39,3 @@ diff -u xf86-input-evtouch-0.8.8/evtouch.c xf86-input-evtouch-0.8.8/evtouch.c ConvertProc(priv->local, 0, 2, priv->raw_x, priv->raw_y, 0, 0, 0, 0, -diff -u xf86-input-evtouch-0.8.8/debian/changelog xf86-input-evtouch-0.8.8/debian/changelog ---- xf86-input-evtouch-0.8.8.orig/ev_calibrate.c -+++ xf86-input-evtouch-0.8.8/ev_calibrate.c -@@ -218,7 +218,7 @@ - int cap_style = CapButt; /* style of the line's edje and */ - int join_style = JoinBevel; /* joined lines. */ - -- int event_mask = ExposureMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask; -+ int event_mask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask; - - int depth; - int screen_num; diff --git a/recipes/xorg-driver/xf86-input-evtouch/03_server-1.6-ftbfs.diff b/recipes/xorg-driver/xf86-input-evtouch/03_server-1.6-ftbfs.diff new file mode 100644 index 0000000000..79192cbad5 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-evtouch/03_server-1.6-ftbfs.diff @@ -0,0 +1,61 @@ +From: Julien Cristau <jcristau@debian.org> +Date: Sun, 17 May 2009 18:54:59 +0200 +Subject: Fix build with server 1.6 + +* uninclude xf86Version.h +* fix InitValuatorClassDeviceStruct usage +* fix input ABI check + +Index: xserver-xorg-input-evtouch/evtouch.c +=================================================================== +--- xserver-xorg-input-evtouch.orig/evtouch.c ++++ xserver-xorg-input-evtouch/evtouch.c +@@ -30,10 +30,8 @@ + + #define _evdev_touch_C_ + +-#include <xf86Version.h> +-#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0) ++#include <xorgVersion.h> + #define XFREE86_V4 +-#endif + + /***************************************************************************** + * Standard Headers +@@ -74,7 +72,6 @@ + #include "xf86_OSproc.h" + #include "xf86Xinput.h" + #include "exevents.h" +-#include "xf86OSmouse.h" + #include "randrstr.h" + + #ifndef NEED_XF86_TYPES +@@ -139,7 +136,7 @@ + "Kenan Esau", + MODINFOSTRING1, + MODINFOSTRING2, +- XF86_VERSION_CURRENT, ++ XORG_VERSION_CURRENT, + 0, 8, 8, + ABI_CLASS_XINPUT, + ABI_XINPUT_VERSION, +@@ -652,14 +649,17 @@ + * Device reports motions on 2 axes in absolute coordinates. + * Axes min and max values are reported in raw coordinates. + */ +- if (InitValuatorClassDeviceStruct(dev, 2, xf86GetMotionEvents, ++ if (InitValuatorClassDeviceStruct(dev, 2, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 ++ xf86GetMotionEvents, ++#endif + local->history_size, Absolute) == FALSE) + { + ErrorF ("Unable to allocate EVTouch touchscreen ValuatorClassDeviceStruct\n"); + return !Success; + } + +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2 + xf86InitValuatorAxisStruct(dev, 0, 0, priv->screen_width, + 1024, + EV_AXIS_MIN_RES /* min_res */ , diff --git a/recipes/xorg-driver/xf86-input-evtouch/04_server-1.7-ftbfs.diff b/recipes/xorg-driver/xf86-input-evtouch/04_server-1.7-ftbfs.diff new file mode 100644 index 0000000000..726297cff6 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-evtouch/04_server-1.7-ftbfs.diff @@ -0,0 +1,516 @@ +commit f88ce643a4d343cc27ef6ef7e0bf148f885043ab +Author: Mattia Dongili <malattia@linux.it> +Date: Sun Jan 24 15:45:51 2010 +0900 + + 04 + + Build with 1.7. Also add some more probing taken from evdev. + + Signed-off-by: Mattia Dongili <malattia@linux.it> + +Index: xserver-xorg-input-evtouch/evtouch.c +=================================================================== +--- xserver-xorg-input-evtouch.orig/evtouch.c 2010-02-14 14:08:33.000000000 +0900 ++++ xserver-xorg-input-evtouch/evtouch.c 2010-02-14 14:13:51.000000000 +0900 +@@ -57,6 +57,7 @@ + #define NEED_EVENTS + #include <X11/X.h> + #include <X11/Xproto.h> ++#include <xserver-properties.h> + + #include "xf86.h" + +@@ -129,7 +130,6 @@ + 0 + }; + +-#ifdef XFree86LOADER + static XF86ModuleVersionInfo VersionRec = + { + "evtouch", +@@ -164,9 +164,7 @@ + } + + +-XF86ModuleData evtouchModuleData = {&VersionRec, Plug, Unplug }; +- +-#endif /* XFree86LOADER */ ++_X_EXPORT XF86ModuleData evtouchModuleData = {&VersionRec, Plug, Unplug }; + + + static const char *default_options[] = +@@ -239,7 +237,7 @@ + + priv->emulate3_timer_expired = TRUE; + xf86UnblockSIGIO(sigstate); +- ++ + return 0; + } + +@@ -339,7 +337,7 @@ + priv->cur_x, + priv->cur_y); + } +- } ++ } + } + } + +@@ -372,7 +370,7 @@ + 0, 0, 0, 0, + &priv->cur_x, &priv->cur_y); + #endif +- ++ + libtouchSetPos(priv->libtouch, priv->cur_x, priv->cur_y); + } + +@@ -394,7 +392,7 @@ + priv->emulate3_timeout, + emulate3Timer, + local); +- ++ + if ( (ev->value == 1) && (ev->code == BTN_LEFT) ) { + priv->touch_flags |= LB_STAT; + } +@@ -419,7 +417,7 @@ + DBGOUT(2, "EVTouch: Right Release\n"); + priv->touch_flags &= ~RB_STAT; + SetBtnAction(priv, 3, BTN_RELEASE); +- } ++ } + } else { + if (ev->code == BTN_LEFT) { + SetBtnAction(priv, 1, ev->value); +@@ -478,26 +476,98 @@ + return; + } + +- +- ++#define TestBit(bit, array) ((array[(bit) / LONG_BITS]) & (1L << ((bit) % LONG_BITS))) ++#define ArrayLength(a) (sizeof(a) / (sizeof((a)[0]))) + + static Bool + QueryHardware (LocalDevicePtr local) + { +- DBGOUT(2, "EVTouch: %s\n", __FUNCTION__); +- +- return Success; ++ EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private); ++ size_t len; ++ int i, num_buttons; ++ ++ DBGOUT(2, "EVTouch: %s\n", __FUNCTION__); ++ ++ if (ioctl(local->fd, EVIOCGNAME(sizeof(priv->name) - 1), priv->name) < 0) { ++ xf86Msg(X_ERROR, "ioctl EVIOCGNAME failed: %s\n", strerror(errno)); ++ goto error; ++ } ++ ++ len = ioctl(local->fd, EVIOCGBIT(0, sizeof(priv->bitmask)), priv->bitmask); ++ if (len < 0) { ++ xf86Msg(X_ERROR, "%s: ioctl EVIOCGBIT failed: %s\n", ++ local->name, strerror(errno)); ++ goto error; ++ } ++ ++ len = ioctl(local->fd, EVIOCGBIT(EV_REL, sizeof(priv->rel_bitmask)), priv->rel_bitmask); ++ if (len < 0) { ++ xf86Msg(X_ERROR, "%s: ioctl EVIOCGBIT failed: %s\n", ++ local->name, strerror(errno)); ++ goto error; ++ } ++ ++ len = ioctl(local->fd, EVIOCGBIT(EV_ABS, sizeof(priv->abs_bitmask)), priv->abs_bitmask); ++ if (len < 0) { ++ xf86Msg(X_ERROR, "%s: ioctl EVIOCGBIT failed: %s\n", ++ local->name, strerror(errno)); ++ goto error; ++ } ++ ++ len = ioctl(local->fd, EVIOCGBIT(EV_KEY, sizeof(priv->key_bitmask)), priv->key_bitmask); ++ if (len < 0) { ++ xf86Msg(X_ERROR, "%s: ioctl EVIOCGBIT failed: %s\n", ++ local->name, strerror(errno)); ++ goto error; ++ } ++ ++ num_buttons = 0; ++ ++ /* count all buttons */ ++ for (i = BTN_MISC; i < BTN_JOYSTICK; i++) ++ { ++ if (TestBit(i, priv->key_bitmask)) ++ { ++ if (i > num_buttons) ++ num_buttons = i; ++ } ++ } ++ if (num_buttons) ++ { ++ priv->flags |= EVTOUCH_BUTTON_EVENTS; ++ priv->num_buttons = num_buttons; ++ xf86Msg(X_INFO, "%s: Found %d mouse buttons\n", local->name, ++ num_buttons); ++ } ++ ++ for (i = 0; i < REL_MAX; i++) { ++ if (TestBit(i, priv->rel_bitmask)) { ++ xf86Msg(X_INFO, "%s: Found relative axes\n", local->name); ++ priv->flags |= EVTOUCH_RELATIVE_EVENTS; ++ break; ++ } ++ } ++ ++ for (i = 0; i < ABS_MAX; i++) { ++ if (TestBit(i, priv->abs_bitmask)) { ++ xf86Msg(X_INFO, "%s: Found absolute axes\n", local->name); ++ priv->flags |= EVTOUCH_ABSOLUTE_EVENTS; ++ break; ++ } ++ } ++ ++ return Success; ++error: ++ return (!Success); + } + + +- +- + static Bool + DeviceOn (DeviceIntPtr dev) + { + LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate; + EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private); +- ++ + local->fd = xf86OpenSerial(local->options); + + DBGOUT(2, "EVTouch: %s\n", __FUNCTION__ ); +@@ -512,8 +582,7 @@ + + DBG (9, XisbTrace (priv->buffer, 1)); + +- +- if (!priv->buffer) ++ if (!priv->buffer) + { + xf86CloseSerial(local->fd); + local->fd = -1; +@@ -531,7 +600,6 @@ + if (ioctl(local->fd, EVIOCGRAB, (void *)1)) + xf86Msg(X_ERROR, "%s: Unable to grab device (%s).\n", local->name, strerror(errno)); + +- + #ifndef XFREE86_V4 + xf86AddEnabledDevice(local); + #else +@@ -544,8 +612,6 @@ + } + + +- +- + static Bool + DeviceOff (DeviceIntPtr dev) + { +@@ -555,7 +621,7 @@ + DBGOUT(2, "EVTouch: %s\n", __FUNCTION__ ); + + if (local->fd != -1) +- { ++ { + ioctl(local->fd, EVIOCGRAB, (void *)0); + xf86RemoveEnabledDevice (local); + if (priv->buffer) +@@ -577,6 +643,73 @@ + } + + ++static Atom *EvtouchInitButtonLabels(void) ++{ ++#ifdef HAVE_LABELS ++ Atom *labels = xalloc(EV_MAX_BUTTONS * sizeof(Atom)); ++ ++ /* initialize the 5 button labels used by this driver */ ++ labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT); ++ labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE); ++ labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT); ++ labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP); ++ labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN); ++ ++ return labels; ++#endif ++} ++ ++static char* abs_labels[] = { ++ AXIS_LABEL_PROP_ABS_X, ++ AXIS_LABEL_PROP_ABS_Y, ++ AXIS_LABEL_PROP_ABS_Z, ++ AXIS_LABEL_PROP_ABS_WHEEL ++}; ++static char* rel_labels[] = { ++ AXIS_LABEL_PROP_REL_X, ++ AXIS_LABEL_PROP_REL_Y, ++ AXIS_LABEL_PROP_REL_Z, ++ AXIS_LABEL_PROP_REL_WHEEL ++}; ++ ++static void ++EvtouchInitAxesLabels(EVTouchPrivatePtr pEVTouch, int natoms, Atom *atoms) ++{ ++#ifdef HAVE_LABELS ++ Atom atom; ++ int axis; ++ char **labels; ++ int labels_len = 0; ++ char *misc_label; ++ ++ if (pEVTouch->flags & EVTOUCH_ABSOLUTE_EVENTS) ++ { ++ labels = abs_labels; ++ labels_len = ArrayLength(abs_labels); ++ misc_label = AXIS_LABEL_PROP_ABS_MISC; ++ } else if ((pEVTouch->flags & EVTOUCH_RELATIVE_EVENTS)) ++ { ++ labels = rel_labels; ++ labels_len = ArrayLength(rel_labels); ++ misc_label = AXIS_LABEL_PROP_REL_MISC; ++ } ++ ++ memset(atoms, 0, natoms * sizeof(Atom)); ++ ++ /* Now fill the ones we know */ ++ for (axis = 0; axis < labels_len; axis++) ++ { ++ if (pEVTouch->axis_map[axis] == -1) ++ continue; ++ ++ atom = XIGetKnownProperty(labels[axis]); ++ if (!atom) /* Should not happen */ ++ continue; ++ ++ atoms[pEVTouch->axis_map[axis]] = atom; ++ } ++#endif ++} + + + static Bool +@@ -585,6 +718,7 @@ + DBGOUT(2, "EVTouch: %s\n", __FUNCTION__); + LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate; + EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private); ++ Atom *labels, *atoms; + unsigned char map[EV_MAX_BUTTONS]; + int i; + +@@ -593,7 +727,7 @@ + + priv->btn_count = EV_MAX_BUTTONS; + +- /* ++ /* + * these have to be here instead of in the SetupProc, because when the + * SetupProc is run at server startup, screenInfo is not setup yet + */ +@@ -603,9 +737,9 @@ + priv->screen_height = pScrn->virtualY; + priv->pViewPort_X0 = &(pScrn->frameX0); /* initialize the pointers to the viewport coords */ + if ( (priv->screen_width != priv->phys_width) || +- (priv->screen_height != priv->phys_height) ) ++ (priv->screen_height != priv->phys_height) ) + priv->virtual = 1; +- else ++ else + priv->virtual = 0; + + priv->pViewPort_Y0 = &(pScrn->frameY0); +@@ -620,24 +754,29 @@ + DBGOUT(2, "EVTouch: MaxValue H,V: %d %d\n", pScrn->maxHValue, pScrn->maxVValue); + + priv->screen_width = screenInfo.screens[priv->screen_num]->width; +- priv->screen_height = screenInfo.screens[priv->screen_num]->height; ++ priv->screen_height = screenInfo.screens[priv->screen_num]->height; + +- /* ++ /* + * Device reports button press for 5 buttons. + */ +- if (InitButtonClassDeviceStruct (dev, EV_MAX_BUTTONS, map) == FALSE) ++ labels = EvtouchInitButtonLabels(); ++ if (InitButtonClassDeviceStruct (dev, EV_MAX_BUTTONS, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ labels, ++#endif ++ map) == FALSE) + { + ErrorF("Unable to allocate EVTouch touchscreen ButtonClassDeviceStruct\n"); + return BadAlloc; +- } ++ } + +- DBGOUT(2, "EVTouch: %s btn_count=%d\n", __FUNCTION__, ++ DBGOUT(2, "EVTouch: %s btn_count=%d\n", __FUNCTION__, + priv->btn_count); + priv->btn_actions = xcalloc(priv->btn_count, sizeof(BtnAction)); +- memset(priv->btn_actions, 0, ++ memset(priv->btn_actions, 0, + priv->btn_count * sizeof(BtnAction)); +- +- DBGOUT(2, "EVTouch: %s btn_count=%d\n", __FUNCTION__, ++ ++ DBGOUT(2, "EVTouch: %s btn_count=%d\n", __FUNCTION__, + priv->btn_count); + + if (InitFocusClassDeviceStruct(dev) == FALSE) { +@@ -645,13 +784,18 @@ + return !Success; + } + +- /* ++ /* + * Device reports motions on 2 axes in absolute coordinates. + * Axes min and max values are reported in raw coordinates. + */ ++ atoms = xalloc(2 * sizeof(Atom)); ++ EvtouchInitAxesLabels(priv, 2, atoms); ++ + if (InitValuatorClassDeviceStruct(dev, 2, + #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 + xf86GetMotionEvents, ++#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ atoms, + #endif + local->history_size, Absolute) == FALSE) + { +@@ -660,12 +804,20 @@ + } + + #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2 +- xf86InitValuatorAxisStruct(dev, 0, 0, priv->screen_width, ++ xf86InitValuatorAxisStruct(dev, 0, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ atoms[0], ++#endif ++ 0, priv->screen_width, + 1024, + EV_AXIS_MIN_RES /* min_res */ , + EV_AXIS_MAX_RES /* max_res */ ); + xf86InitValuatorDefaults(dev, 0); +- xf86InitValuatorAxisStruct(dev, 1, 0, priv->screen_height, ++ xf86InitValuatorAxisStruct(dev, 1, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ atoms[1], ++#endif ++ 0, priv->screen_height, + 1024, + EV_AXIS_MIN_RES /* min_res */ , + EV_AXIS_MAX_RES /* max_res */ ); +@@ -682,7 +834,6 @@ + priv->raw_y=priv->cur_y; + libtouchSetPos(priv->libtouch, priv->cur_x, priv->cur_y); + +- + if (InitProximityClassDeviceStruct (dev) == FALSE) + { + ErrorF ("Unable to allocate EVTouch touchscreen ProximityClassDeviceStruct\n"); +@@ -695,7 +846,7 @@ + return !Success; + } + +- /* ++ /* + * Allocate the motion events buffer. + */ + xf86MotionHistoryAllocate (local); +@@ -765,7 +916,7 @@ + if (sizeof(priv->ev) == count) { + count = 0; + EVTouchDumpPacketToLog(priv); +- ++ + return Success; + } + } +Index: xserver-xorg-input-evtouch/evtouch.h +=================================================================== +--- xserver-xorg-input-evtouch.orig/evtouch.h 2010-02-14 14:01:43.000000000 +0900 ++++ xserver-xorg-input-evtouch/evtouch.h 2010-02-14 14:08:34.000000000 +0900 +@@ -35,6 +35,22 @@ + #define DBGOUT(lvl, ...) + #endif + ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3 ++#define HAVE_PROPERTIES 1 ++ ++/* 1.6 has properties, but no labels */ ++#ifdef AXIS_LABEL_PROP ++#define HAVE_LABELS ++#else ++#undef HAVE_LABELS ++#endif ++ ++#endif ++ ++#define LONG_BITS (sizeof(long) * 8) ++/* Number of longs needed to hold the given number of bits */ ++#define NLONGS(x) (((x) + LONG_BITS - 1) / LONG_BITS) ++ + /****************************************************************************** + * Definitions + * structs, typedefs, #defines, enums +@@ -52,6 +68,10 @@ + + #define EV_MAX_BUTTONS 5 + ++#define EVTOUCH_BUTTON_EVENTS 0x01 ++#define EVTOUCH_RELATIVE_EVENTS 0x02 ++#define EVTOUCH_ABSOLUTE_EVENTS 0x04 ++ + #define TOUCHED 0x01 + #define X_COORD 0x02 + #define Y_COORD 0x04 +@@ -80,6 +100,8 @@ + int min_rel_y; /* Minimum y reported by calibration */ + int max_rel_y; /* Maximum y */ + ++ int axis_map[max(ABS_CNT, REL_CNT)]; /* Map evtouch <axis> to index */ ++ + int drag_timer; + Bool emulate3; + int emulate3_timeout; +@@ -129,10 +151,10 @@ + int screen_num; /* Screen associated with the device */ + int screen_width; /* Width of the associated X screen */ + int screen_height; /* Height of the screen */ +- ++ + XISBuffer *buffer; + struct input_event ev; /* packet being/just read */ +- ++ + int packeti; /* index into packet */ + Bool cs7flag; + Bool binary_pkt; /* indicates packet was a binary touch */ +@@ -141,6 +163,16 @@ + + LibTouchRecPtr libtouch; + LocalDevicePtr local; ++ ++ /* Cached info from device. */ ++ int flags; ++ int num_buttons; ++ char name[1024]; ++ unsigned long bitmask[NLONGS(EV_CNT)]; ++ unsigned long key_bitmask[NLONGS(KEY_CNT)]; ++ unsigned long rel_bitmask[NLONGS(REL_CNT)]; ++ unsigned long abs_bitmask[NLONGS(ABS_CNT)]; ++ + } EVTouchPrivateRec, *EVTouchPrivatePtr; + + diff --git a/recipes/xorg-driver/xf86-input-evtouch/20_fix_calibrate_submission_directions.patch b/recipes/xorg-driver/xf86-input-evtouch/20_fix_calibrate_submission_directions.patch deleted file mode 100644 index 68950a4ca3..0000000000 --- a/recipes/xorg-driver/xf86-input-evtouch/20_fix_calibrate_submission_directions.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: xf86-input-evtouch-0.8.8/calibrate.sh -=================================================================== ---- xf86-input-evtouch-0.8.8.orig/calibrate.sh 2009-01-14 14:14:10.000000000 +0100 -+++ xf86-input-evtouch-0.8.8/calibrate.sh 2009-01-14 14:14:51.000000000 +0100 -@@ -25,7 +25,7 @@ - FAILINFO="No evtouch capable device found, if you are sure you have \n\ - an evtouch capable touchscreen, please mail the \ - resulting file of the command \"lshal > evtouch_hal.out\" to the\n\ --ubuntu-mobile@lists.ubuntu.com mailing list, so support for your \ -+bug url https://bugs.launchpad.net/bugs/317094, so support for your \ - device can be added." - - if [ -z "$UDI" ];then diff --git a/recipes/xorg-driver/xf86-input-evtouch/fdi/50-elo-2700.fdi b/recipes/xorg-driver/xf86-input-evtouch/fdi/50-elo-2700.fdi new file mode 100644 index 0000000000..d274a54f72 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-evtouch/fdi/50-elo-2700.fdi @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> +<deviceinfo version="0.2"> + <device> + <match key="info.product" contains="Elo TouchSystems, Inc. Elo TouchSystems 2700 IntelliTouch(r) USB Touchmonitor Interface"> + <match key="info.capabilities" contains="input"> + <merge key="input.x11_driver" type="string">evtouch</merge> + <merge key="input.x11_options.minx" type="string">130</merge> + <merge key="input.x11_options.miny" type="string">197</merge> + <merge key="input.x11_options.maxx" type="string">3945</merge> + <merge key="input.x11_options.maxy" type="string">3894</merge> + <merge key="input.x11_options.swapx" type="string">1</merge> + <merge key="input.x11_options.swapy" type="string">1</merge> + </match> + </match> + </device> +</deviceinfo> diff --git a/recipes/xorg-driver/xf86-input-evtouch/fdi/50-gunze.fdi b/recipes/xorg-driver/xf86-input-evtouch/fdi/50-gunze.fdi new file mode 100644 index 0000000000..3a5f49cb03 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-evtouch/fdi/50-gunze.fdi @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="ISO-8859-1" ?> + +<deviceinfo version="0.2"> + <device> + <match key="info.product" contains="GUNZE USB Touch Panel"> + <merge key="input.x11_driver" type="string">evtouch</merge> + <merge key="input.x11_options.ReportingMode" type="string">Raw</merge> + <merge key="input.x11_options.Emulate3Buttons" type="string">false</merge> + <merge key="input.x11_options.Emulate3Timeout" type="string">1</merge> + <merge key="input.x11_options.MinX" type="string">35</merge> + <merge key="input.x11_options.MinY" type="string">37</merge> + <merge key="input.x11_options.MaxX" type="string">990</merge> + <merge key="input.x11_options.MaxY" type="string">986</merge> + </match> + </device> +</deviceinfo>
\ No newline at end of file diff --git a/recipes/xorg-driver/xf86-input-evtouch/fdi/50-ideaco-idc6681.fdi b/recipes/xorg-driver/xf86-input-evtouch/fdi/50-ideaco-idc6681.fdi new file mode 100644 index 0000000000..390f3bc652 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-evtouch/fdi/50-ideaco-idc6681.fdi @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> + +<deviceinfo version="0.2"> + <device> + <match key="info.product" contains="IDEACO"> + <match key="info.product" contains="IDC 6681"> + <match key="info.capabilities" contains="input.touchpad"> + <merge key="input.x11_driver" type="string">evtouch</merge> + <merge key="input.x11_options.reportingmode" type="string">raw</merge> + <merge key="input.x11_options.taptimer" type="string">50</merge> + <merge key="input.x11_options.longtouchtimer" type="string">30</merge> + <merge key="input.x11_options.movelimit" type="string">15</merge> + <merge key="input.x11_options.emulate3buttons" type="string">true</merge> + <merge key="input.x11_options.emulate3timeout" type="string">50</merge> + <merge key="input.x11_options.maxx" type="string">1100</merge> + <merge key="input.x11_options.maxy" type="string">1650</merge> + <merge key="input.x11_options.minx" type="string">7220</merge> + <merge key="input.x11_options.miny" type="string">6560</merge> + </match> + </match> + </match> + </device> +</deviceinfo> diff --git a/recipes/xorg-driver/xf86-input-evtouch/fdi/50-touchpack.fdi b/recipes/xorg-driver/xf86-input-evtouch/fdi/50-touchpack.fdi new file mode 100644 index 0000000000..cb14eeba48 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-evtouch/fdi/50-touchpack.fdi @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> +<deviceinfo version="0.2"> + <device> + <match key="info.product" contains="HID TOUCH HID Touch Panel"> + <match key="info.capabilities" contains="input"> + <merge key="input.x11_driver" type="string">evtouch</merge> + <merge key="input.x11_options.reportingmode" type="string">raw</merge> + <merge key="input.x11_options.emulate3buttons" type="string">false</merge> + <merge key="input.x11_options.emulate3timeout" type="string">50</merge> + <merge key="input.x11_options.sendcoreevents" type="string">true</merge> + <merge key="input.x11_options.maxx" type="string">4095</merge> + <merge key="input.x11_options.maxy" type="string">4095</merge> + <merge key="input.x11_options.minx" type="string">21</merge> + <merge key="input.x11_options.miny" type="string">0</merge> + <merge key="input.x11_options.Rotate" type="string">false</merge> + <merge key="input.x11_options.Swapx" type="string">false</merge> + <merge key="input.x11_options.Swapy" type="string">false</merge> + <merge key="input.x11_options.taptimer" type="string">30</merge> + <merge key="input.x11_options.longtouchtimer" type="string">750</merge> + <merge key="input.x11_options.longtouched_action" type="string">click</merge> + <merge key="input.x11_options.longtouched_button" type="string">3</merge> + <merge key="input.x11_options.oneandhalftap_button" type="string">2</merge> + <merge key="input.x11_options.movelimit" type="string">10</merge> + <merge key="input.x11_options.touched_drag" type="string">1</merge> + <merge key="input.x11_options.maybetapped_action" type="string">click</merge> + <merge key="input.x11_options.maybetapped_button" type="string">1</merge> + </match> + </match> + </device> +</deviceinfo> diff --git a/recipes/xorg-driver/xf86-input-evtouch/xf86-input-evtouch_0.8.8-0ubuntu6.diff b/recipes/xorg-driver/xf86-input-evtouch/xf86-input-evtouch_0.8.8-0ubuntu6.diff deleted file mode 100644 index abe5b8f4ba..0000000000 --- a/recipes/xorg-driver/xf86-input-evtouch/xf86-input-evtouch_0.8.8-0ubuntu6.diff +++ /dev/null @@ -1,4210 +0,0 @@ ---- xf86-input-evtouch-0.8.8.orig/evtouch.c -+++ xf86-input-evtouch-0.8.8/evtouch.c -@@ -30,8 +30,8 @@ - - #define _evdev_touch_C_ - --#include <xf86Version.h> --#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0) -+#include <xorgVersion.h> -+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(3,9,0,0,0) - #define XFREE86_V4 - #endif - -@@ -74,7 +74,6 @@ - #include "xf86_OSproc.h" - #include "xf86Xinput.h" - #include "exevents.h" --#include "xf86OSmouse.h" - #include "randrstr.h" - - #ifndef NEED_XF86_TYPES -@@ -139,7 +138,7 @@ - "Kenan Esau", - MODINFOSTRING1, - MODINFOSTRING2, -- XF86_VERSION_CURRENT, -+ XORG_VERSION_CURRENT, - 0, 8, 8, - ABI_CLASS_XINPUT, - ABI_XINPUT_VERSION, -@@ -653,14 +652,13 @@ - * Device reports motions on 2 axes in absolute coordinates. - * Axes min and max values are reported in raw coordinates. - */ -- if (InitValuatorClassDeviceStruct(dev, 2, xf86GetMotionEvents, -+ if (InitValuatorClassDeviceStruct(dev, 2, - local->history_size, Absolute) == FALSE) - { - ErrorF ("Unable to allocate EVTouch touchscreen ValuatorClassDeviceStruct\n"); - return !Success; - } - --#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 - xf86InitValuatorAxisStruct(dev, 0, 0, priv->screen_width, - 1024, - EV_AXIS_MIN_RES /* min_res */ , -@@ -671,10 +669,6 @@ - EV_AXIS_MIN_RES /* min_res */ , - EV_AXIS_MAX_RES /* max_res */ ); - xf86InitValuatorDefaults(dev, 1); --#else -- xf86InitValuatorAxisStruct(dev, 0, priv->min_x, priv->max_x, -- xf86InitValuatorDefaults(dev, 1); --#endif - - /* Initial position of pointer on screen: Centered */ - priv->cur_x=(priv->max_x - priv->min_x)/2; ---- xf86-input-evtouch-0.8.8.orig/debian/changelog -+++ xf86-input-evtouch-0.8.8/debian/changelog -@@ -0,0 +1,259 @@ -+xf86-input-evtouch (0.8.8-0ubuntu6) karmic; urgency=low -+ -+ * Add debian/fdi/50-touchpack.fdi to support TouchPack touchscreen devices -+ (Clevo TN120 series, ASUS EeeTOP, Winux Tablet, ...) -+ (LP: #401039) -+ -+ -- Mirsal Ennaime <mirsal@winux.fr> Sat, 24 Oct 2009 18:10:18 +0200 -+ -+xf86-input-evtouch (0.8.8-0ubuntu5) karmic; urgency=low -+ -+ * control: Add dependencies for ttf-freefont and x-ttcidfont-conf. -+ These dependencies are required by one of the earlier patches. -+ (LP: #299178) -+ * Add debian/fdi/50-elo-2700.fdi to support EloTouch 2700 IntelliTouch -+ Touchmonitor Interface. -+ (LP: #362308) -+ * Add debian/fdi/50-gunze.fdi to support GUNZE USB Touch Panel -+ (LP: #368135) -+ -+ -- Bryce Harrington <bryce@ubuntu.com> Wed, 14 Oct 2009 02:10:14 -0700 -+ -+xf86-input-evtouch (0.8.8-0ubuntu4) karmic; urgency=low -+ -+ * Add debian/fdi/50-ideaco-idc6681.fdi to support IDEACO IDC 6681 -+ touchscreen. -+ (LP: #378357) -+ -+ -- Bryce Harrington <bryce@ubuntu.com> Wed, 14 Oct 2009 01:35:50 -0700 -+ -+xf86-input-evtouch (0.8.8-0ubuntu3) jaunty; urgency=low -+ -+ * 21_more_calibration_fixups.patch: Make calibration work on xserver-1.6 -+ -+ -- Thomas Jaeger <ThJaeger@gmail.com> Sun, 22 Mar 2009 20:58:58 -0400 -+ -+xf86-input-evtouch (0.8.8-0ubuntu2) jaunty; urgency=low -+ -+ * install fdi files to /usr/share/hal/fdi/policy/20thirdparty so we make -+ sure its not synaptics that gets used. -+ -+ -- Oliver Grawert <ogra@ubuntu.com> Wed, 28 Jan 2009 16:17:39 +0100 -+ -+xf86-input-evtouch (0.8.8-0ubuntu1) jaunty; urgency=low -+ -+ * New upstream release, packaged by Thomas Jaeger (ThJaeger@gmail.com) -+ Thanks a lot for fixing the header issues !! (LP: #312098) -+ - fix rotation issues (LP: #222164) -+ * 20_fix_calibrate_submission_directions.patch, point lshal submission to a -+ LP bug instead of pointing people to a subscription only -+ mailing list (LP: #307503) -+ -+ -- Oliver Grawert <ogra@ubuntu.com> Wed, 14 Jan 2009 14:04:58 -0500 -+ -+xf86-input-evtouch (0.8.7-4build2) jaunty; urgency=low -+ -+ * Rebuild against the new xserver. -+ -+ -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 15 Dec 2008 11:49:43 +0200 -+ -+xf86-input-evtouch (0.8.7-4build1) intrepid; urgency=low -+ -+ * Rebuild due to x11proto-input fix in 283921 -+ -+ -- Bryce Harrington <bryce@ubuntu.com> Sat, 18 Oct 2008 01:45:02 -0700 -+ -+xf86-input-evtouch (0.8.7-3ubuntu12) intrepid; urgency=low -+ -+ * add more touchscreen .fdi files -+ * install all touchscreen .fdi files to /usr/share/hal/fdi/policy/10osvendor -+ with sequence number 50 so they will override evdev and mouse settings -+ -+ -- Oliver Grawert <ogra@ubuntu.com> Thu, 16 Oct 2008 01:50:09 +0200 -+ -+xf86-input-evtouch (0.8.7-3ubuntu11) intrepid; urgency=low -+ -+ * fix .fdi install location to make sure hal doesnt prefer mouse settings -+ for evtouch devices -+ -+ -- Oliver Grawert <ogra@ubuntu.com> Mon, 29 Sep 2008 22:39:37 +0200 -+ -+xf86-input-evtouch (0.8.7-3ubuntu10) intrepid; urgency=low -+ -+ * update halification patch of calibration script to make sure it doesnt -+ fire if no evtouch capable device is in hal. -+ * add .fdi file for Fujitsu lifebook (and other Fujitsu driven touchscreen -+ devices with Fujitsu USB Touch Panel). -+ * add sane defaults to ideaco and eGalax fdi files. -+ * add selection of dialog frontends to show the info in X. -+ * move zenity to recommends, add xdialog and kdebase-bin (for kdialog) as -+ different dialog options. -+ -+ -- Oliver Grawert <ogra@ubuntu.com> Thu, 25 Sep 2008 19:57:51 +0200 -+ -+xf86-input-evtouch (0.8.7-3ubuntu9) intrepid; urgency=low -+ -+ * quieten down initscript a bit (we dont want a newline for each applied -+ value on screen) -+ * call initscript at end of calibration, so new values are applied without -+ having to restart the system. -+ -+ -- Oliver Grawert <ogra@ubuntu.com> Thu, 25 Sep 2008 13:27:41 +0200 -+ -+xf86-input-evtouch (0.8.7-3ubuntu8) intrepid; urgency=low -+ -+ * add 09_calibrate-script-halification.patch, adds hal functionallity to -+ calibration tool, makes the script work under X and gives useful output -+ through zenity dialogs -+ * add 10_ev_calibrate_fixups.patch, fix ev_calibrate.c to use a useful font -+ in calibration, make it write to /etc/evtouch/config in a format that can -+ be parsed by the evtouch hal-set-property initscript -+ * add calibrate.desktop and calibrate icon file (uuencoded), add sharutils -+ to build-deps -+ * make sure /etc/evtouch dir is created by the package so ev_calibrate can -+ write its config there. -+ * add hal to dependencies, zenity to suggests -+ * add xserver-xorg-input-evtouch initscript to apply calibration data on -+ system boot via hal-set-property -+ * include .fdi files for ideaco and eGalax touchscreens (hopefully there -+ will be more soon) -+ * closes (LP: #261873) -+ -+ -- Oliver Grawert <ogra@ubuntu.com> Thu, 25 Sep 2008 00:54:44 +0200 -+ -+xf86-input-evtouch (0.8.7-3ubuntu7) intrepid; urgency=low -+ -+ * add CURSORDIR to debian/rules to make calibration tool work -+ * link calibration tools to /usr/bin so the low level calibration tools work -+ on a basic level -+ -+ -- Oliver Grawert <ogra@ubuntu.com> Wed, 24 Sep 2008 13:27:49 +0200 -+ -+xf86-input-evtouch (0.8.7-3ubuntu6) intrepid; urgency=low -+ -+ * add libtouch.c to 08_fix_xf86memset.patch. (LP: #254848) -+ -+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Thu, 07 Aug 2008 11:36:17 +0300 -+ -+xf86-input-evtouch (0.8.7-3ubuntu5) intrepid; urgency=low -+ -+ * add 08_fix_xf86memset.patch, fixes (LP: #254848) -+ -+ -- Oliver Grawert <ogra@ubuntu.com> Tue, 05 Aug 2008 17:46:19 +0200 -+ -+xf86-input-evtouch (0.8.7-3ubuntu4) intrepid; urgency=low -+ -+ * Uh, ok. Don't apply 04_include_xf86_ansic_h.patch. (FTBFS) -+ -+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 08 Jul 2008 14:22:13 +0300 -+ -+xf86-input-evtouch (0.8.7-3ubuntu3) intrepid; urgency=low -+ -+ * libtouch.c: don't #include <xf86_ansic.h>. It is no more. (FTBFS) -+ -+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 08 Jul 2008 14:13:32 +0300 -+ -+xf86-input-evtouch (0.8.7-3ubuntu2) intrepid; urgency=low -+ -+ * Rebuild against the new xserver-xorg-dev. -+ -+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Mon, 07 Jul 2008 17:44:38 +0300 -+ -+xf86-input-evtouch (0.8.7-3ubuntu1) hardy; urgency=low -+ -+ * Merge from debian unstable, remaining changes: (LP: #190004) -+ - Change maintainer address. -+ - Change the default font from helvetica to fixed. -+ * Drop Pepper/Q1 patch, upstream has a slightly different fix -+ * Upstream includes fix for running on amd64 (LP: #155880) -+ -+ -- Steve Magoun <steve.magoun@canonical.com> Thu, 07 Feb 2008 14:09:00 -0500 -+ -+xf86-input-evtouch (0.8.7-3) unstable; urgency=low -+ -+ * work(!!!!) with xserver-xorg-core 1.4 -+ * added xf86-input-evtouch-0.8.7-misc.patch from -+ http://www.postnuklear.de/xorg-patches/ (Closes: #443726) -+ * bump Standards-Version to 3.7.3 -+ * use Vcs and Homepage headers in debian/control -+ -+ -- Mattia Dongili <malattia@debian.org> Sat, 02 Feb 2008 21:32:15 +0900 -+ -+xf86-input-evtouch (0.8.7-2ubuntu1) hardy; urgency=low -+ -+ * Merge from debian unstable, remaining changes: -+ - Change maintainer address. -+ - Add patch from Pepper to handle the touch screen on the Samsung Q1 -+ Ultra correctly. -+ - Change the default font from helvetica to fixed. -+ -+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 13 Nov 2007 10:53:54 +0200 -+ -+xf86-input-evtouch (0.8.7-2) unstable; urgency=low -+ -+ * build with xserver-xorg-core 1.4 -+ -+ -- Mattia Dongili <malattia@debian.org> Mon, 17 Sep 2007 16:52:54 +0900 -+ -+xf86-input-evtouch (0.8.7-1) unstable; urgency=low -+ -+ * New upstream release: -+ - Added "fix" for AMD64-crashes on touch (Closes: #431925) -+ * updated xsfbs -+ * removed 03_fix_compile_warns.patch applied upstream -+ -+ -- Mattia Dongili <malattia@debian.org> Tue, 11 Sep 2007 22:42:32 +0900 -+ -+xf86-input-evtouch (0.8.6-1ubuntu1) gutsy; urgency=low -+ -+ * Add patch from Pepper to handle the touch screen on the Samsung Q1 -+ Ultra correctly. -+ * Change the default font from helvetica to fixed. -+ -+ -- Tollef Fog Heen <tfheen@ubuntu.com> Wed, 11 Jul 2007 18:52:09 +0200 -+ -+xf86-input-evtouch (0.8.6-1) unstable; urgency=low -+ -+ * New upstream release: -+ - Fixed classic rotation (Closes: #417546) -+ * removed 04_fix_segv_on_device_off.patch, applied upstream -+ * updated evtouch.html -+ -+ -- Mattia Dongili <malattia@debian.org> Sat, 16 Jun 2007 14:31:58 +0900 -+ -+xf86-input-evtouch (0.8.5-3) unstable; urgency=low -+ -+ * Use xsfbs to get xserver dependencies automatically. -+ -+ -- Mattia Dongili <malattia@debian.org> Sun, 10 Jun 2007 10:44:51 +0900 -+ -+xf86-input-evtouch (0.8.5-2) unstable; urgency=low -+ -+ * Fix SEGV on vt switch (DeviceClose actually). -+ -+ -- Mattia Dongili <malattia@debian.org> Wed, 30 May 2007 15:55:59 +0900 -+ -+xf86-input-evtouch (0.8.5-1) unstable; urgency=low -+ -+ * New upstream release. -+ -+ -- Mattia Dongili <malattia@debian.org> Fri, 11 May 2007 18:28:41 +0900 -+ -+xf86-input-evtouch (0.8.3-1) unstable; urgency=low -+ -+ * New upstream release. -+ -+ -- Mattia Dongili <malattia@debian.org> Mon, 19 Feb 2007 12:34:26 +0100 -+ -+xf86-input-evtouch (0.8.2-1) unstable; urgency=low -+ -+ * New upstream release. -+ -+ -- Mattia Dongili <malattia@debian.org> Sat, 03 Feb 2007 20:14:40 +0100 -+ -+xf86-input-evtouch (0.8.1-1) unstable; urgency=low -+ -+ * Initial release. (Closes: #404932) -+ -+ -- Mattia Dongili <malattia@debian.org> Fri, 29 Dec 2006 15:01:18 +0100 -+ ---- xf86-input-evtouch-0.8.8.orig/debian/xserver-xorg-input-evtouch.links -+++ xf86-input-evtouch-0.8.8/debian/xserver-xorg-input-evtouch.links -@@ -0,0 +1,2 @@ -+usr/lib/xf86-input-evtouch/ev_calibrate usr/bin/ev_calibrate -+/usr/lib/xf86-input-evtouch/calibrate.sh usr/bin/calibrate_touchscreen ---- xf86-input-evtouch-0.8.8.orig/debian/copyright -+++ xf86-input-evtouch-0.8.8/debian/copyright -@@ -0,0 +1,34 @@ -+This package was debianized Mattia Dongili <malattia@debian.org> based on the work -+by Rex Tsai <chihchun@debian.org.tw> on Sun, 03 Dec 2006 18:53:48 +0100. -+ -+It was downloaded from http://www.stz-softwaretechnik.com/~ke/touchscreen/evtouch.html -+ -+Upstream Author: Kenan Esau <kenan.esau@conan.de> -+ -+Copyright: 2004-2006 Kenan Esau <kenan.esau@conan.de>, Baltmannsweiler, Germany. -+ -+License: -+ -+ Permission to use, copy, modify, distribute, and sell this software and its -+ documentation for any purpose is hereby granted without fee, provided that -+ the above copyright notice appear in all copies and that both that -+ copyright notice and this permission notice appear in supporting -+ documentation, and that the names of copyright holders not be -+ used in advertising or publicity pertaining to distribution of the -+ software without specific, written prior permission. The copyright holders -+ make no representations about the suitability of this -+ software for any purpose. It is provided "as is" without express or -+ implied warranty. -+ -+ THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS -+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -+ FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY -+ SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER -+ RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF -+ CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -+ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ -+ -+The Debian packaging is (C) 2006, Mattia Dongili <malattia@debian.org> and -+is licensed under the GPL, see `/usr/share/common-licenses/GPL'. -+ ---- xf86-input-evtouch-0.8.8.orig/debian/calibrate.desktop -+++ xf86-input-evtouch-0.8.8/debian/calibrate.desktop -@@ -0,0 +1,12 @@ -+[Desktop Entry] -+Name=Calibrate Touchscreen -+Name[de]=Touchscreen Kalibrieren -+Comment=Run the touchscreen calibration tool -+Encoding=UTF-8 -+Exec=gksu /usr/bin/calibrate_touchscreen -+Terminal=false -+Type=Application -+Icon=calibrate.png -+StartupNotify=true -+Categories=GTK;System;Settings; -+X-Ubuntu-Gettext-Domain=evtouch ---- xf86-input-evtouch-0.8.8.orig/debian/calibrate.uuencode -+++ xf86-input-evtouch-0.8.8/debian/calibrate.uuencode -@@ -0,0 +1,50 @@ -+begin 644 calibrate.uunecode -+MB5!.1PT*&@H````-24A$4@```"0````D"`8```#A`)B8`````7-21T(`KLX< -+MZ0````9B2T=$`/\`_P#_H+VGDP````EP2%ES```-UP``#=<!0BB;>`````=T -+M24U%!]@)&!(8$5T-YE8```>]241!5%C#[9AMC%Q5&<=_YYX[.UOF95^Z[Z7; -+M+K2496'9I=)`1&RD#29H\04,B5\$/_C!^(&HI89$HX&LA*CPP=<0$WQ!H@E& -+M_62,"9(B+QL+0FB`LD5IR]ANNVQG=F;NO>>>\_CASLS.6Y<:$S]YDY-S9^:< -+M\_S/\_R?Y_S/P/^?C1\%\.V''D@KS[NWKZ]OO_9T^G\)P#H7%(OGGW'.?>?0 -+MP?O+:N&A!U5O;^_//_ZQ`Y^]=,M6E/KO#(C(?SQ^966%W_W^MW\X?[YTNZ\4 -+M4]?.7GO7^-@8E<K:?VE8Z(Y':G.Z?Y_-9KCFFMG;GOWKX9T^,-'?/Z#C..;8 -+MB16^^\OGT9ZW08`;ZUP,[-H\U39'ZN'B2Y^YGNFI8?*YO`=L\5$-,Y3*$9G, -+M)CYZTZ[N>+K$TSF'B`,4GN=U'7,A&OSQ\!N4*E'S(.UWVY-UR0Z>?^9/W'#S -+M_LX=-X$Y<^IM@FJ%@>$),MD\VO>[@NI*:)':FHUU50>@.+:4*P&GWCG.3Q]] -+M@,&1+6R=VMEUP=@8",\ST7\)KRT=8V+R,K*Y/KP+A;S#ENO@5L=,8QTGWODG -+M3S[V"-5*F2<?>X1"H4`E,"VM7(U8JP3TYS+LVC'%/XZ]SKFSYU@K!QUC+]1, -+M[#KXZ".MH$SLR`R.<??!A_G>U^[F[H,/`U`)30N/1(0X,N0&,UQ^V10KRP7> -+M6WV/=&Z0E)4+<JYU\[8C/_SUU$DX8F)+)4B,?^$;/Z$:&%`*I11*4>L5(H(Q -+M%G%"?W\_FICE,P7\=(;T)1E2J32>]O&TCU+)GBM!Q.I:0+$<4`X,[Q96VSF$ -+MWUY78NNH-GG#\Q1*>0T@":@Z>(=U#JTUD^-#[)Z;8F1D,X\_\6MT;S^YD6WX -+MV2%*D<?98LA:$.&<X%S"G6IMX\U/)X=B2S6,"8TEC!VA<43Q>C-6,-81Q99J -+MI80)R@#TY;-\ZO;;.'#;K6P=SO&CA^_G^JD,B\\]S=+2,<KE(EJ!KS6^K_&: -+MPKDAJ:T3PC@!$\6.R$H3$#!6B&*A&D3TE$\0U*K[Y.1D([M&1T?)Y7+LOV4O -+M5PU4N66'3_7T$BXJHSV%[_MHWT]`R88>$F(KB5>:/6.%R$H-5#*F>.8$G[CU -+MPVBM$1%&1D8(PQ`1H:^O#VLM0T-#7#TSPS?O_PHCJ2)1Z2Q(G(#2&N5UEGZO -+M_1RRSC7"E8`23+TYP3@(8X<+2URY:[T^34]/8ZU%1.CM[<48@]::OKX^E%+L -+MVC9"M'8.92,\3Z.UQE->1['UVN-H71*BR"2>,34/&2?$%HQ-2D"V5Y//YS$F -+M(>;,S`SCX^.("/OW[R>52N'[/G-S<SCGN.+R[=BPC(LCM*?P=/=CIK-26R&( -+M+%J#+Z`U>`Z4!:4$4(AS#$NYD?[U+*VWT='1QM$R/S^/<XZ)\5&\N(R+0Q32 -+MR%QI([7?13`1&HLO"BL*[12^K]`(OM9XVD-PC3.Y;KQ=FM1;_<ED,E0K:^3% -+MKA=-19=*W7&T*IJ+I5(*A6JJ0TESM=\/'#C0XJ5ZC6D'%<=Q(T1)KYJ%1G<. -+M)7.E#7;KNU(*Y6E.GX\(P["K8&L&4P?Y;N%?I-)9/-U3`]1=5'6$K%J)6#E[ -+MOJ9M/#POT3EUK9/4&@<EG[\=>9D;;]C3XJ$Z=XPQ&&,(PY`P#'GSK>-4C$>J -+M%!)($92F6@D[-MT":.?D((_>^Y$-%:%(8K"\=AE_?^55;KQA3X/<(D(410T0 -+M01`011%!$'#JY`GNW'<M<[OW,#"X&:TU".RX=.!"I!:RFU+,7S'678:V94,8 -+M#O#TRMNLKJXVTC\(`H(@:("I`SMY\B1*8JZ;F>(#5T^2R^5J!ZYT"YF4PC"@ -+MM[<7:^T%O=(.,)U.,SL[R^'#A]F[=V\+D&9@QA@6%Q?9O'DSHZ-CY//];-K4 -+MVU*#/$_7^;CF@WKEQ<47GR@4"G=JK5,;Z>?VU(["B-=>.\K<W!S66L(PI%JM -+MMG@G#$..'U\BE\]Q[*TW*96+I%*IUK6<N).G3OP9>.E]Q>_"PH(&>''Q^0>G -+MIZ^ZK[^O/RG[GH>(4"P6V;9M.[.SLX@(U6JU`:P.:&%AH7#TZ-&#F4SF+WOV -+M[#F];]\^VW9YD$.'#CF`B[X6WO/YS_WJ0S?=?%<VFVG*.@]K+>?.G:-0*+"Z -+MNHKOITBGTPV2ETHECKQTY-5G#S][#_`&L+;11<K?X(JM=N^>[YG?/3\P/#QT -+MQ_C8Q*=G9F9J@FV]%'B>PMK+,2:B7"Y3K08-+BH%J52*;=NW7CDW/_O!(T=> -+M/O7"<R\8YYP%;)>BU^$A70.9^NI]7]ZW96+BA]EL;G!L;*QG^LKIFM3H?E.L -+M>Z0.QKEU76UMS.MOO,Z9,Z>K:^7RJ>-+2U_\P?=_O`@8(`+BI+BM>TC5WGN` -+M'J54S_C8V-=O/_#)L;H>WOC2)XWOM>[F]#37S>\&V.1$=CSUU&^^!=Q1`^/7 -+M>@,8O^T848":F!COR>5RVS.92][_FGQ1_P.T?L[G\SN'AX=ZEI?/QC6[#=M^ -+MT^JF;B6.8[V\O/SRSW[Q>%X$!:)$1+6^"P@UN=^P6#MSE:C$[Z)00DUE**5$ -+MH20R45$I%0!A6]BD6P#JB/TZGYK>=5/SVG;7[#K7U.H$CIMZ4^OC)G)SL6FO -+GFHRV@U`=>F4]<^K`V@'*1O'^-VN3A-O<,!`M`````$E%3D2N0F"" -+` -+end ---- xf86-input-evtouch-0.8.8.orig/debian/xserver-xorg-input-evtouch.dirs -+++ xf86-input-evtouch-0.8.8/debian/xserver-xorg-input-evtouch.dirs -@@ -0,0 +1 @@ -+etc/evtouch ---- xf86-input-evtouch-0.8.8.orig/debian/xserver-xorg-input-evtouch.init -+++ xf86-input-evtouch-0.8.8/debian/xserver-xorg-input-evtouch.init -@@ -0,0 +1,59 @@ -+#!/bin/sh -+ -+[ -x /usr/bin/hal-set-property ] || exit 0 -+[ -x /usr/bin/hal-find-by-property ] || exit 0 -+ -+. /etc/evtouch/config > /dev/null 2>&1 || exit 0 -+ -+do_start() { -+ UDI=$(/usr/bin/hal-find-by-property --key input.x11_driver --string evtouch) -+ -+ hal_set () { -+ if [ -n "$2" ]; then -+ /usr/bin/hal-set-property --udi "$UDI" --key input.x11_options.$1 --string "$2" >/dev/null 2>&1 -+ else -+ /usr/bin/hal-set-property --udi "$UDI" --key input.x11_options.$1 --remove >/dev/null 2>&1 -+ fi -+ } -+ -+ hal_set minx $MINX -+ hal_set miny $MINY -+ hal_set maxx $MAXX -+ hal_set maxy $MAXY -+ hal_set x0 $X0 -+ hal_set y0 $Y0 -+ hal_set x1 $X1 -+ hal_set y1 $Y1 -+ hal_set x2 $X2 -+ hal_set y2 $Y2 -+ hal_set x3 $X3 -+ hal_set y3 $Y3 -+ hal_set x4 $X4 -+ hal_set y4 $Y4 -+ hal_set x5 $X5 -+ hal_set y5 $Y5 -+ hal_set x6 $X6 -+ hal_set y6 $Y6 -+ hal_set x7 $X7 -+ hal_set y7 $Y7 -+ hal_set x8 $X8 -+ hal_set y8 $Y8 -+} -+ -+case "$1" in -+ start|"") -+ do_start -+ ;; -+ restart|reload|force-reload) -+ echo "Error: argument '$1' not supported" >&2 -+ exit 3 -+ ;; -+ stop) -+ # No-op -+ ;; -+ *) -+ echo "Usage: evtouch [start|stop]" >&2 -+ exit 3 -+ ;; -+esac -+ ---- xf86-input-evtouch-0.8.8.orig/debian/rules -+++ xf86-input-evtouch-0.8.8/debian/rules -@@ -0,0 +1,85 @@ -+#!/usr/bin/make -f -+# -*- makefile -*- -+ -+# Uncomment this to turn on verbose mode. -+#export DH_VERBOSE=1 -+include debian/xsfbs/xsfbs.mk -+ -+PACKAGE=xserver-xorg-input-evtouch -+ -+CFLAGS = -Wall -g -+ -+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -+ CFLAGS += -O0 -+else -+ CFLAGS += -O2 -+endif -+ -+configure: configure-stamp -+configure-stamp: patch -+ dh_testdir -+ # Add here commands to configure the package. -+ -+ CURSORDIR=/usr/share/xf86-input-evtouch ./configure --prefix=/usr --enable-evcalibrate -+ touch configure-stamp -+ -+build: build-stamp -+ -+build-stamp: configure-stamp -+ dh_testdir -+ -+ # Add here commands to compile the package. -+ $(MAKE) CFLAGS="$(CFLAGS)" -+ #docbook-to-man debian/evtouch.sgml > evtouch.1 -+ -+ touch $@ -+ -+clean: xsfclean clean-patched unpatch -+clean-patched: -+ dh_testdir -+ dh_testroot -+ rm -f build-stamp configure-stamp -+ -+ # Add here commands to clean up after the build process. -+ [ ! -f Makefile ] || $(MAKE) distclean -+ -+ dh_clean -+ -+install: build -+ dh_testdir -+ dh_testroot -+ dh_clean -k -+ dh_installdirs -+ -+ # Add here commands to install the package into debian/tmp -+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp -+ -+ -+# Build architecture-independent files here. -+binary-indep: build install -+# We have nothing to do by default. -+ -+# Build architecture-dependent files here. -+binary-arch: build install serverabi -+ dh_testdir -+ dh_testroot -+ dh_install --sourcedir=debian/tmp --list-missing --exclude=.la --exclude=.a -+ dh_installchangelogs ChangeLog -+ dh_installdocs -+ dh_installexamples -+ dh_installman -+ mkdir -p debian/xserver-xorg-input-evtouch/usr/share/pixmaps -+ uudecode -o debian/xserver-xorg-input-evtouch/usr/share/pixmaps/calibrate.png debian/calibrate.uuencode -+ dh_installinit -a --no-start -u"start 25 2 3 4 5 ." -+ dh_link -+ dh_strip -+ dh_compress -+ dh_fixperms -+ dh_installdeb -+ dh_shlibdeps -+ dh_gencontrol -+ dh_md5sums -+ dh_builddeb -+ -+binary: binary-indep binary-arch -+.PHONY: build clean binary-indep binary-arch binary install configure ---- xf86-input-evtouch-0.8.8.orig/debian/control -+++ xf86-input-evtouch-0.8.8/debian/control -@@ -0,0 +1,23 @@ -+Source: xf86-input-evtouch -+Section: x11 -+Priority: optional -+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> -+XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org> -+Uploaders: Mattia Dongili <malattia@debian.org> -+Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-randr-dev, libxrender-dev, libx11-dev, quilt, sharutils -+Standards-Version: 3.7.3 -+Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-evtouch -+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evtouch.git -+Homepage: http://stz-softwaretechnik.com/~ke/touchscreen/evtouch.html -+ -+Package: xserver-xorg-input-evtouch -+Architecture: any -+Depends: ${shlibs:Depends}, ${xserver:Depends}, hal, ttf-freefont, x-ttcidfont-conf -+Provides: ${xinpdriver:Provides} -+Recommends: zenity | kdebase-bin | xidalog -+Description: Touchscreen-Driver for X.Org/XFree86 server -+ This XFree/X.Org driver provides support for touchscreens input devices. -+ The driver is actually an evdev-driver which supports events for moving -+ in absolute coordinates, relative coordinates and mouse-buttons. -+ . -+ ---- xf86-input-evtouch-0.8.8.orig/debian/README.Debian -+++ xf86-input-evtouch-0.8.8/debian/README.Debian -@@ -0,0 +1,16 @@ -+xf86-input-evtouch for Debian -+----------------------------- -+ -+Evtouch is a Touchscreen-Driver for X. -+ -+Be sure to calibrate the device and set correct parameters in your -+xorg.conf, see README.calibrate and find the necessary helpers -+in /usr/lib/xf86-input-evtouch. -+ -+A complete reference can be found on-line at -+http://www.stz-softwaretechnik.com/~ke/touchscreen/evtouch.html -+or in /usr/share/doc/xserver-xorg-input-evtouch on your system. -+ -+Check /proc/bus/input/devices to find out your touchscreen device. -+ -+ -- Mattia Dongili <malattia@debian.org>, Sat, 09 Dec 2006 18:26:37 +0100 ---- xf86-input-evtouch-0.8.8.orig/debian/xserver-xorg-input-evtouch.install -+++ xf86-input-evtouch-0.8.8/debian/xserver-xorg-input-evtouch.install -@@ -0,0 +1,4 @@ -+usr/lib/* -+usr/share/* -+../fdi/* usr/share/hal/fdi/policy/20thirdparty -+../calibrate.desktop usr/share/applications/ ---- xf86-input-evtouch-0.8.8.orig/debian/docs -+++ xf86-input-evtouch-0.8.8/debian/docs -@@ -0,0 +1,4 @@ -+README -+README.calibration -+TODO -+debian/evtouch.html ---- xf86-input-evtouch-0.8.8.orig/debian/compat -+++ xf86-input-evtouch-0.8.8/debian/compat -@@ -0,0 +1 @@ -+5 ---- xf86-input-evtouch-0.8.8.orig/debian/evtouch.html -+++ xf86-input-evtouch-0.8.8/debian/evtouch.html -@@ -0,0 +1,248 @@ -+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-+"http://www.w3.org/TR/html4/loose.dtd"><html>
-+<head>
-+<meta NAME="allow-search" content="YES">
-+<meta NAME="searchtitle" content="Conan's Homepage/X touchscreen
-+driver">
-+<meta NAME="keywords" CONTENT="conan touchscreen driver Xorg XFree">
-+<meta NAME="description" CONTENT="Xorg/XFree touchscreen driver">
-+<meta NAME="page-type" CONTENT=""><meta NAME="revisit-after" CONTENT="14 days">
-+<meta NAME="ROBOTS" CONTENT="ALL">
-+<meta NAME="audience" CONTENT="All">
-+<meta NAME="content-language" CONTENT="en">
-+<meta NAME="author" content="kenan.esau@conan.de">
-+<link rel="StyleSheet" type="text/css" href="../style.css">
-+<title>Xorg Touchscreen Driver</title>
-+</head>
-+<body>
-+<div class="header">
-+Last updated: 09.06.2007
-+</div>
-+<h1>Linux-Touchscreen Driver for X</h1>
-+<div>
-+Evtouch is a Touchscreen-Driver for X. This site contains the <a
-+href=#config">configuration and installation</a> description as well as the
-+possibility to <a href="#download">download</a> the driver.
-+</div>
-+<h2><a name="config">Installation/Configuration</a></h2>
-+<ol><li>
-+<div>
-+<a href="#download">Download</a> the tarball and extract it to some
-+temporary directory.
-+</div>
-+<div class="shell">tar xzvf evtouch-xx.yy.tar.gz</div>
-+<div>
-+Copy the file "evtouch_drv.so" to the appropriate location
-+(Some distributions use "/usr/X11R6/lib/modules/input" or
-+"/usr/lib/xorg/modules/input/" (for Ubuntu)).
-+</div>
-+<div>
-+Insert the lines below to the file "/etc/X11/XF86Config-4" or
-+"/etc/X11/xorg.conf".
-+</div>
-+<div class="code">
-+<a name="config"></a>
-+Section "InputDevice"<br>
-+ Identifier "touchscreen"<br>
-+ Driver "evtouch"<br>
-+ Option "Device" "/dev/input/event1"<br>
-+ Option "DeviceName" "touchscreen"<br>
-+ Option "MinX" "98"<br>
-+ Option "MinY" "43"<br>
-+ Option "MaxX" "940"<br>
-+ Option "MaxY" "925"<br>
-+ Option "ReportingMode" "Raw"<br>
-+ Option "Emulate3Buttons"<br>
-+ Option "Emulate3Timeout" "50"<br>
-+ Option "SendCoreEvents" "On"<br>
-+EndSection<br>
-+</div>
-+<li>Beware that some distributions use other names for the device. Some use
-+"/dev/input/evdevX" and others use "/dev/input/eventX". </li>
-+<li>Add the line below to the file "/etc/X11/XF86Config-4" or
-+"/etc/X11/xorg.conf" to the section "ServerLayout".<br>
-+<div class="code">InputDevice "touchscreen" "CorePointer"</div>
-+</li>
-+<li>
-+If your Y-axis is interchanged you might have used the wrong
-+event-device. Maybe you should try the next few event-devices
-+(/dev/event[1-9]).
-+</li>
-+</ol>
-+
-+<div class="warning">Since Xorg 7.2 there is always a default-mouse-pointer which will run simultaneously with evtouch if you do not prevent it from loading. It is extremely important that you add the following to your configuration. Otherwise you will get double click events and all kind of strange things.</div>
-+
-+<ol>
-+<li>
-+<div>Add the following new input-device to your xorg.conf:</div>
-+<div class="code">
-+Section "InputDevice"<br>
-+ Identifier "dummy"<br>
-+ Driver "void"<br>
-+ Option "Device" "/dev/input/mice"<br>
-+EndSection<br>
-+</div>
-+</li>
-+<li>
-+<div>Add the following line your your "ServerLayout"-section:</div>
-+<div class="code">InputDevice "dummy"</div>
-+</li>
-+</ol>
-+
-+<div>
-+Calibration is also supported since V0.6.0. You can also reuse your
-+settings from the old driver for the 2.6 driver. Actually you only
-+have to exchange the driver name in the "Inputdevice"-section from
-+"lbtouch" to "evtouch" and change the "Device".
-+</div>
-+
-+<h2>Button-Events</h2>
-+
-+<div>
-+With the state-machine based code you can have the three types of button actions (button up, down, click) which are issued in different states of the state-machine. So the complete behaviour is configurable.
-+</div>
-+
-+<div>
-+Have a look at <a href="libtouch.html">Libtouch</a> to see which default-actions are hard-coded in the driver and what you have to do to change the default-behaviour.
-+</div>
-+<br>
-+
-+<h2><a name="advanced">Advanced Configuration</a></h2>
-+
-+<h3>Changing Timers</h3>
-+
-+<div>
-+If you are not confident with the default behaviour of your touchpanel you
-+can configure certain timers which change its behaviour.
-+</div>
-+
-+<table class="options" align="center" cellpadding="5" cellspacing="0">
-+ <tr>
-+ <th class="even"> Option </th>
-+ <th class="even"> Description </th>
-+ <th class="even"> Default-Value </td>
-+ </tr>
-+ <tr>
-+ <td class="odd"> TapTimer </td>
-+ <td class="odd"> This timer starts when the state MAYBETAPPED is
-+entered. When this timer expires a tap-event is issued and the state
-+changes to UNTOUCHED.</td>
-+ <td class="odd"> 200 ms </td>
-+ </tr>
-+ <tr>
-+ <td class="even"> LongTouchTimer </td>
-+ <td class="even"> This timer is always started when the state TOUCHED
-+is entered. When the timer expires before you untouch the screen again the
-+state moves to LONGTOUCHED and on entering that state a longtouch-event is
-+issued.</td>
-+ <td class="even"> 400 ms </td>
-+ </tr>
-+ <tr>
-+ <td class="odd"> Emulate3Buttons </td>
-+ <td class="odd"> Enable emulation of three button support </td>
-+ <td class="odd"> true -- enabled </td>
-+ <tr>
-+ <td class="even"> Emulate3Timeout </td>
-+ <td class="even"> If both buttons are pressed/released before this timer
-+expires a
-+"middle press/release"-event is generated. This timer starts to run as soon as
-+a button is pressed. </td>
-+ <td class="even"> 50 ms </td>
-+ </tr>
-+ <tr>
-+ <td class="odd"> MoveLimit </td>
-+ <td class="odd"> If the pen moves out of this radius a "mouse-press"-event
-+becomes impossible. </td>
-+ <td class="odd"> 30 Pixels </td>
-+ </tr>
-+ <tr>
-+ <td class="even"> Rotate </td>
-+ <td class="even"> There are two valid values:<br>
-+ <code class="even">CW</code> -- Rotate the screen clockwise<br>
-+ <code class="even">CCW</code> -- Rotate the screen counter-clockwise<br>
-+ Everything else will be treated as "no rotation".
-+ </td>
-+ <td class="even"> no rotation </td>
-+ </tr>
-+ <tr>
-+ <td class="odd"> SwapX </td>
-+ <td class="odd"> This option is in the driver since V0.61. When set to 1
-+the X-axis is
-+ swapped. This option is applied BEFORE the rotation-option.
-+ </td>
-+ <td class="odd"> false -- no swapping </td>
-+ </tr>
-+ <tr>
-+ <td class="even"> SwapY</td>
-+ <td class="even"> This option is in the driver since V0.61. When set to 1
-+the Y-axis is
-+ swapped. This option is applied BEFORE the rotation-option.
-+ </td>
-+ <td class="even"> false -- no swapping </td>
-+ </tr>
-+</table>
-+
-+<br>
-+If you find bugs or if you have comment/wishes please send mail to <a
-+href="mailto:lifebook@conan.de" target="Inhalt">lifebook@conan.de</a><br>
-+
-+<h2>Download<a name="download"></a></h2>
-+<div align="center"><h3>Touchscreen-Driver for X</h3></div>
-+This driver should work for XFree 4.x and Xorg 6.8.x.<br>
-+Have a look at the <a href="CHANGELOG.evtouch">CHANGELOG</a>.<br>
-+V0.8.2 was removed since it was broken -- sorry for the inconvenience.<br><br>
-+V0.8.4 contains udev-rules for dynamically creating a softlink to the "correct" device. Please feel free to add your rules to this file and send the patches to me.<br>
-+<table align="center">
-+ <tr>
-+ <td>Precompiled driver for X V0.8.6</td>
-+ <td><a href="evtouch-0.8.6.tar.gz">evtouch-0.8.6.tar.gz</a></td>
-+ </tr>
-+ <tr>
-+ <td>Precompiled driver for X V0.8.5</td>
-+ <td><a href="evtouch-0.8.5.tar.gz">evtouch-0.8.5.tar.gz</a></td>
-+ </tr>
-+ <tr>
-+ <td>Precompiled driver for X V0.8.4</td>
-+ <td><a href="evtouch-0.8.4.tar.gz">evtouch-0.8.4.tar.gz</a></td>
-+ </tr>
-+ <tr>
-+ <td>Precompiled driver for X V0.8.3</td>
-+ <td><a href="evtouch-0.8.3.tar.gz">evtouch-0.8.3.tar.gz</a></td>
-+ </tr>
-+ <tr>
-+ <td>Precompiled driver for X V0.8.1</td>
-+ <td><a href="evtouch-0.8.1.tar.gz">evtouch-0.8.1.tar.gz</a></td>
-+ </tr>
-+ <tr>
-+ <td>Precompiled driver for X V0.8.0</td>
-+ <td><a href="evtouch-0.8.0.tar.gz">evtouch-0.8.0.tar.gz</a></td>
-+ </tr>
-+ <tr>
-+ <td>X driver sources V0.8.6</td>
-+ <td><a href="xf86-input-evtouch-0.8.6.tar.bz2">xf86-input-evtouch-0.8.6.tar.bz2</a></td>
-+ </tr>
-+ <tr>
-+ <td>X driver sources V0.8.5</td>
-+ <td><a href="xf86-input-evtouch-0.8.5.tar.bz2">xf86-input-evtouch-0.8.5.tar.bz2</a></td>
-+ </tr>
-+ <tr>
-+ <td>X driver sources V0.8.4</td>
-+ <td><a href="xf86-input-evtouch-0.8.4.tar.bz2">xf86-input-evtouch-0.8.4.tar.bz2</a></td>
-+ </tr>
-+ <tr>
-+ <td>X driver sources V0.8.3</td>
-+ <td><a href="xf86-input-evtouch-0.8.3.tar.bz2">xf86-input-evtouch-0.8.3.tar.bz2</a></td>
-+ </tr>
-+ <tr>
-+ <td>X driver sources V0.8.1</td>
-+ <td><a href="xf86-input-evtouch-0.8.1.tar.bz2">xf86-input-evtouch-0.8.1.tar.bz2</a></td>
-+ </tr>
-+ <tr>
-+ <td>X driver sources V0.8.0</td>
-+ <td><a href="evtouch-0.8.0-src.tar.gz">evtouch-0.8.0-src.tar.gz</a></td>
-+ </tr>
-+</table>
-+<a href="evtouch_old.html">Older (obsolete) versions</a> of the evtouch-driver
-+can be downloaded <a href="./evtouch_old.html#download">here</a>
-+</body>
-+</html>
---- xf86-input-evtouch-0.8.8.orig/debian/patches/02-buttonless-device.patch -+++ xf86-input-evtouch-0.8.8/debian/patches/02-buttonless-device.patch -@@ -0,0 +1,86 @@ -+Index: xf86-input-evtouch-0.8.3.dirty/evtouch.c -+=================================================================== -+--- xf86-input-evtouch-0.8.3.dirty.orig/evtouch.c 2007-02-19 18:28:41.749371445 +0100 -++++ xf86-input-evtouch-0.8.3.dirty/evtouch.c 2007-02-19 20:14:50.612312260 +0100 -+@@ -364,9 +364,15 @@ void EVTouchLBRBEvent(EVTouchPrivatePtr -+ void EVTouchProcessKey(EVTouchPrivatePtr priv) -+ { -+ struct input_event *ev; /* packet being/just read */ -++ ev = &priv->ev; -+ -+ DBGOUT(2, "EVTouch: %s\n", __FUNCTION__); -+- ev = &priv->ev; -++ -++ /* for buttonless devices no emulate3 is available, -++ only go through the SM */ -++ if (priv->buttonless) -++ return; -++ -+ if ( (ev->code == BTN_LEFT) || -+ (ev->code == BTN_RIGHT) || -+ (ev->code == BTN_MIDDLE) ) { -+@@ -688,6 +694,8 @@ static void ReadInput (LocalDevicePtr lo -+ while (EVTouchGetPacket (priv) == Success) -+ { -+ ev = &priv->ev; -++ DBGOUT(2, "EVTouch: %s type:%0.2x code: 0x%0.4x value:%d\n", -++ __FUNCTION__, ev->type, ev->code, ev->value); -+ -+ xf86XInputSetScreen(local, -+ priv->screen_num, -+@@ -708,7 +716,8 @@ static void ReadInput (LocalDevicePtr lo -+ EVTouchProcessRel(priv); -+ break; -+ case EV_KEY: -+- if (priv->ev.code == BTN_TOUCH) { -++ if (priv->ev.code == BTN_TOUCH -++ || priv->buttonless) { -+ if (priv->ev.value == 1) { -+ priv->touch_flags |= TOUCHED; -+ DBGOUT(2, "EVTouch: TOUCHED\n"); -+Index: xf86-input-evtouch-0.8.3.dirty/libtouch.c -+=================================================================== -+--- xf86-input-evtouch-0.8.3.dirty.orig/libtouch.c 2007-02-19 18:28:41.749371445 +0100 -++++ xf86-input-evtouch-0.8.3.dirty/libtouch.c 2007-02-19 20:02:36.070453105 +0100 -+@@ -320,6 +320,14 @@ static int handle_touched(LibTouchRecPtr -+ static void enter_moving(LibTouchRecPtr priv) -+ { -+ disable_timers(priv); -++ if (priv->pen == PEN_TOUCHED) { -++ DBG(4, ErrorF("LibTouch: Issuing Button-press 1\n")); -++ xf86PostButtonEvent(priv->local->dev, TRUE, -++ 1, 1, 0, 2, -++ priv->cur_x, -++ priv->cur_y); -++ priv->pressed_btn_stat |= 1 << 1; -++ } -+ } -+ -+ -+@@ -336,13 +344,13 @@ static void enter_longtouched(LibTouchRe -+ { -+ disable_timers(priv); -+ /* FIXME: Make Longtouch-Event configurable*/ -+- /* for now issue an LB down */ -+- DBG(4, ErrorF("LibTouch: Issuing Button-press 1\n")); -++ /* for now issue an RB down */ -++ DBG(4, ErrorF("LibTouch: Issuing Button-press 3\n")); -+ xf86PostButtonEvent(priv->local->dev, TRUE, -+- 1, 1, 0, 2, -++ 3, 1, 0, 2, -+ priv->cur_x, -+ priv->cur_y); -+- priv->pressed_btn_stat |= 1 << 1; -++ priv->pressed_btn_stat |= 1 << 3; -+ } -+ -+ -+@@ -515,7 +523,7 @@ static int handle_oneandahalftap(LibTouc -+ -+ /* FIXME: Make OneAndHalf-Event configurable */ -+ /* for now RB down */ -+- DBG(4, ErrorF("LibTouch: Issuing Button-press 1\n")); -++ DBG(4, ErrorF("LibTouch: Issuing Button-press 3\n")); -+ xf86PostButtonEvent (priv->local->dev, TRUE, -+ 3, 1, 0, 2, -+ priv->cur_x, ---- xf86-input-evtouch-0.8.8.orig/debian/patches/20_fix_calibrate_submission_directions.patch -+++ xf86-input-evtouch-0.8.8/debian/patches/20_fix_calibrate_submission_directions.patch -@@ -0,0 +1,13 @@ -+Index: xf86-input-evtouch-0.8.8/calibrate.sh -+=================================================================== -+--- xf86-input-evtouch-0.8.8.orig/calibrate.sh 2009-01-14 14:14:10.000000000 +0100 -++++ xf86-input-evtouch-0.8.8/calibrate.sh 2009-01-14 14:14:51.000000000 +0100 -+@@ -25,7 +25,7 @@ -+ FAILINFO="No evtouch capable device found, if you are sure you have \n\ -+ an evtouch capable touchscreen, please mail the \ -+ resulting file of the command \"lshal > evtouch_hal.out\" to the\n\ -+-ubuntu-mobile@lists.ubuntu.com mailing list, so support for your \ -++bug url https://bugs.launchpad.net/bugs/317094, so support for your \ -+ device can be added." -+ -+ if [ -z "$UDI" ];then ---- xf86-input-evtouch-0.8.8.orig/debian/patches/05_build_with_1_4.patch -+++ xf86-input-evtouch-0.8.8/debian/patches/05_build_with_1_4.patch -@@ -0,0 +1,22 @@ -+Index: xserver-xorg-input-evtouch/evtouch.c -+=================================================================== -+--- xserver-xorg-input-evtouch.orig/evtouch.c 2007-09-17 17:20:21.736761738 +0900 -++++ xserver-xorg-input-evtouch/evtouch.c 2007-09-17 17:31:22.274403633 +0900 -+@@ -492,9 +492,6 @@ DeviceOn (DeviceIntPtr dev) -+ -+ priv->buffer = XisbNew(local->fd, 64); -+ -+- DBG (9, XisbTrace (priv->buffer, 1)); -+- -+- -+ if (!priv->buffer) -+ { -+ xf86CloseSerial(local->fd); -+@@ -1207,7 +1204,6 @@ EVTouchPreInit(InputDriverPtr drv, IDevP -+ priv->diff[i][0], priv->diff[i][1]); -+ } -+ -+- xf86AlwaysCore(local, TRUE); -+ priv->touch_flags = 0; -+ -+ local->history_size = xf86SetIntOption( local->options, "HistorySize", 0 ); ---- xf86-input-evtouch-0.8.8.orig/debian/patches/10_ev_calibrate_fixups.patch -+++ xf86-input-evtouch-0.8.8/debian/patches/10_ev_calibrate_fixups.patch -@@ -0,0 +1,55 @@ -+Index: xf86-input-evtouch-0.8.7/ev_calibrate.c -+=================================================================== -+--- xf86-input-evtouch-0.8.7.orig/ev_calibrate.c 2008-09-25 01:13:32.000000000 +0200 -++++ xf86-input-evtouch-0.8.7/ev_calibrate.c 2008-09-25 01:13:43.000000000 +0200 -+@@ -198,7 +198,7 @@ -+ Pixmap cursor_pic; -+ XColor cursor_fg, cursor_bg; -+ XFontStruct* font_info; -+- char* font_name = "*fixed*"; -++ char* font_name = "*freemono*"; -+ char str[256]; -+ unsigned int cursor_width, cursor_height; -+ int hotspot_x, hotspot_y; -+@@ -234,7 +234,7 @@ -+ unsigned long black_pixel; -+ -+ -+- display = XOpenDisplay(":0"); -++ display = XOpenDisplay(getenv("DISPLAY")); -+ if (display == NULL) { -+ fprintf(stderr, "Cannot connect to X server %s\n", ":0"); -+ exit(-1); -+@@ -553,7 +553,7 @@ -+ /* -+ Put results to file and screen -+ */ -+- out_file = fopen("out.txt", "w"); -++ out_file = fopen("/etc/evtouch/config", "w"); -+ -+ -+ /* -+@@ -566,10 +566,10 @@ -+ min_max.max_x, -+ min_max.max_y); -+ -+- fprintf(out_file, " Option \"MinX\" \"%d\"\n", min_max.min_x); -+- fprintf(out_file, " Option \"MinY\" \"%d\"\n", min_max.min_y); -+- fprintf(out_file, " Option \"MaxX\" \"%d\"\n", min_max.max_x); -+- fprintf(out_file, " Option \"MaxY\" \"%d\"\n", min_max.max_y); -++ fprintf(out_file, "MINX=\"%d\"\n", min_max.min_x); -++ fprintf(out_file, "MINY=\"%d\"\n", min_max.min_y); -++ fprintf(out_file, "MAXX=\"%d\"\n", min_max.max_x); -++ fprintf(out_file, "MAXY=\"%d\"\n", min_max.max_y); -+ -+ -+ for (i=0; i<9; i++) { -+@@ -602,7 +602,7 @@ -+ i, marker_coordinates[i][1]-click_coordinates[i][1]); -+ -+ -+- fprintf(out_file, " Option \"x%d\" \"%d\"\n Option \"y%d\" \"%d\"\n", -++ fprintf(out_file, "X%d=\"%d\"\nY%d=\"%d\"\n", -+ i, marker_coordinates[i][0]-click_coordinates[i][0], -+ i, marker_coordinates[i][1]-click_coordinates[i][1]); -+ } ---- xf86-input-evtouch-0.8.8.orig/debian/patches/series -+++ xf86-input-evtouch-0.8.8/debian/patches/series -@@ -0,0 +1,11 @@ -+#02-buttonless-device.patch -+#03_fix_compile_warns.patch -+#04_include_xf86_ansic_h.patch -+#05_build_with_1_4.patch -+#06_xf86-input-evtouch-0.8.7-misc.patch -+#07_random_fixes_for_06.patch -+#08_fix_xf86memset.patch -+#09_calibrate-script-halification.patch -+#10_ev_calibrate_fixups.patch -+20_fix_calibrate_submission_directions.patch -+21_more_calibration_fixups.patch ---- xf86-input-evtouch-0.8.8.orig/debian/patches/06_xf86-input-evtouch-0.8.7-misc.patch -+++ xf86-input-evtouch-0.8.8/debian/patches/06_xf86-input-evtouch-0.8.7-misc.patch -@@ -0,0 +1,770 @@ -+# -+# This patch is from http://www.postnuklear.de/xorg-patches/ -+# -+# Description: This is a patch for the evtouch input driver ( -+# http://stz-softwaretechnik.com/~ke/touchscreen/evtouch.html). -+# Changes (for full description see ChangeLog file after patching (-: ): -+# o Changed code to compile a working driver for both XInput ABI 0.x and 2.0 (Xorg 1.4.0) -+# o changed rotation (due to segfault on xorg + fbdev) -+# o drag support -+# o tap "tolerance" -+# o added generic ts-adc touchscreen device to udev rules file -+# -+# Feel free to send comments, critics, suggestions to harryrat@postnuklear.de -+# To apply simply change into the toplevel directory of the source to be modified and enter: -+# patch -p1 < <PATH_TO_PATCH> -+# -+# All patches are available under the GNU GPL, I hope they might be useful for you (-: -+# - Harald Radke -+# -+Index: xserver-xorg-input-evtouch/69-touchscreen.rules -+=================================================================== -+--- xserver-xorg-input-evtouch.orig/69-touchscreen.rules 2008-02-02 21:49:20.783972805 +0900 -++++ xserver-xorg-input-evtouch/69-touchscreen.rules 2008-02-02 21:49:39.730979724 +0900 -+@@ -7,8 +7,11 @@ -+ # Name can be found in /proc/bus/input/devices ('cat /proc/bus/input/devices') -+ # -+ -+-# These are the touchscreens supported by kernel's "usbtouchscreen" module -++# Generic ts-adc touchscreen modules -++KERNEL=="event*", SUBSYSTEM=="input", ATTRS{name}=="ts-adc", SYMLINK+="input/evtouch_event" -++ -+ -++# These are the touchscreens supported by kernel's "usbtouchscreen" module -+ # eGalax Inc. USB TouchController) -+ KERNEL=="event*", SUBSYSTEM=="input", ATTRS{idVendor}=="3823", ATTRS{idProduct}=="0001", SYMLINK+="input/evtouch_event" -+ # eGalax Inc. USB TouchController) -+Index: xserver-xorg-input-evtouch/ChangeLog -+=================================================================== -+--- xserver-xorg-input-evtouch.orig/ChangeLog 2008-02-02 21:49:20.795972782 +0900 -++++ xserver-xorg-input-evtouch/ChangeLog 2008-02-02 21:49:39.730979724 +0900 -+@@ -1,3 +1,61 @@ -++0.8.7-HR *** Note this is not an official release but an "unauthorized -++ *** fix version by me (Harald Radke - harryrat@postnuklear.de) -++ -> Changed code to compile a working driver for both -++ XInput ABI 0.x and 2.0 (Xorg 1.4.0) -++ (test compile for 0.x still needs to be done) -++ - evtouch.c: -++ * capsulated xf86Post*Events and xf86InputSetScreen -++ in functions where depending on the XINPUT ABI conversion -++ is done or xf86 functions are directly called -++ * xf86InitValuatorAxisStruct and xf86AlwaysCore() depending -++ on ABI done -++ - libtouch.h: passing xf86PostButtonEvent capsulation function -++ to init function (same as in evtouch.c) to do proper button -++ triggering -++ -> Rotation: -++ - added support for Option "Rotate" "UD" (upside down) -++ in evtouch input section of xorg.conf -++ - due to Segfault with (at least) fbdev video device, only -++ evtouch "Rotate" option is taken into calculations for coords, -++ meaning to get proper touchscreen behaviour on rotated X screens. -++ same Rotate option as in video device section of xorg.conf has -++ to be set in the evtouch section -++ -> Drag support: -++ Option "<STATE>_drag" "<BUTTON_ID>" has been added. When set, -++ the handle_<STATE>() function triggers BUTTON_DOWN for Button <BUTTON_ID> -++ before changing into S_MOVE state. Note that actually only -++ Option "touched_drag" "<BUTTON_ID>" is implemented, rest is dummy -++ (and doesn't make too much sense I guess) (-; -++ -> tap "tolerance": -++ introduce move_limit to evtouch.c as it is in libtouch.c, using it -++ to discard ABS_X/Y position changes if they are inside move_limit -++ around cur_x/y. this way pointer hopping can be avoided as well as -++ proper touched_drag established -++ - changes of cur_x/y are reported on EV_SYN in evtouch.c ReadInput() instead -++ on EV_ABS -++ -> added generic ts-adc touchscreen device to udev rules file -++ -++ => Example for a Loox720 PDA setup in input section of xorg.conf: -++ Section "InputDevice" -++ Identifier "touchscreen" -++ Driver "evtouch" -++ Option "Device" "/dev/input/evtouch_event" -++ Option "MinX" "434" -++ Option "MinY" "333" -++ Option "MaxX" "3643" -++ Option "MaxY" "3804" -++ Option "SwapX" "true" -++ Option "longtouched_action" "down" -++ Option "longtouched_button" "3" -++ Option "maybetapped_action" "click" -++ Option "maybetapped_button" "1" -++ Option "touched_drag" "1" -++ Option "oneandahalftap_button" "0" -++ Option "TapTimer" "30" -++ Option "LongtouchTimer" "500" -++ Option "MoveLimit" "18" -++ EndSection -++ -+ 0.8.7 -+ - Added Elo Touchscreen to udev-rules (Stephen Webb) -+ - Added "fix" for AMD64-crashes on touch (Martin Letenay) -+Index: xserver-xorg-input-evtouch/evtouch.c -+=================================================================== -+--- xserver-xorg-input-evtouch.orig/evtouch.c 2008-02-02 21:49:20.811973497 +0900 -++++ xserver-xorg-input-evtouch/evtouch.c 2008-02-02 21:49:39.734971242 +0900 -+@@ -182,6 +182,20 @@ static const char *default_options[] = -+ static int -+ ControlProc(LocalDevicePtr device, xDeviceCtl *ctrl); -+ -++static void -++PostMotionEvent(LocalDevicePtr local); -++ -++static void -++PostProximityEvent(LocalDevicePtr local,int is_in); -++ -++static void -++PostButtonEvent(LocalDevicePtr local, int button, -++ int is_down, int x,int y); -++ -++static void -++InputSetScreen(LocalDevicePtr local); -++ -++ -+ /***************************************************************************** -+ * Function Definitions -+ ****************************************************************************/ -+@@ -197,11 +211,10 @@ emulate3Timer(OsTimerPtr timer, CARD32 n -+ LocalDevicePtr local = (LocalDevicePtr)_local; -+ EVTouchPrivatePtr priv = (EVTouchPrivatePtr) local->private; -+ -++ -+ sigstate = xf86BlockSIGIO(); -+ -+- xf86PostMotionEvent(local->dev, TRUE, 0, 2, -+- priv->cur_x, -+- priv->cur_y); -++ PostMotionEvent(local); -+ -+ /* -+ * Emit a button press -- release is handled in EVTouchLBRBEvent -+@@ -209,31 +222,21 @@ emulate3Timer(OsTimerPtr timer, CARD32 n -+ if ( ( priv->touch_flags & LB_STAT ) && -+ !( priv->touch_flags & RB_STAT ) ) { -+ DBGOUT(2, "EVTouch: Left Press\n"); -+- xf86PostButtonEvent (local->dev, TRUE, -+- 1, 1, 0, 2, -+- priv->cur_x, -+- priv->cur_y); -++ PostButtonEvent (local, 1, 1,priv->cur_x,priv->cur_y); -+ } -+ -+ if ( ( priv->touch_flags & RB_STAT ) && -+ !( priv->touch_flags & LB_STAT ) ) { -+ DBGOUT(2, "EVTouch: Right Press\n"); -+- xf86PostButtonEvent (local->dev, TRUE, -+- 3, 1, 0, 2, -+- priv->cur_x, -+- priv->cur_y); -+- } -+- -++ PostButtonEvent (local, 3, 1,priv->cur_x,priv->cur_y); -++ } -+ /* -+ Handling "middle" button press -+ */ -+ if ( ( priv->touch_flags & RB_STAT ) && -+ ( priv->touch_flags & LB_STAT ) ) { -+ DBGOUT(2, "EVTouch: Middle Press\n"); -+- xf86PostButtonEvent (local->dev, TRUE, -+- 2, 1, 0, 2, -+- priv->cur_x, -+- priv->cur_y); -++ PostButtonEvent (local, 2, 1,priv->cur_x,priv->cur_y); -+ } -+ -+ priv->emulate3_timer_expired = TRUE; -+@@ -246,6 +249,7 @@ static void DoBtnAction(EVTouchPrivatePt -+ { -+ int btn = 0; -+ LocalDevicePtr local = priv->local; -++ -+ DBGOUT(2, "EVTouch: %s btn_count=%d\n", __FUNCTION__, priv->btn_count); -+ -+ for (btn = 0; btn < priv->btn_count; btn++) { -+@@ -262,12 +266,7 @@ static void DoBtnAction(EVTouchPrivatePt -+ DBGOUT(2, "EVTouch: %s btn = %d action = %d\n", -+ __FUNCTION__, btn, -+ priv->btn_actions[btn].action); -+- -+- xf86PostButtonEvent (local->dev, TRUE, btn, -+- priv->btn_actions[btn].action, -+- 0, 2, -+- priv->cur_x, -+- priv->cur_y); -++ PostButtonEvent (local, btn, priv->btn_actions[btn].action,priv->cur_x,priv->cur_y); -+ -+ priv->btn_actions[btn].do_it = 0; -+ priv->btn_actions[btn].action = 0; -+@@ -292,39 +291,32 @@ void EVTouchProcessAbs(EVTouchPrivatePtr -+ ev = &priv->ev; -+ -+ if ( (ev->code == ABS_X) || (ev->code == ABS_Z) ) { -++ if ((priv->cur_x - ev->value < priv->move_limit) -++ && (priv->cur_x - ev->value > -priv->move_limit)) -++ return; -+ priv->cur_x = ev->value; -+- libtouchSetXPos(priv->libtouch, priv->cur_x); -++// libtouchSetXPos(priv->libtouch, priv->cur_x); -+ } -+ -+ if ( (ev->code == ABS_Y) || (ev->code == ABS_RX) ) { -++ if ((priv->cur_y - ev->value < priv->move_limit) -++ && (priv->cur_y - ev->value > -priv->move_limit)) -++ return; -+ priv->cur_y = ev->value; -+- libtouchSetYPos(priv->libtouch, priv->cur_y); -++// libtouchSetYPos(priv->libtouch, priv->cur_y); -+ } -+ -+ if (ev->code == ABS_WHEEL) { -+ LocalDevicePtr local = priv->local; -+- -+ if (ev->value > 0) { -+ for (; ev->value > 0; ev->value--) { -+- xf86PostButtonEvent (local->dev, TRUE, -+- 4, 1, 0, 2, -+- priv->cur_x, -+- priv->cur_y); -+- xf86PostButtonEvent (local->dev, TRUE, -+- 4, 0, 0, 2, -+- priv->cur_x, -+- priv->cur_y); -++ PostButtonEvent (local, 4,1,priv->cur_x,priv->cur_y); -++ PostButtonEvent (local, 4,0,priv->cur_x,priv->cur_y); -+ } -+ } else if (ev->value < 0) { -+ for (ev->value = -ev->value; ev->value > 0; ev->value--) { -+- xf86PostButtonEvent (local->dev, TRUE, -+- 5, 1, 0, 2, -+- priv->cur_x, -+- priv->cur_y); -+- xf86PostButtonEvent (local->dev, TRUE, -+- 5, 0, 0, 2, -+- priv->cur_x, -+- priv->cur_y); -++ PostButtonEvent (local, 5,1,priv->cur_x,priv->cur_y); -++ PostButtonEvent (local, 5,0,priv->cur_x,priv->cur_y); -+ } -+ } -+ } -+@@ -451,10 +443,7 @@ void EVTouchProcessKey(EVTouchPrivatePtr -+ default: -+ return; -+ } -+- xf86PostButtonEvent(local->dev, TRUE, -+- btn, ev->value, 0, 2, -+- priv->cur_x, -+- priv->cur_y); -++ PostButtonEvent (local, btn, ev->value,priv->cur_x,priv->cur_y); -+ #endif -+ -+ return; -+@@ -492,8 +481,8 @@ DeviceOn (DeviceIntPtr dev) -+ -+ priv->buffer = XisbNew(local->fd, 64); -+ -+- DBG (9, XisbTrace (priv->buffer, 1)); -+- -++// breaks compilation -++// DBG (9, XisbTrace (priv->buffer, 1)); -+ -+ if (!priv->buffer) -+ { -+@@ -637,8 +626,19 @@ DeviceInit (DeviceIntPtr dev) -+ ErrorF ("Unable to allocate EVTouch touchscreen ValuatorClassDeviceStruct\n"); -+ return !Success; -+ } -+- -+- xf86InitValuatorAxisStruct(dev, 0, priv->min_x, priv->max_x, -++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 -++ xf86InitValuatorAxisStruct(dev, 0, 0, priv->screen_width, -++ 1024, -++ EV_AXIS_MIN_RES /* min_res */ , -++ EV_AXIS_MAX_RES /* max_res */ ); -++ xf86InitValuatorDefaults(dev, 0); -++ xf86InitValuatorAxisStruct(dev, 1, 0, priv->screen_height, -++ 1024, -++ EV_AXIS_MIN_RES /* min_res */ , -++ EV_AXIS_MAX_RES /* max_res */ ); -++ xf86InitValuatorDefaults(dev, 1); -++#else -++ xf86InitValuatorAxisStruct(dev, 0, priv->min_x, priv->max_x, -+ 1024, -+ EV_AXIS_MIN_RES /* min_res */ , -+ EV_AXIS_MAX_RES /* max_res */ ); -+@@ -648,7 +648,7 @@ DeviceInit (DeviceIntPtr dev) -+ EV_AXIS_MIN_RES /* min_res */ , -+ EV_AXIS_MAX_RES /* max_res */ ); -+ xf86InitValuatorDefaults(dev, 1); -+- -++#endif -+ /* Initial position of pointer on screen: Centered */ -+ priv->cur_x=(priv->max_x - priv->min_x)/2; -+ priv->cur_y=(priv->max_y - priv->min_y)/2; -+@@ -777,14 +777,8 @@ static void ReadInput (LocalDevicePtr lo -+ DBGOUT(2, "EVTouch: %s type:%0.2x code: 0x%0.4x value:%d\n", -+ __FUNCTION__, ev->type, ev->code, ev->value); -+ -+- xf86XInputSetScreen(local, -+- priv->screen_num, -+- priv->cur_x, -+- priv->cur_y); -+- -+- xf86PostProximityEvent(local->dev, 1, 0, 2, -+- priv->cur_x, -+- priv->cur_y); -++ InputSetScreen(local); -++ PostProximityEvent (local,1); -+ -+ switch (ev->type) { -+ case EV_ABS: -+@@ -794,9 +788,7 @@ static void ReadInput (LocalDevicePtr lo -+ EVTouchProcessRel(priv); -+ break; -+ case EV_KEY: -+- xf86PostMotionEvent (local->dev, TRUE, 0, 2, -+- priv->cur_x, -+- priv->cur_y); -++ PostMotionEvent (local); -+ -+ if (priv->ev.code == BTN_TOUCH) { -+ if (priv->ev.value == 1) { -+@@ -811,9 +803,8 @@ static void ReadInput (LocalDevicePtr lo -+ EVTouchProcessKey(priv); -+ break; -+ case EV_SYN: -+- xf86PostMotionEvent (local->dev, TRUE, 0, 2, -+- priv->cur_x, -+- priv->cur_y); -++ libtouchSetPos(priv->libtouch, priv->cur_x,priv->cur_y); -++ PostMotionEvent (local); -+ -+ if ( priv->touch_flags & TOUCHED ) -+ libtouchTriggerSM(priv->libtouch, PEN_TOUCHED); -+@@ -902,7 +893,9 @@ ConvertProc ( LocalDevicePtr local, -+ -+ EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private); -+ ScrnInfoPtr pScrn = xf86Screens[priv->screen_num]; -+- Rotation rotation = RRGetRotation(pScrn->pScreen); -++ -++// X Segfaults -++// Rotation rotation = RRGetRotation(pScrn->pScreen); -+ -+ DBGOUT(2, "EVTouch: FIRST: v0=%d v1=%d\n", v0, v1); -+ -+@@ -921,15 +914,17 @@ ConvertProc ( LocalDevicePtr local, -+ max_x = priv->max_x - priv->min_x; -+ max_y = priv->max_y - priv->min_y; -+ -+- if (priv->rotate == EV_ROTATE_NONE) { -++ -++// if (priv->rotate == EV_ROTATE_NONE) { -+ screen_width = pScrn->currentMode->HDisplay; -+ screen_height = pScrn->currentMode->VDisplay; -++/* Swapping is done below in Coords! Leave those to be able to calc correct mapping -+ } else { -+ screen_width = pScrn->currentMode->VDisplay; -+ screen_height = pScrn->currentMode->HDisplay; -+ } -+ -+- -++*/ -+ if (xc < (max_x / 2)) { -+ /* -+ left -+@@ -1042,45 +1037,57 @@ ConvertProc ( LocalDevicePtr local, -+ -+ int tmp = 0; -+ /* rotation mixes x and y up a bit */ -+- if (priv->rotate == EV_ROTATE_CW) { -++ switch(priv->rotate) { -++ case EV_ROTATE_CW: -+ tmp = xc; -+ xc = yc; -+ yc = screen_width - tmp; -+- } else if (priv->rotate == EV_ROTATE_CCW) { -++ break; -++ case EV_ROTATE_CCW: -+ tmp = xc; -+ xc = screen_height - yc; -+ yc = tmp; -++ break; -++ case EV_ROTATE_UD: -++ xc = screen_width - xc; -++ yc = screen_height - yc; -++ break; -++ default: -++ break; -+ } -+ -+- switch (rotation) { -+- case RR_Rotate_0: -++/* X Segfaults on rotation setting -++ switch (rotation) { -++ case RR_Rotate_0: -+ v0 = xc; -+ v1 = yc; -+- break; -+- case RR_Rotate_180: -+- v0 = screen_width - xc; -+- v1 = screen_height - yc; -+- break; -+- case RR_Rotate_90: -++ break; -++ case RR_Rotate_180: -++ v0 = screen_width - xc; -++ v1 = screen_height - yc; -++ break; -++ case RR_Rotate_90: -+ tmp = xc; -+- v0 = screen_height - yc; -++ v0 = screen_height - yc; -+ v1 = tmp; -+- break; -+- case RR_Rotate_270: -++ break; -++ case RR_Rotate_270: -+ tmp = xc; -+- v0 = yc; -+- v1 = screen_width - tmp; -+- break; -+- default: -+- break; -+- } -++ v0 = yc; -++ v1 = screen_width - tmp; -++ break; -++ default: -++ break; -++ } -++ -++ -++*/ -+ } -+ -+ DBGOUT(2, "EVTouch: FINAL: v0=%d v1=%d\n", v0, v1); -+ -+- *x = v0; -+- *y = v1; -+- -++ *x = xc; -++ *y = yc; -+ return (TRUE); -+ } -+ -+@@ -1133,8 +1140,9 @@ EVTouchPreInit(InputDriverPtr drv, IDevP -+ -+ xf86OptionListReport(local->options); -+ -++ -+ priv->libtouch = xcalloc(1, sizeof(LibTouchRec)); -+- libtouchInit(priv->libtouch, local); -++ libtouchInit(priv->libtouch, local,PostButtonEvent); -+ -+ priv->screen_num = xf86SetIntOption(local->options, "ScreenNumber", 0 ); -+ -+@@ -1164,9 +1172,9 @@ EVTouchPreInit(InputDriverPtr drv, IDevP -+ timeo = xf86SetIntOption(local->options, "LongtouchTimer", 160); -+ libtouchSetLongtouchTimeo(priv->libtouch, timeo); -+ -+- libtouchSetMoveLimit(priv->libtouch, -+- xf86SetIntOption( local->options, -+- "MoveLimit", 180 )); -++ priv->move_limit = xf86SetIntOption( local->options, -++ "MoveLimit", 180 ); -++ libtouchSetMoveLimit(priv->libtouch, priv->move_limit); -+ -+ priv->rotate = EV_ROTATE_NONE; -+ s = xf86FindOptionValue(local->options, "Rotate"); -+@@ -1175,7 +1183,11 @@ EVTouchPreInit(InputDriverPtr drv, IDevP -+ priv->rotate = EV_ROTATE_CW; -+ } else if (xf86NameCmp(s, "CCW") == 0 ) { -+ priv->rotate = EV_ROTATE_CCW; -+- } -++ } else if (xf86NameCmp(s, "UD") == 0 ) { -++ priv->rotate = EV_ROTATE_UD; -++ } -++ -++ -+ } -+ -+ if (priv->rotate == EV_ROTATE_NONE) { -+@@ -1207,9 +1219,10 @@ EVTouchPreInit(InputDriverPtr drv, IDevP -+ priv->diff[i][0], priv->diff[i][1]); -+ } -+ -++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 -+ xf86AlwaysCore(local, TRUE); -++#endif -+ priv->touch_flags = 0; -+- -+ local->history_size = xf86SetIntOption( local->options, "HistorySize", 0 ); -+ -+ /* prepare to process touch packets */ -+@@ -1232,6 +1245,7 @@ EVTouchPreInit(InputDriverPtr drv, IDevP -+ -+ xf86CloseSerial(local->fd); -+ local->fd = -1; -++ -+ return (local); -+ } -+ -+@@ -1243,3 +1257,58 @@ EVTouchPtrCtrl(DeviceIntPtr device, PtrC -+ Ho Hum. -+ */ -+ } -++ -++ -++static void -++PostMotionEvent(LocalDevicePtr local) { -++int cur_x, cur_y; -++EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private); -++ -++ cur_x = priv->cur_x; -++ cur_y = priv->cur_y; -++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 -++ ConvertProc(local,0,2,priv->cur_x,priv->cur_y,0,0,0,0,&cur_x,&cur_y); -++#endif -++ -++xf86PostMotionEvent (local->dev, TRUE, 0, 2, cur_x, cur_y); -++} -++ -++static void -++PostProximityEvent(LocalDevicePtr local, int is_in) { -++int cur_x, cur_y; -++EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private); -++ -++ cur_x = priv->cur_x; -++ cur_y = priv->cur_y; -++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 -++ ConvertProc(local,0,2,priv->cur_x,priv->cur_y,0,0,0,0,&cur_x,&cur_y); -++#endif -++ -++xf86PostProximityEvent(local->dev, is_in, 0, 2, cur_x,cur_y); -++} -++ -++static void -++PostButtonEvent(LocalDevicePtr local, int button, int is_down,int x, int y) { -++EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private); -++ -++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 -++ ConvertProc(local,0,2,x,y,0,0,0,0,&x,&y); -++#endif -++ -++xf86PostButtonEvent (local->dev, TRUE, button, is_down, 0, 2, x, y); -++} -++ -++ -++static void InputSetScreen(LocalDevicePtr local) { -++int cur_x, cur_y; -++EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private); -++ -++ cur_x = priv->cur_x; -++ cur_y = priv->cur_y; -++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 -++ ConvertProc(local,0,2,priv->cur_x,priv->cur_y,0,0,0,0,&cur_x,&cur_y); -++#endif -++ -++xf86XInputSetScreen(local,priv->screen_num,cur_x,cur_y); -++} -++ -+Index: xserver-xorg-input-evtouch/evtouch.h -+=================================================================== -+--- xserver-xorg-input-evtouch.orig/evtouch.h 2008-02-02 21:49:20.823984091 +0900 -++++ xserver-xorg-input-evtouch/evtouch.h 2008-02-02 21:49:39.734971242 +0900 -+@@ -42,6 +42,7 @@ -+ #define EV_ROTATE_NONE 0 -+ #define EV_ROTATE_CW 1 -+ #define EV_ROTATE_CCW 2 -++#define EV_ROTATE_UD 3 -+ -+ #define EV_AXIS_MIN_RES 0 -+ #define EV_AXIS_MAX_RES 1024 -+@@ -80,6 +81,7 @@ typedef struct _EVTouchPrivateRec -+ int max_rel_y; /* Maximum y */ -+ -+ int drag_timer; -++ int move_limit; -+ Bool emulate3; -+ int emulate3_timeout; -+ OsTimerPtr emulate3_timer; -+@@ -138,6 +140,7 @@ typedef struct _EVTouchPrivateRec -+ -+ LibTouchRecPtr libtouch; -+ LocalDevicePtr local; -++ -+ } EVTouchPrivateRec, *EVTouchPrivatePtr; -+ -+ -+Index: xserver-xorg-input-evtouch/libtouch.c -+=================================================================== -+--- xserver-xorg-input-evtouch.orig/libtouch.c 2008-02-02 21:49:36.899983517 +0900 -++++ xserver-xorg-input-evtouch/libtouch.c 2008-02-02 21:49:39.734971242 +0900 -+@@ -52,6 +52,7 @@ typedef struct state { -+ int (*handle_state)(LibTouchRecPtr priv); -+ void (*action)(LibTouchRecPtr priv, int btn, int x, int y); -+ int btn; -++ int drag_btn; -+ } state_t; -+ -+ -+@@ -68,16 +69,14 @@ typedef enum states { -+ static void btn_down_action(LibTouchRecPtr priv, int btn, int x, int y) -+ { -+ DBG(4, ErrorF("LibTouch: Issuing Button %d down\n", btn)); -+- xf86PostButtonEvent(priv->local->dev, TRUE, -+- btn, 1, 0, 2, x, y); -++ priv->post_button_proc(priv->local,btn, 1,x,y); -+ priv->pressed_btn_stat |= 1 << btn; -+ } -+ -+ static void btn_up_action(LibTouchRecPtr priv, int btn, int x, int y) -+ { -+ DBG(4, ErrorF("LibTouch: Issuing Button %d up\n", btn)); -+- xf86PostButtonEvent(priv->local->dev, TRUE, -+- btn, 0, 0, 2, x, y); -++ priv->post_button_proc(priv->local,btn, 0,x,y); -+ priv->pressed_btn_stat &= ~(1 << btn); -+ } -+ -+@@ -103,13 +102,13 @@ static int handle_oneandahalftap(LibTouc -+ static void dump_configuration(); -+ -+ state_t state_ar[] = { -+- {enter_untouched, handle_untouched, NULL, 0}, -+- {enter_touched, handle_touched, NULL, 0}, -+- {enter_longtouched, handle_longtouched, btn_down_action, 1}, -+- {enter_moving, handle_moving, NULL, 0}, -+- {enter_maybetap, handle_maybetap, btn_click_action, 1}, -+- {enter_oneandahalftap, handle_oneandahalftap, btn_down_action, 3}, -+- {NULL, NULL, NULL, -1}, -++ {enter_untouched, handle_untouched, NULL, 0,-1}, -++ {enter_touched, handle_touched, NULL, 0,-1}, -++ {enter_longtouched, handle_longtouched, btn_down_action, 1,-1}, -++ {enter_moving, handle_moving, NULL, 0,-1}, -++ {enter_maybetap, handle_maybetap, btn_click_action, 1,-1}, -++ {enter_oneandahalftap, handle_oneandahalftap, btn_down_action, 3,-1}, -++ {NULL, NULL, NULL, -1,-1}, -+ }; -+ -+ char *state_str[] = { -+@@ -142,6 +141,16 @@ char *state_button_str[] = { -+ NULL, -+ }; -+ -++char *state_drag_str[] = { -++ "untouched_drag", -++ "touched_drag", -++ "longtouched_drag", -++ "moving_drag", -++ "maybetapped_drag", -++ "oneandahalftap_drag", -++ NULL, -++}; -++ -+ char *action_str[] = { -+ "down", -+ "up", -+@@ -177,13 +186,13 @@ void libtouchSetMoveLimit(LibTouchRecPtr -+ } -+ -+ -+-void libtouchInit(LibTouchRecPtr libtouch, LocalDevicePtr local) -++void libtouchInit(LibTouchRecPtr libtouch, LocalDevicePtr local,pointer post_button_proc) -+ { -+ int state_action_idx = 0; -+ int state_button_idx = 0; -++ int state_drag_idx = 0; -+ int action_idx = 0; -+ int btn; -+- -+ char *str; -+ -+ xf86memset(libtouch, 0, sizeof(LibTouchRec)); -+@@ -193,6 +202,7 @@ void libtouchInit(LibTouchRecPtr libtouc -+ libtouch->local = local; -+ libtouch->move_limit = 30; -+ -++ libtouch->post_button_proc = post_button_proc; -+ /* -+ Actions: up, down, click -+ -+@@ -228,6 +238,11 @@ void libtouchInit(LibTouchRecPtr libtouc -+ } -+ } -+ -++ /* parse dragging for the states, that is which button sent to be as down, when in state and about to change to MOVING state */ -++ for (state_drag_idx = 0; state_drag_str[state_drag_idx] != NULL; state_drag_idx++) { -++ btn = xf86SetIntOption(local->options, state_drag_str[state_drag_idx], -1); -++ if (btn != -1) state_ar[state_drag_idx].drag_btn = btn; -++ } -+ -+ dump_configuration(); -+ } -+@@ -359,10 +374,7 @@ static void enter_untouched(LibTouchRecP -+ for (i = 0; i < bit_size; i++) -+ if (priv->pressed_btn_stat & (1 << i)) { -+ DBG(4, ErrorF("LibTouch: Issuing Button-release %d\n", i)); -+- xf86PostButtonEvent(priv->local->dev, TRUE, -+- i, 0, 0, 2, -+- priv->cur_x, -+- priv->cur_y); -++ priv->post_button_proc(priv->local,i, 0,priv->cur_x,priv->cur_y); -+ } -+ -+ priv->pressed_btn_stat = 0; -+@@ -445,6 +457,10 @@ static int handle_touched(LibTouchRecPtr -+ if (priv->cur_x != priv->old_x) { -+ dx = delta(priv->touch_x, priv->cur_x); -+ if (dx > priv->move_limit) { -++ if((state_ar[S_TOUCHED].drag_btn != -1) && (priv->touch_time != priv->now)){ -++ libtouchSetTime(priv, GetTimeInMillis()); -++ btn_down_action(priv, state_ar[S_TOUCHED].drag_btn, priv->cur_x,priv->cur_y); -++ } -+ return S_MOVING; -+ } -+ } -+@@ -454,7 +470,10 @@ static int handle_touched(LibTouchRecPtr -+ if (priv->cur_y != priv->old_y) { -+ dy = delta(priv->touch_y, priv->cur_y); -+ if (dy > priv->move_limit) { -+- return S_MOVING; -++ if((state_ar[S_TOUCHED].drag_btn != -1) && (priv->touch_time != priv->now)){ -++ libtouchSetTime(priv, GetTimeInMillis()); -++ btn_down_action(priv, state_ar[S_TOUCHED].drag_btn, priv->cur_x,priv->cur_y); -++} return S_MOVING; -+ } -+ } -+ } -+@@ -500,7 +519,7 @@ static int handle_longtouched(LibTouchRe -+ } else { -+ if (priv->cur_x != priv->old_x) { -+ dx = delta(priv->touch_x, priv->cur_x); -+- if (dx > priv->move_limit) -++ if (dx > priv->move_limit) -+ rc = S_MOVING; -+ } -+ -+Index: xserver-xorg-input-evtouch/libtouch.h -+=================================================================== -+--- xserver-xorg-input-evtouch.orig/libtouch.h 2008-02-02 21:49:36.899983517 +0900 -++++ xserver-xorg-input-evtouch/libtouch.h 2008-02-02 21:49:39.734971242 +0900 -+@@ -50,6 +50,7 @@ typedef struct _libtouch { -+ CARD32 past; -+ CARD32 now; -+ LocalDevicePtr local; -++ void (*post_button_proc)(LocalDevicePtr local,int button, int is_down,int x,int y); -+ } LibTouchRec, *LibTouchRecPtr; -+ -+ void libtouchSetDebugLevel(int level); -+@@ -59,7 +60,7 @@ void libtouchSetOneandahalftapTimeo(LibT -+ void libtouchSetTime(LibTouchRecPtr libtouch, CARD32 now); -+ void libtouchSetMoveLimit(LibTouchRecPtr libtouch, int move_limit); -+ -+-void libtouchInit(LibTouchRecPtr libtouch, LocalDevicePtr local); -++void libtouchInit(LibTouchRecPtr libtouch, LocalDevicePtr local,pointer post_button_proc); -+ -+ void libtouchSetPos(LibTouchRecPtr libtouch, int x, int y); -+ void libtouchTriggerSM(LibTouchRecPtr libtouch, LibTouchState_t touch); ---- xf86-input-evtouch-0.8.8.orig/debian/patches/04_include_xf86_ansic_h.patch -+++ xf86-input-evtouch-0.8.8/debian/patches/04_include_xf86_ansic_h.patch -@@ -0,0 +1,23 @@ -+Index: xserver-xorg-input-evtouch/libtouch.c -+=================================================================== -+--- xserver-xorg-input-evtouch.orig/libtouch.c 2007-09-11 23:00:20.762131559 +0900 -++++ xserver-xorg-input-evtouch/libtouch.c 2007-09-11 23:00:43.263413833 +0900 -+@@ -34,7 +34,6 @@ -+ #ifndef NEED_XF86_TYPES -+ #define NEED_XF86_TYPES -+ #endif -+-#include <xf86_ansic.h> -+ #include <xf86_OSproc.h> -+ #include <xf86Xinput.h> -+ #include <exevents.h> -+Index: xserver-xorg-input-evtouch/libtouch.h -+=================================================================== -+--- xserver-xorg-input-evtouch.orig/libtouch.h 2007-09-11 23:00:20.762131559 +0900 -++++ xserver-xorg-input-evtouch/libtouch.h 2007-09-11 23:00:51.263869754 +0900 -+@@ -1,5 +1,6 @@ -+ #ifndef _libtouch_H_ -+ #define _libtouch_H_ -++#include <xf86_ansic.h> -+ #include <os.h> -+ -+ #define TOUCHED 0x01 ---- xf86-input-evtouch-0.8.8.orig/debian/patches/07_random_fixes_for_06.patch -+++ xf86-input-evtouch-0.8.8/debian/patches/07_random_fixes_for_06.patch -@@ -0,0 +1,523 @@ -+# Description: -+# o Random whitespace fixes -+# o uninitialized variables warning fix -+# -+Index: xserver-xorg-input-evtouch/evtouch.c -+=================================================================== -+--- xserver-xorg-input-evtouch.orig/evtouch.c 2008-02-03 11:51:32.082972688 +0900 -++++ xserver-xorg-input-evtouch/evtouch.c 2008-02-03 11:51:32.106981862 +0900 -+@@ -1,6 +1,6 @@ -+ /* -+ * -+- * Copyright 2004 by Kenan Esau <kenan.esau@conan.de>, Baltmannsweiler, -++ * Copyright 2004 by Kenan Esau <kenan.esau@conan.de>, Baltmannsweiler, -+ * Germany. -+ * -+ * Permission to use, copy, modify, distribute, and sell this software and its -+@@ -182,17 +182,17 @@ static const char *default_options[] = -+ static int -+ ControlProc(LocalDevicePtr device, xDeviceCtl *ctrl); -+ -+-static void -++static void -+ PostMotionEvent(LocalDevicePtr local); -+ -+-static void -++static void -+ PostProximityEvent(LocalDevicePtr local,int is_in); -+ -+-static void -++static void -+ PostButtonEvent(LocalDevicePtr local, int button, -+ int is_down, int x,int y); -+ -+-static void -++static void -+ InputSetScreen(LocalDevicePtr local); -+ -+ -+@@ -216,7 +216,7 @@ emulate3Timer(OsTimerPtr timer, CARD32 n -+ -+ PostMotionEvent(local); -+ -+- /* -++ /* -+ * Emit a button press -- release is handled in EVTouchLBRBEvent -+ */ -+ if ( ( priv->touch_flags & LB_STAT ) && -+@@ -241,11 +241,11 @@ emulate3Timer(OsTimerPtr timer, CARD32 n -+ -+ priv->emulate3_timer_expired = TRUE; -+ xf86UnblockSIGIO(sigstate); -+- -++ -+ return 0; -+ } -+ -+-static void DoBtnAction(EVTouchPrivatePtr priv) -++static void DoBtnAction(EVTouchPrivatePtr priv) -+ { -+ int btn = 0; -+ LocalDevicePtr local = priv->local; -+@@ -253,7 +253,7 @@ static void DoBtnAction(EVTouchPrivatePt -+ DBGOUT(2, "EVTouch: %s btn_count=%d\n", __FUNCTION__, priv->btn_count); -+ -+ for (btn = 0; btn < priv->btn_count; btn++) { -+- DBGOUT(9, "EVTouch: %s do_it = %d \n", -++ DBGOUT(9, "EVTouch: %s do_it = %d \n", -+ __FUNCTION__, priv->btn_actions[btn].do_it); -+ if (priv->btn_actions[btn].do_it != 0) { -+ if (priv->emulate3_timer != NULL) -+@@ -263,10 +263,10 @@ static void DoBtnAction(EVTouchPrivatePt -+ priv->emulate3_timer_expired = FALSE; -+ } -+ -+- DBGOUT(2, "EVTouch: %s btn = %d action = %d\n", -+- __FUNCTION__, btn, -++ DBGOUT(2, "EVTouch: %s btn = %d action = %d\n", -++ __FUNCTION__, btn, -+ priv->btn_actions[btn].action); -+- PostButtonEvent (local, btn, priv->btn_actions[btn].action,priv->cur_x,priv->cur_y); -++ PostButtonEvent (local, btn, priv->btn_actions[btn].action,priv->cur_x,priv->cur_y); -+ -+ priv->btn_actions[btn].do_it = 0; -+ priv->btn_actions[btn].action = 0; -+@@ -318,7 +318,7 @@ void EVTouchProcessAbs(EVTouchPrivatePtr -+ PostButtonEvent (local, 5,1,priv->cur_x,priv->cur_y); -+ PostButtonEvent (local, 5,0,priv->cur_x,priv->cur_y); -+ } -+- } -++ } -+ } -+ } -+ -+@@ -337,7 +337,7 @@ void EVTouchProcessRel(EVTouchPrivatePtr -+ if (priv->cur_x < priv->min_x) -+ priv->cur_x = priv->min_x; -+ return; -+- } -++ } -+ if ( ev->code == REL_Y ) { -+ priv->cur_y += ev->value; -+ if (priv->cur_y > priv->max_y) -+@@ -346,7 +346,7 @@ void EVTouchProcessRel(EVTouchPrivatePtr -+ priv->cur_y = priv->min_y; -+ return; -+ } -+- -++ -+ libtouchSetPos(priv->libtouch, priv->cur_x, priv->cur_y); -+ } -+ -+@@ -363,12 +363,12 @@ void EVTouchLBRBEvent(EVTouchPrivatePtr -+ -+ if (priv->emulate3) { -+ if ( (ev->value==1) && (priv->emulate3_timer==NULL) ) -+- priv->emulate3_timer = TimerSet(priv->emulate3_timer, -++ priv->emulate3_timer = TimerSet(priv->emulate3_timer, -+ 0, -+ priv->emulate3_timeout, -+ emulate3Timer, -+ local); -+- -++ -+ if ( (ev->value == 1) && (ev->code == BTN_LEFT) ) { -+ priv->touch_flags |= LB_STAT; -+ } -+@@ -376,8 +376,8 @@ void EVTouchLBRBEvent(EVTouchPrivatePtr -+ priv->touch_flags |= RB_STAT; -+ } -+ -+- if ( (ev->value == 0) && -+- (priv->touch_flags & RB_STAT) && -++ if ( (ev->value == 0) && -++ (priv->touch_flags & RB_STAT) && -+ (priv->touch_flags & LB_STAT) ) { -+ DBGOUT(2, "EVTouch: Middle Release\n"); -+ priv->touch_flags &= ~LB_STAT; -+@@ -393,7 +393,7 @@ void EVTouchLBRBEvent(EVTouchPrivatePtr -+ DBGOUT(2, "EVTouch: Right Release\n"); -+ priv->touch_flags &= ~RB_STAT; -+ SetBtnAction(priv, 3, BTN_RELEASE); -+- } -++ } -+ } else { -+ if (ev->code == BTN_LEFT) { -+ SetBtnAction(priv, 1, ev->value); -+@@ -418,11 +418,11 @@ void EVTouchProcessKey(EVTouchPrivatePtr -+ -+ DBGOUT(2, "EVTouch: %s\n", __FUNCTION__); -+ ev = &priv->ev; -+- if ( (ev->code == BTN_LEFT) || -++ if ( (ev->code == BTN_LEFT) || -+ (ev->code == BTN_RIGHT) || -+ (ev->code == BTN_MIDDLE) ) { -+ -+- /* give lb and rb-events some special treatment -++ /* give lb and rb-events some special treatment -+ (emulate3 or not, ...) */ -+ EVTouchLBRBEvent(priv); -+ return; -+@@ -468,7 +468,7 @@ DeviceOn (DeviceIntPtr dev) -+ { -+ LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate; -+ EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private); -+- -++ -+ local->fd = xf86OpenSerial(local->options); -+ -+ DBGOUT(2, "EVTouch: %s\n", __FUNCTION__ ); -+@@ -484,7 +484,7 @@ DeviceOn (DeviceIntPtr dev) -+ // breaks compilation -+ // DBG (9, XisbTrace (priv->buffer, 1)); -+ -+- if (!priv->buffer) -++ if (!priv->buffer) -+ { -+ xf86CloseSerial(local->fd); -+ local->fd = -1; -+@@ -526,7 +526,7 @@ DeviceOff (DeviceIntPtr dev) -+ DBGOUT(2, "EVTouch: %s\n", __FUNCTION__ ); -+ -+ if (local->fd != -1) -+- { -++ { -+ ioctl(local->fd, EVIOCGRAB, (void *)0); -+ xf86RemoveEnabledDevice (local); -+ if (priv->buffer) -+@@ -564,7 +564,7 @@ DeviceInit (DeviceIntPtr dev) -+ -+ priv->btn_count = EV_MAX_BUTTONS; -+ -+- /* -++ /* -+ * these have to be here instead of in the SetupProc, because when the -+ * SetupProc is run at server startup, screenInfo is not setup yet -+ */ -+@@ -574,9 +574,9 @@ DeviceInit (DeviceIntPtr dev) -+ priv->screen_height = pScrn->virtualY; -+ priv->pViewPort_X0 = &(pScrn->frameX0); /* initialize the pointers to the viewport coords */ -+ if ( (priv->screen_width != priv->phys_width) || -+- (priv->screen_height != priv->phys_height) ) -++ (priv->screen_height != priv->phys_height) ) -+ priv->virtual = 1; -+- else -++ else -+ priv->virtual = 0; -+ -+ priv->pViewPort_Y0 = &(pScrn->frameY0); -+@@ -591,24 +591,24 @@ DeviceInit (DeviceIntPtr dev) -+ DBGOUT(2, "EVTouch: MaxValue H,V: %d %d\n", pScrn->maxHValue, pScrn->maxVValue); -+ -+ priv->screen_width = screenInfo.screens[priv->screen_num]->width; -+- priv->screen_height = screenInfo.screens[priv->screen_num]->height; -++ priv->screen_height = screenInfo.screens[priv->screen_num]->height; -+ -+- /* -++ /* -+ * Device reports button press for 5 buttons. -+ */ -+ if (InitButtonClassDeviceStruct (dev, EV_MAX_BUTTONS, map) == FALSE) -+ { -+ ErrorF("Unable to allocate EVTouch touchscreen ButtonClassDeviceStruct\n"); -+ return BadAlloc; -+- } -++ } -+ -+- DBGOUT(2, "EVTouch: %s btn_count=%d\n", __FUNCTION__, -++ DBGOUT(2, "EVTouch: %s btn_count=%d\n", __FUNCTION__, -+ priv->btn_count); -+ priv->btn_actions = xcalloc(priv->btn_count, sizeof(BtnAction)); -+- xf86memset(priv->btn_actions, 0, -++ xf86memset(priv->btn_actions, 0, -+ priv->btn_count * sizeof(BtnAction)); -+- -+- DBGOUT(2, "EVTouch: %s btn_count=%d\n", __FUNCTION__, -++ -++ DBGOUT(2, "EVTouch: %s btn_count=%d\n", __FUNCTION__, -+ priv->btn_count); -+ -+ if (InitFocusClassDeviceStruct(dev) == FALSE) { -+@@ -616,7 +616,7 @@ DeviceInit (DeviceIntPtr dev) -+ return !Success; -+ } -+ -+- /* -++ /* -+ * Device reports motions on 2 axes in absolute coordinates. -+ * Axes min and max values are reported in raw coordinates. -+ */ -+@@ -654,7 +654,7 @@ DeviceInit (DeviceIntPtr dev) -+ priv->cur_y=(priv->max_y - priv->min_y)/2; -+ libtouchSetPos(priv->libtouch, priv->cur_x, priv->cur_y); -+ -+- -++ -+ if (InitProximityClassDeviceStruct (dev) == FALSE) -+ { -+ ErrorF ("Unable to allocate EVTouch touchscreen ProximityClassDeviceStruct\n"); -+@@ -667,7 +667,7 @@ DeviceInit (DeviceIntPtr dev) -+ return !Success; -+ } -+ -+- /* -++ /* -+ * Allocate the motion events buffer. -+ */ -+ xf86MotionHistoryAllocate (local); -+@@ -748,7 +748,7 @@ EVTouchGetPacket (EVTouchPrivatePtr priv -+ if (sizeof(priv->ev) == count) { -+ count = 0; -+ EVTouchDumpPacketToLog(priv); -+- -++ -+ return Success; -+ } -+ } -+@@ -764,7 +764,7 @@ static void ReadInput (LocalDevicePtr lo -+ -+ EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private); -+ -+- /* -++ /* -+ * set blocking to -1 on the first call because we know there is data to -+ * read. Xisb automatically clears it after one successful read so that -+ * succeeding reads are preceeded buy a select with a 0 timeout to prevent -+@@ -815,7 +815,7 @@ static void ReadInput (LocalDevicePtr lo -+ break; -+ } -+ -+- DBGOUT( 2, "EVTouch: setting (x/y)=(%d/%d)\n", -++ DBGOUT( 2, "EVTouch: setting (x/y)=(%d/%d)\n", -+ priv->cur_x, priv->cur_y); -+ -+ } -+@@ -855,7 +855,7 @@ static int -+ SwitchMode (ClientPtr client, DeviceIntPtr dev, int mode) -+ { -+ DBGOUT(2, "EVTouch: %s\n", __FUNCTION__); -+- -++ -+ return (!Success); -+ } -+ -+@@ -884,19 +884,20 @@ ConvertProc ( LocalDevicePtr local, -+ float dx = 0, dy = 0; -+ -+ int max_x, max_y; -+- int xc, yc; -++ int xc = 0, yc = 0; -+ int screen_width = 0; -+ int screen_height = 0; -+ #ifdef EVDBG -+ int i = 0; -+ #endif -+ -+- EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private); -++ EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private); -+ ScrnInfoPtr pScrn = xf86Screens[priv->screen_num]; -+ -+ // X Segfaults -+-// Rotation rotation = RRGetRotation(pScrn->pScreen); -++ Rotation rotation = RRGetRotation(pScrn->pScreen); -+ -++ DBGOUT(2, "EVTouch: RRRotation=%d\n", rotation); -+ DBGOUT(2, "EVTouch: FIRST: v0=%d v1=%d\n", v0, v1); -+ -+ /*correction of raw coordinates*/ -+@@ -910,21 +911,20 @@ ConvertProc ( LocalDevicePtr local, -+ DBGOUT(2, "EVTouch: Scaling coordinates\n"); -+ xc = v0 - priv->min_x; -+ yc = v1 - priv->min_y; -+- -++ -+ max_x = priv->max_x - priv->min_x; -+ max_y = priv->max_y - priv->min_y; -+ -+ -+-// if (priv->rotate == EV_ROTATE_NONE) { -++ if (priv->rotate == EV_ROTATE_NONE) { -+ screen_width = pScrn->currentMode->HDisplay; -+ screen_height = pScrn->currentMode->VDisplay; -+-/* Swapping is done below in Coords! Leave those to be able to calc correct mapping -++/* Swapping is done below in Coords! Leave those to be able to calc correct mapping */ -+ } else { -+ screen_width = pScrn->currentMode->VDisplay; -+ screen_height = pScrn->currentMode->HDisplay; -+ } -+ -+-*/ -+ if (xc < (max_x / 2)) { -+ /* -+ left -+@@ -942,7 +942,7 @@ ConvertProc ( LocalDevicePtr local, -+ (float)(cx[0] * cy[0] * priv->diff[0][0]) + -+ (float)(cx[1] * cy[1] * priv->diff[4][0]) + -+ (float)(cx[0] * cy[1] * priv->diff[3][0])); -+- -++ -+ dy = ((float) (cx[1] * cy[0] * priv->diff[1][1]) + -+ (float)(cx[0] * cy[0] * priv->diff[0][1]) + -+ (float)(cx[1] * cy[1] * priv->diff[4][1]) + -+@@ -961,7 +961,7 @@ ConvertProc ( LocalDevicePtr local, -+ (float)(cx[0] * cy[0] * priv->diff[3][0]) + -+ (float)(cx[1] * cy[1] * priv->diff[7][0]) + -+ (float)(cx[0] * cy[1] * priv->diff[6][0])); -+- -++ -+ dy = ((float) (cx[1] * cy[0] * priv->diff[4][1]) + -+ (float)(cx[0] * cy[0] * priv->diff[3][1]) + -+ (float)(cx[1] * cy[1] * priv->diff[7][1]) + -+@@ -985,7 +985,7 @@ ConvertProc ( LocalDevicePtr local, -+ (float)(cx[0] * cy[0] * priv->diff[1][0]) + -+ (float)(cx[1] * cy[1] * priv->diff[5][0]) + -+ (float)(cx[0] * cy[1] * priv->diff[4][0])); -+- -++ -+ dy = ((float) (cx[1] * cy[0] * priv->diff[2][1]) + -+ (float)(cx[0] * cy[0] * priv->diff[1][1]) + -+ (float)(cx[1] * cy[1] * priv->diff[5][1]) + -+@@ -1004,7 +1004,7 @@ ConvertProc ( LocalDevicePtr local, -+ (float)(cx[0] * cy[0] * priv->diff[4][0]) + -+ (float)(cx[1] * cy[1] * priv->diff[8][0]) + -+ (float)(cx[0] * cy[1] * priv->diff[7][0])); -+- -++ -+ dy = ((float) (cx[1] * cy[0] * priv->diff[5][1]) + -+ (float)(cx[0] * cy[0] * priv->diff[4][1]) + -+ (float)(cx[1] * cy[1] * priv->diff[8][1]) + -+@@ -1014,12 +1014,12 @@ ConvertProc ( LocalDevicePtr local, -+ -+ -+ #ifdef EVDBG -+- for (i=0; i<3; i++) -++ for (i=0; i<3; i++) -+ xf86ErrorFVerb(2, "cx[%d]=%f cy[%d]=%f\n", i, cx[i] -+ ,i, cy[i]); -+- -+- DBGOUT(2, "EVTouch: ViewPort_X0=%d ViewPort_Y0=%d\n", -+- *(priv->pViewPort_X0), -++ -++ DBGOUT(2, "EVTouch: ViewPort_X0=%d ViewPort_Y0=%d\n", -++ *(priv->pViewPort_X0), -+ *(priv->pViewPort_Y0)); -+ DBGOUT(2, "EVTouch: dx=%f dy=%f\n", dx, dy); -+ #endif -+@@ -1030,7 +1030,7 @@ ConvertProc ( LocalDevicePtr local, -+ if (priv->swap_y == TRUE) -+ yc = screen_height - yc; -+ -+- /* ususally we DON'T swap x -- but if swap_x is 1 -++ /* ususally we DON'T swap x -- but if swap_x is 1 -+ => go on and swap */ -+ if (priv->swap_x == TRUE) -+ xc = screen_width - xc; -+@@ -1056,7 +1056,7 @@ ConvertProc ( LocalDevicePtr local, -+ break; -+ } -+ -+-/* X Segfaults on rotation setting -++/* X Segfaults on rotation setting */ -+ switch (rotation) { -+ case RR_Rotate_0: -+ v0 = xc; -+@@ -1080,14 +1080,12 @@ ConvertProc ( LocalDevicePtr local, -+ break; -+ } -+ -+- -+-*/ -+ } -+ -+ DBGOUT(2, "EVTouch: FINAL: v0=%d v1=%d\n", v0, v1); -+ -+- *x = xc; -+- *y = yc; -++ *x = v0; -++ *y = v1; -+ return (TRUE); -+ } -+ -+@@ -1160,7 +1158,7 @@ EVTouchPreInit(InputDriverPtr drv, IDevP -+ priv->button_number = xf86SetIntOption(local->options, "ButtonNumber", 2 ); -+ -+ priv->emulate3 = xf86SetBoolOption(local->options, "Emulate3Buttons", TRUE); -+- priv->emulate3_timeout = xf86SetIntOption(local->options, -++ priv->emulate3_timeout = xf86SetIntOption(local->options, -+ "Emulate3Timeout", 50); -+ -+ debug_level = xf86SetIntOption(local->options, "DebugLevel", 0); -+@@ -1180,33 +1178,33 @@ EVTouchPreInit(InputDriverPtr drv, IDevP -+ s = xf86FindOptionValue(local->options, "Rotate"); -+ if (s) { -+ if (xf86NameCmp(s, "CW") == 0) { -+- priv->rotate = EV_ROTATE_CW; -++ priv->rotate = EV_ROTATE_CW; -+ } else if (xf86NameCmp(s, "CCW") == 0 ) { -+ priv->rotate = EV_ROTATE_CCW; -+ } else if (xf86NameCmp(s, "UD") == 0 ) { -+ priv->rotate = EV_ROTATE_UD; -+ } -+ -+- -++ -+ } -+ -+ if (priv->rotate == EV_ROTATE_NONE) { -+ priv->max_rel_x = priv->max_x; -+ priv->max_rel_y = priv->max_y; -+ priv->min_rel_x = priv->min_x; -+- priv->min_rel_y = priv->min_y; -++ priv->min_rel_y = priv->min_y; -+ } else { -+ priv->max_rel_x = priv->max_y; -+ priv->max_rel_y = priv->max_x; -+ priv->min_rel_x = priv->min_y; -+- priv->min_rel_y = priv->min_x; -++ priv->min_rel_y = priv->min_x; -+ } -+ -+ priv->swap_y = xf86SetBoolOption(local->options, "SwapY", FALSE); -+ priv->swap_x = xf86SetBoolOption(local->options, "SwapX", FALSE); -+ -+- /* -+- get calibration parameters from XF86Config -++ /* -++ get calibration parameters from XF86Config -+ */ -+ for (i = 0; i < 9; i++){ -+ sprintf(tmp_str, "x%d", i); -+@@ -1215,10 +1213,10 @@ EVTouchPreInit(InputDriverPtr drv, IDevP -+ sprintf(tmp_str, "y%d", i); -+ priv->diff[i][1] = xf86SetIntOption( local->options, -+ tmp_str, 0 ); -+- DBGOUT(2, "(diff[%d][0]/diff[%d][1])=(%d/%d)\n", i, i, -++ DBGOUT(2, "(diff[%d][0]/diff[%d][1])=(%d/%d)\n", i, i, -+ priv->diff[i][0], priv->diff[i][1]); -+ } -+- -++ -+ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 -+ xf86AlwaysCore(local, TRUE); -+ #endif -+@@ -1228,9 +1226,9 @@ EVTouchPreInit(InputDriverPtr drv, IDevP -+ /* prepare to process touch packets */ -+ EVTouchNewPacket (priv); -+ -+- /* -++ /* -+ if started in calibration-mode: -+- - open named pipe -++ - open named pipe -+ */ -+ if (priv->calibrate) { -+ priv->fifo = open("/tmp/ev_calibrate", O_RDWR, 0); -+@@ -1252,7 +1250,7 @@ EVTouchPreInit(InputDriverPtr drv, IDevP -+ static void -+ EVTouchPtrCtrl(DeviceIntPtr device, PtrCtrl *ctrl) -+ { -+- /* I have no clue what this does, except that registering it stops the -++ /* I have no clue what this does, except that registering it stops the -+ X server segfaulting in ProcGetPointerMapping() -+ Ho Hum. -+ */ ---- xf86-input-evtouch-0.8.8.orig/debian/patches/21_more_calibration_fixups.patch -+++ xf86-input-evtouch-0.8.8/debian/patches/21_more_calibration_fixups.patch -@@ -0,0 +1,33 @@ -+diff -u xf86-input-evtouch-0.8.8/evtouch.c xf86-input-evtouch-0.8.8/evtouch.c -+--- xf86-input-evtouch-0.8.8/evtouch.c -++++ xf86-input-evtouch-0.8.8/evtouch.c -+@@ -305,7 +305,7 @@ -+ } -+ -+ if (pos_changed == 1) { -+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 -++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2 -+ ConvertProc(priv->local, 0, 2, -+ priv->raw_x, priv->raw_y, -+ 0, 0, 0, 0, -+@@ -369,7 +369,7 @@ -+ priv->raw_y = priv->min_y; -+ } -+ -+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 -++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2 -+ ConvertProc(priv->local, 0, 2, -+ priv->raw_x, priv->raw_y, -+ 0, 0, 0, 0, -+diff -u xf86-input-evtouch-0.8.8/debian/changelog xf86-input-evtouch-0.8.8/debian/changelog -+--- xf86-input-evtouch-0.8.8.orig/ev_calibrate.c -++++ xf86-input-evtouch-0.8.8/ev_calibrate.c -+@@ -218,7 +218,7 @@ -+ int cap_style = CapButt; /* style of the line's edje and */ -+ int join_style = JoinBevel; /* joined lines. */ -+ -+- int event_mask = ExposureMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask; -++ int event_mask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask; -+ -+ int depth; -+ int screen_num; ---- xf86-input-evtouch-0.8.8.orig/debian/patches/08_fix_xf86memset.patch -+++ xf86-input-evtouch-0.8.8/debian/patches/08_fix_xf86memset.patch -@@ -0,0 +1,35 @@ -+Index: xf86-input-evtouch-0.8.7/evtouch.c -+=================================================================== -+--- xf86-input-evtouch-0.8.7.orig/evtouch.c 2008-08-07 11:33:52.000000000 +0300 -++++ xf86-input-evtouch-0.8.7/evtouch.c 2008-08-07 11:33:52.000000000 +0300 -+@@ -605,7 +605,7 @@ -+ DBGOUT(2, "EVTouch: %s btn_count=%d\n", __FUNCTION__, -+ priv->btn_count); -+ priv->btn_actions = xcalloc(priv->btn_count, sizeof(BtnAction)); -+- xf86memset(priv->btn_actions, 0, -++ memset(priv->btn_actions, 0, -+ priv->btn_count * sizeof(BtnAction)); -+ -+ DBGOUT(2, "EVTouch: %s btn_count=%d\n", __FUNCTION__, -+@@ -708,7 +708,7 @@ -+ static void -+ EVTouchNewPacket (EVTouchPrivatePtr priv) -+ { -+- xf86memset(&priv->ev, 0, sizeof(struct input_event)); -++ memset(&priv->ev, 0, sizeof(struct input_event)); -+ priv->packeti = 0; -+ priv->binary_pkt = FALSE; -+ } -+Index: xf86-input-evtouch-0.8.7/libtouch.c -+=================================================================== -+--- xf86-input-evtouch-0.8.7.orig/libtouch.c 2008-08-07 11:34:37.000000000 +0300 -++++ xf86-input-evtouch-0.8.7/libtouch.c 2008-08-07 11:35:05.000000000 +0300 -+@@ -195,7 +195,7 @@ -+ int btn; -+ char *str; -+ -+- xf86memset(libtouch, 0, sizeof(LibTouchRec)); -++ memset(libtouch, 0, sizeof(LibTouchRec)); -+ -+ libtouch->now = GetTimeInMillis(); -+ libtouch->past = libtouch->now; ---- xf86-input-evtouch-0.8.8.orig/debian/patches/09_calibrate-script-halification.patch -+++ xf86-input-evtouch-0.8.8/debian/patches/09_calibrate-script-halification.patch -@@ -0,0 +1,87 @@ -+Index: xf86-input-evtouch-0.8.7/calibrate.sh -+=================================================================== -+--- xf86-input-evtouch-0.8.7.orig/calibrate.sh 2008-09-26 00:58:00.000000000 +0200 -++++ xf86-input-evtouch-0.8.7/calibrate.sh 2008-09-26 00:59:37.000000000 +0200 -+@@ -2,9 +2,58 @@ -+ XINIT=`which xinit` -+ XSERVER=`which X` -+ EVCALIBRATE=`which ev_calibrate || echo ./ev_calibrate` -++UDI=$(hal-find-by-property --key input.x11_driver --string evtouch) -++MYDPY=":1.0" -++ZENITY=`which zenity` -++KDIALOG=`which kdialog` -++XDIALOG=`which Xdialog` -++ -++INFO="You have selected to (re)calibrate your touchscreen.\n\n\ -++Move your pen around all edges on the following screen.\n\n\ -++If you are done and touched all edges, hit the enter key and wait until \ -++the top left crosshair turns red.\nOnce you tap the red crosshair, \ -++the next one will turn red going from the top left to the \ -++bottom right.\nIf you miss a tap, the right mouse button will \ -++take you back one step.\n\n\ -++If you tapped the last (bottom right) crosshair, the program will \ -++return to your session. Note that changes only take effect after \ -++restarting the session." -++ -++RESTARTINFO="Touchscreen calibration done\nPlease restart your \ -++session to \nmake the changes take effect" -++ -++FAILINFO="No evtouch capable device found, if you are sure you have \n\ -++an evtouch capable touchscreen, please mail the \ -++resulting file of the command \"lshal > evtouch_hal.out\" to the\n\ -++ubuntu-mobile@lists.ubuntu.com mailing list, so support for your \ -++device can be added." -++ -++if [ -z "$UDI" ];then -++ if [ -x "${ZENITY}" ]; then -++ $ZENITY --info --text="${FAILINFO}" -++ elif [ -x "${XDIALOG}" ]; then -++ $XDIALOG --fill --msgbox "${FAILINFO}" 20 40 -++ elif [ -x "${KDIALOG}" ]; then -++ $KDIALOG --msgbox "${FAILINFO}" -++ fi -++ exit 0 -++fi -++ -++if [ -x "${ZENITY}" ]; then -++ $ZENITY --info --text="${INFO}" -++elif [ -x "${XDIALOG}" ]; then -++ $XDIALOG --fill --msgbox "${INFO}" 30 40 -++elif [ -x "${KDIALOG}" ]; then -++ $KDIALOG --msgbox "${INFO}" -++fi -+ -+ echo $EVCALIBRATE -+ -++if [ -n "$DISPLAY" ]; then -++ DPY=$(echo $DISPLAY|sed -e 's/[a-z:]*//g'|cut -d'.' -f1) -++ MYDPY=":$(($DPY+1)).0" -++fi -++ -+ if ! [ -x "$EVCALIBRATE" ] ; then -+ echo "ev_calibrate not found exiting ..." -+ exit 1; -+@@ -32,6 +81,22 @@ -+ #xinit /usr/bin/ddd ev_calibrate -- /usr/X11R6/bin/X -+ echo "Starting calibration program..." -+ sleep 2 -++hal-set-property --udi $UDI --key input.x11_options.calibrate --string "1" -++ -++$XINIT $EVCALIBRATE -- $XSERVER $MYDPY -auth /dev/null -++ -++hal-set-property --remove --udi $UDI --key input.x11_options.calibrate -++ -++invoke-rc.d --quiet xserver-xorg-input-evtouch start -++ -++rm /tmp/ev_calibrate -++ -++if [ -x "${ZENITY}" ]; then -++ $ZENITY --info --text="${RESTARTINFO}" -++elif [ -x "${XDIALOG}" ]; then -++ $XDIALOG --fill --msgbox "${RESTARTINFO}" 10 40 -++elif [ -x "${KDIALOG}" ]; then -++ $KDIALOG --msgbox "${RESTARTINFO}" -++fi -+ -+-$XINIT $EVCALIBRATE -- $XSERVER -+ exit 0 ---- xf86-input-evtouch-0.8.8.orig/debian/fdi/50-eGalax.fdi -+++ xf86-input-evtouch-0.8.8/debian/fdi/50-eGalax.fdi -@@ -0,0 +1,23 @@ -+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> -+<deviceinfo version="0.2"> -+ <device> -+ <match key="info.product" contains="eGalax"> -+ <match key="info.capabilities" contains="input"> -+ <merge key="input.x11_driver" type="string">evtouch</merge> -+ <merge key="input.x11_options.minx" type="string">130</merge> -+ <merge key="input.x11_options.miny" type="string">197</merge> -+ <merge key="input.x11_options.maxx" type="string">3945</merge> -+ <merge key="input.x11_options.maxy" type="string">3894</merge> -+ <merge key="input.x11_options.taptimer" type="string">30</merge> -+ <merge key="input.x11_options.longtouchtimer" type="string">750</merge> -+ <merge key="input.x11_options.longtouched_action" type="string">click</merge> -+ <merge key="input.x11_options.longtouched_button" type="string">3</merge> -+ <merge key="input.x11_options.oneandhalftap_button" type="string">2</merge> -+ <merge key="input.x11_options.movelimit" type="string">10</merge> -+ <merge key="input.x11_options.touched_drag" type="string">1</merge> -+ <merge key="input.x11_options.maybetapped_action" type="string">click</merge> -+ <merge key="input.x11_options.maybetapped_button" type="string">1</merge> -+ </match> -+ </match> -+ </device> -+</deviceinfo> ---- xf86-input-evtouch-0.8.8.orig/debian/fdi/50-gunze.fdi -+++ xf86-input-evtouch-0.8.8/debian/fdi/50-gunze.fdi -@@ -0,0 +1,16 @@ -+<?xml version="1.0" encoding="ISO-8859-1" ?> -+ -+<deviceinfo version="0.2"> -+ <device> -+ <match key="info.product" contains="GUNZE USB Touch Panel"> -+ <merge key="input.x11_driver" type="string">evtouch</merge> -+ <merge key="input.x11_options.ReportingMode" type="string">Raw</merge> -+ <merge key="input.x11_options.Emulate3Buttons" type="string">false</merge> -+ <merge key="input.x11_options.Emulate3Timeout" type="string">1</merge> -+ <merge key="input.x11_options.MinX" type="string">35</merge> -+ <merge key="input.x11_options.MinY" type="string">37</merge> -+ <merge key="input.x11_options.MaxX" type="string">990</merge> -+ <merge key="input.x11_options.MaxY" type="string">986</merge> -+ </match> -+ </device> -+</deviceinfo> -\ No newline at end of file ---- xf86-input-evtouch-0.8.8.orig/debian/fdi/50-ideaco.fdi -+++ xf86-input-evtouch-0.8.8/debian/fdi/50-ideaco.fdi -@@ -0,0 +1,23 @@ -+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> -+ -+<deviceinfo version="0.2"> -+ <device> -+ <match key="info.product" contains="IDEACO"> -+ <match key="info.product" contains="IDC 6680"> -+ <match key="info.capabilities" contains="input.touchpad"> -+ <merge key="input.x11_driver" type="string">evtouch</merge> -+ <merge key="input.x11_options.reportingmode" type="string">raw</merge> -+ <merge key="input.x11_options.taptimer" type="string">50</merge> -+ <merge key="input.x11_options.longtouchtimer" type="string">30</merge> -+ <merge key="input.x11_options.movelimit" type="string">15</merge> -+ <merge key="input.x11_options.emulate3buttons" type="string">true</merge> -+ <merge key="input.x11_options.emulate3timeout" type="string">50</merge> -+ <merge key="input.x11_options.maxx" type="string">7948</merge> -+ <merge key="input.x11_options.maxy" type="string">7834</merge> -+ <merge key="input.x11_options.minx" type="string">112</merge> -+ <merge key="input.x11_options.miny" type="string">254</merge> -+ </match> -+ </match> -+ </match> -+ </device> -+</deviceinfo> ---- xf86-input-evtouch-0.8.8.orig/debian/fdi/50-elo-2700.fdi -+++ xf86-input-evtouch-0.8.8/debian/fdi/50-elo-2700.fdi -@@ -0,0 +1,18 @@ -+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> -+<deviceinfo version="0.2"> -+ <device> -+ <match key="info.product" contains="Elo TouchSystems, Inc. Elo TouchSystems 2700 IntelliTouch(r) USB Touchmonitor Interface"> -+ <match key="info.capabilities" contains="input"> -+ <merge key="input.x11_driver" type="string">evtouch</merge> -+ <merge key="input.x11_options.minx" type="string">130</merge> -+ <merge key="input.x11_options.miny" type="string">197</merge> -+ <merge key="input.x11_options.maxx" type="string">3945</merge> -+ <merge key="input.x11_options.maxy" type="string">3894</merge> -+ <merge key="input.x11_options.swapx" type="string">1</merge> -+ <merge key="input.x11_options.swapy" type="string">1</merge> -+ </match> -+ </match> -+ </device> -+</deviceinfo> -+ -+</deviceinfo> -\ No newline at end of file ---- xf86-input-evtouch-0.8.8.orig/debian/fdi/50-touchpack.fdi -+++ xf86-input-evtouch-0.8.8/debian/fdi/50-touchpack.fdi -@@ -0,0 +1,30 @@ -+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> -+<deviceinfo version="0.2"> -+ <device> -+ <match key="info.product" contains="HID TOUCH HID Touch Panel"> -+ <match key="info.capabilities" contains="input.touchpad"> -+ <merge key="input.x11_driver" type="string">evtouch</merge> -+ <merge key="input.x11_options.reportingmode" type="string">raw</merge> -+ <merge key="input.x11_options.emulate3buttons" type="string">false</merge> -+ <merge key="input.x11_options.emulate3timeout" type="string">50</merge> -+ <merge key="input.x11_options.sendcoreevents" type="string">true</merge> -+ <merge key="input.x11_options.maxx" type="string">4095</merge> -+ <merge key="input.x11_options.maxy" type="string">4095</merge> -+ <merge key="input.x11_options.minx" type="string">21</merge> -+ <merge key="input.x11_options.miny" type="string">0</merge> -+ <merge key="input.x11_options.Rotate" type="string">false</merge> -+ <merge key="input.x11_options.Swapx" type="string">false</merge> -+ <merge key="input.x11_options.Swapy" type="string">false</merge> -+ <merge key="input.x11_options.taptimer" type="string">30</merge> -+ <merge key="input.x11_options.longtouchtimer" type="string">750</merge> -+ <merge key="input.x11_options.longtouched_action" type="string">click</merge> -+ <merge key="input.x11_options.longtouched_button" type="string">3</merge> -+ <merge key="input.x11_options.oneandhalftap_button" type="string">2</merge> -+ <merge key="input.x11_options.movelimit" type="string">10</merge> -+ <merge key="input.x11_options.touched_drag" type="string">1</merge> -+ <merge key="input.x11_options.maybetapped_action" type="string">click</merge> -+ <merge key="input.x11_options.maybetapped_button" type="string">1</merge> -+ </match> -+ </match> -+ </device> -+</deviceinfo> ---- xf86-input-evtouch-0.8.8.orig/debian/fdi/50-Fujitsu.fdi -+++ xf86-input-evtouch-0.8.8/debian/fdi/50-Fujitsu.fdi -@@ -0,0 +1,21 @@ -+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> -+ -+<deviceinfo version="0.2"> -+ -+ <device> -+ <match key="info.product" contains="Fujitsu Component USB Touch Panel"> -+ <match key="info.capabilities" contains="input"> -+ <merge key="input.x11_driver" type="string">evtouch</merge> -+ <merge key="input.x11_options.reportingmode" type="string">raw</merge> -+ <merge key="input.x11_options.emulate3buttons" type="string">true</merge> -+ <merge key="input.x11_options.emulate3timeout" type="string">50</merge> -+ <merge key="input.x11_options.sendcoreevents" type="string">on</merge> -+ <merge key="input.x11_options.minx" type="string">76</merge> -+ <merge key="input.x11_options.miny" type="string">104</merge> -+ <merge key="input.x11_options.maxx" type="string">957</merge> -+ <merge key="input.x11_options.maxy" type="string">976</merge> -+ </match> -+ </match> -+ </device> -+ -+</deviceinfo> ---- xf86-input-evtouch-0.8.8.orig/debian/fdi/50-Panasonic.fdi -+++ xf86-input-evtouch-0.8.8/debian/fdi/50-Panasonic.fdi -@@ -0,0 +1,21 @@ -+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> -+ -+<deviceinfo version="0.2"> -+ -+ <device> -+ <match key="info.product" contains="Fujitsu Takamisawa USB Touch Panel"> -+ <match key="info.capabilities" contains="input"> -+ <merge key="input.x11_driver" type="string">evtouch</merge> -+ <merge key="input.x11_options.reportingmode" type="string">raw</merge> -+ <merge key="input.x11_options.emulate3buttons" type="string">true</merge> -+ <merge key="input.x11_options.emulate3timeout" type="string">50</merge> -+ <merge key="input.x11_options.sendcoreevents" type="string">on</merge> -+ <merge key="input.x11_options.minx" type="string">76</merge> -+ <merge key="input.x11_options.miny" type="string">104</merge> -+ <merge key="input.x11_options.maxx" type="string">957</merge> -+ <merge key="input.x11_options.maxy" type="string">976</merge> -+ </match> -+ </match> -+ </device> -+ -+</deviceinfo> ---- xf86-input-evtouch-0.8.8.orig/debian/fdi/50-ideaco-idc6681.fdi -+++ xf86-input-evtouch-0.8.8/debian/fdi/50-ideaco-idc6681.fdi -@@ -0,0 +1,23 @@ -+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> -+ -+<deviceinfo version="0.2"> -+ <device> -+ <match key="info.product" contains="IDEACO"> -+ <match key="info.product" contains="IDC 6681"> -+ <match key="info.capabilities" contains="input.touchpad"> -+ <merge key="input.x11_driver" type="string">evtouch</merge> -+ <merge key="input.x11_options.reportingmode" type="string">raw</merge> -+ <merge key="input.x11_options.taptimer" type="string">50</merge> -+ <merge key="input.x11_options.longtouchtimer" type="string">30</merge> -+ <merge key="input.x11_options.movelimit" type="string">15</merge> -+ <merge key="input.x11_options.emulate3buttons" type="string">true</merge> -+ <merge key="input.x11_options.emulate3timeout" type="string">50</merge> -+ <merge key="input.x11_options.maxx" type="string">1100</merge> -+ <merge key="input.x11_options.maxy" type="string">1650</merge> -+ <merge key="input.x11_options.minx" type="string">7220</merge> -+ <merge key="input.x11_options.miny" type="string">6560</merge> -+ </match> -+ </match> -+ </match> -+ </device> -+</deviceinfo> ---- xf86-input-evtouch-0.8.8.orig/debian/fdi/50-touchkit.fdi -+++ xf86-input-evtouch-0.8.8/debian/fdi/50-touchkit.fdi -@@ -0,0 +1,23 @@ -+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> -+<deviceinfo version="0.2"> -+ <device> -+ <match key="info.product" contains="Touchkit Touch"> -+ <match key="info.capabilities" contains="input"> -+ <merge key="input.x11_driver" type="string">evtouch</merge> -+ <merge key="input.x11_options.minx" type="string">130</merge> -+ <merge key="input.x11_options.miny" type="string">197</merge> -+ <merge key="input.x11_options.maxx" type="string">3945</merge> -+ <merge key="input.x11_options.maxy" type="string">3894</merge> -+ <merge key="input.x11_options.taptimer" type="string">30</merge> -+ <merge key="input.x11_options.longtouchtimer" type="string">750</merge> -+ <merge key="input.x11_options.longtouched_action" type="string">click</merge> -+ <merge key="input.x11_options.longtouched_button" type="string">3</merge> -+ <merge key="input.x11_options.oneandhalftap_button" type="string">2</merge> -+ <merge key="input.x11_options.movelimit" type="string">10</merge> -+ <merge key="input.x11_options.touched_drag" type="string">1</merge> -+ <merge key="input.x11_options.maybetapped_action" type="string">click</merge> -+ <merge key="input.x11_options.maybetapped_button" type="string">1</merge> -+ </match> -+ </match> -+ </device> -+</deviceinfo> ---- xf86-input-evtouch-0.8.8.orig/debian/fdi/50-itm.fdi -+++ xf86-input-evtouch-0.8.8/debian/fdi/50-itm.fdi -@@ -0,0 +1,21 @@ -+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> -+ -+<deviceinfo version="0.2"> -+ <device> -+ <match key="info.product" contains="ITM Inc USB Touch Panel"> -+ <match key="info.capabilities" contains="input.touchpad"> -+ <merge key="input.x11_driver" type="string">evtouch</merge> -+ <merge key="input.x11_options.reportingmode" type="string">raw</merge> -+ <merge key="input.x11_options.emulate3buttons" type="string">true</merge> -+ <merge key="input.x11_options.emulate3timeout" type="string">50</merge> -+ <merge key="input.x11_options.sendcoreevents" type="string">on</merge> -+ <merge key="input.x11_options.maxx" type="string">3815</merge> -+ <merge key="input.x11_options.maxy" type="string">3948</merge> -+ <merge key="input.x11_options.minx" type="string">295</merge> -+ <merge key="input.x11_options.miny" type="string">200</merge> -+ <merge key="input.x11_options.Swapx" type="string">1</merge> -+ <merge key="input.x11_options.Rotate" type="string">CW</merge> -+ </match> -+ </match> -+ </device> -+</deviceinfo> ---- xf86-input-evtouch-0.8.8.orig/debian/xsfbs/xsfbs-autoreconf.mk -+++ xf86-input-evtouch-0.8.8/debian/xsfbs/xsfbs-autoreconf.mk -@@ -0,0 +1,150 @@ -+#!/usr/bin/make -f -+# $Id$ -+ -+# Automagical conversion of autoreconf results into quilt patches. -+ -+# Copyright 2006 Eugene Konev -+# -+# Licensed under the GNU General Public License, version 2. See the file -+# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>. -+ -+# The idea behind this is storing changes produced by autoreconf as a -+# separate patch on quilt stack (on top of stack actually). -+# The only usable target here is 'autoreconf`. Other targets are not -+# supposed to be called directly. DO NOT invoke them, unless you know what -+# you are doing. -+# The autoreconf target will check if files with names in $(RECONF_CHECKFILES) -+# were changed during patching (from upstream version or from previously -+# autoreconfed version) and call actual autoreconfing if they were. -+# The actual autoreconfing target (doautoreconf) WILL FAIL after -+# calling autoreconf and pushing changes into quilt stack by design. It -+# should never be invoked by automatic build process. -+# The proposed use is adding autoreconf into clean's prerequisites before -+# xsfclean like: -+# - clean: xsfclean -+# + clean: autoreconf xsfclean -+# This will ensure it is called when you build package with dpkg-buildpackage. -+ -+# This dir will be used for producing diff of autoreconfed tree -+RECONF_DIR := xsfautoreconf -+ -+# This files will be checked for changes -+RECONF_CHECKFILES += configure.ac Makefile.am -+ -+# This files will not be hardlinked but copied -+RECONF_NOLINKFILES += aclocal.m4 -+ -+# This files/dirs will be pruned after autoreconf run -+RECONF_PRUNEFILES += autom4te.cache config.h.in~ aclocal.m4~ -+ -+# Internal target. Never invoke directly. -+stampdir_target+=check.md5sum -+$(STAMP_DIR)/check.md5sum: -+ dh_testdir -+ $(MAKE) -f debian/rules prepare -+ for F in $(RECONF_CHECKFILES); do \ -+ find . -wholename ./$(STAMP_DIR) -prune -o -name $$F -print | \ -+ LC_ALL=C sort | xargs --no-run-if-empty md5sum >>$@; \ -+ done -+ -+# Internal target. Never invoke directly. -+$(STAMP_DIR)/clean.md5sum: -+ dh_testdir -+ $(MAKE) -f debian/rules unpatch -+ rm -f $(STAMP_DIR)/check.md5sum -+ $(MAKE) -f debian/rules $(STAMP_DIR)/check.md5sum -+ mv $(STAMP_DIR)/check.md5sum $@ -+ -+# Internal target. Never invoke directly. -+debian/patches/patched.md5sum: -+ dh_testdir -+ [ -f $(STAMP_DIR)/clean.md5sum ] || \ -+ $(MAKE) -f debian/rules $(STAMP_DIR)/clean.md5sum -+ -+ $(MAKE) -f debian/rules patch -+ rm -f $(STAMP_DIR)/check.md5sum -+ $(MAKE) -f debian/rules $(STAMP_DIR)/check.md5sum -+ if ! diff $(STAMP_DIR)/clean.md5sum \ -+ $(STAMP_DIR)/check.md5sum > /dev/null; then \ -+ $(MAKE) -f debian/rules doautoreconf; \ -+ else \ -+ mv $(STAMP_DIR)/check.md5sum $@; \ -+ fi -+ -+# Internal target. Never invoke directly. -+,PHONY: doautoreconf -+doautoreconf: patch -+ quilt push -a >>$(STAMP_DIR)/log/autoreconf 2>&1 || true -+ if quilt applied | grep ^autoreconf.diff$$ > /dev/null; then \ -+ quilt pop -a >>$(STAMP_DIR)/log/autoreconf 2>&1; \ -+ quilt rename -p autoreconf.diff autoreconf-old.diff \ -+ >>$(STAMP_DIR)/log/autoreconf 2>&1; \ -+ quilt delete autoreconf-old.diff >>$(STAMP_DIR)/log/autoreconf 2>&1; \ -+ quilt push -a >>$(STAMP_DIR)/log/autoreconf 2>&1; \ -+ fi -+ -+ if [ -e $(RECONF_DIR) ]; then \ -+ echo "ERROR: $(RECONF_DIR) already exists. Cleanup by hand"; \ -+ exit 1; \ -+ fi -+ -+ mkdir -p $(RECONF_DIR)/before -+ find . -maxdepth 1 -mindepth 1 ! -wholename ./$(RECONF_DIR) \ -+ -a ! -wholename ./debian -a ! -wholename ./patches \ -+ -a ! -wholename ./.pc -a ! -wholename ./$(STAMP_DIR) | \ -+ xargs -i{} cp -al {} $(RECONF_DIR)/before/ -+ -+ for F in $(RECONF_PRUNEFILES); do \ -+ find $(RECONF_DIR)/before -name $$F -print | \ -+ xargs --no-run-if-empty rm -r; \ -+ done -+ -+ cp -al $(RECONF_DIR)/before $(RECONF_DIR)/after -+ -+ for F in $(RECONF_NOLINKFILES); do \ -+ find . -wholename ./$(RECONF_DIR) -prune -o -wholename ./debian \ -+ -prune -o -wholename ./$(STAMP_DIR) -prune -o -name $$F \ -+ -print | \ -+ xargs --no-run-if-empty -i{} cp --remove-destination {} \ -+ $(RECONF_DIR)/after/{}; \ -+ done -+ -+ cd $(RECONF_DIR)/after && autoreconf -v --install && \ -+ for F in $(RECONF_PRUNEFILES); do \ -+ find . -name $$F -print | \ -+ xargs --no-run-if-empty rm -r; \ -+ done -+ -+ cd $(RECONF_DIR) && diff -Nru before after > autoreconf.diff || true -+ -+ quilt import $(RECONF_DIR)/autoreconf.diff \ -+ >>$(STAMP_DIR)/log/autoreconf 2>&1 -+ -+ mv $(STAMP_DIR)/check.md5sum debian/patches/patched.md5sum -+ -+ rm -r $(RECONF_DIR) && rm -f patches/autoreconf-old.diff -+ -+ @echo -+ @echo "****************************************************************" -+ @echo " This target is made to fail INTENTIONALLY. It should NEVER " -+ @echo " be invoked during automatic builds. " -+ @echo -+ @echo " This target was invoked because you added/removed/changed " -+ @echo " patches which modify either configure.ac or Makefile.am and, " -+ @echo " thus, require autoreconf run. And all autoreconfing should " -+ @echo " happen before uploading. " -+ @echo -+ @echo " (See also debian/xsfbs/xsfbs-autoreconf.mk) " -+ @echo -+ @echo " If you see this message, autoreconfing actually SUCCEEDED, " -+ @echo " and your build should finish successfully, when rerun. " -+ @echo "****************************************************************" -+ @echo -+ exit 1; -+ -+.PHONY: autoreconf -+autoreconf: debian/patches/patched.md5sum patch $(STAMP_DIR)/check.md5sum -+ if ! diff $(STAMP_DIR)/check.md5sum \ -+ debian/patches/patched.md5sum > /dev/null; then \ -+ $(MAKE) -f debian/rules doautoreconf; \ -+ fi ---- xf86-input-evtouch-0.8.8.orig/debian/xsfbs/xsfbs.mk -+++ xf86-input-evtouch-0.8.8/debian/xsfbs/xsfbs.mk -@@ -0,0 +1,312 @@ -+#!/usr/bin/make -f -+ -+# Debian X Strike Force Build System (XSFBS): Make portion -+ -+# Copyright 1996 Stephen Early -+# Copyright 1997 Mark Eichin -+# Copyright 1998-2005, 2007 Branden Robinson -+# Copyright 2005 David Nusinow -+# -+# Licensed under the GNU General Public License, version 2. See the file -+# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>. -+ -+# Originally by Stephen Early <sde1000@debian.org> -+# Modified by Mark W. Eichin <eichin@kitten.gen.ma.us> -+# Modified by Adam Heath <doogie@debian.org> -+# Modified by Branden Robinson <branden@debian.org> -+# Modified by Fabio Massimo Di Nitto <fabbione@fabbione.net> -+# Modified by David Nusinow <dnusinow@debian.org> -+# Acknowledgements to Manoj Srivastava. -+ -+# Pass $(DH_OPTIONS) into the environment for debhelper's benefit. -+export DH_OPTIONS -+ -+# force quilt to not use ~/.quiltrc -+QUILT = quilt --quiltrc /dev/null -+# force QUILT_PATCHES to the default in case it is exported in the environment -+QUILT_PATCHES = patches/ -+ -+# Set up parameters for the upstream build environment. -+ -+# Determine (source) package name from Debian changelog. -+SOURCE_NAME:=$(shell dpkg-parsechangelog -ldebian/changelog \ -+ | grep '^Source:' | awk '{print $$2}') -+ -+# Determine package version from Debian changelog. -+SOURCE_VERSION:=$(shell dpkg-parsechangelog -ldebian/changelog \ -+ | grep '^Version:' | awk '{print $$2}') -+ -+# Determine upstream version number. -+UPSTREAM_VERSION:=$(shell echo $(SOURCE_VERSION) | sed 's/-.*//') -+ -+# Determine the source version without the epoch for make-orig-tar-gz -+NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 's/^.://') -+ -+# Figure out who's building this package. -+BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2>/dev/null))}}) -+ -+# Find out if this is an official build; an official build has nothing but -+# digits, dots, and/or the strings "woody" or "sarge" in the Debian part of the -+# version number. Anything else indicates an unofficial build. -+OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi) -+ -+# Set up parameters for the Debian build environment. -+ -+# Determine our architecture. -+BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) -+# Work around some old-time dpkg braindamage. -+BUILD_ARCH:=$(subst i486,i386,$(BUILD_ARCH)) -+# The DEB_HOST_ARCH variable may be set per the Debian cross-compilation policy. -+ifdef DEB_HOST_ARCH -+ ARCH:=$(DEB_HOST_ARCH) -+else -+ # dpkg-cross sets the ARCH environment variable; if set, use it. -+ ifdef ARCH -+ ARCH:=$(ARCH) -+ else -+ ARCH:=$(BUILD_ARCH) -+ endif -+endif -+ -+# $(STAMP_DIR) houses stamp files for complex targets. -+STAMP_DIR:=stampdir -+ -+# $(SOURCE_DIR) houses one or more source trees. -+SOURCE_DIR:=build-tree -+ -+# $(SOURCE_TREE) is the location of the source tree to be compiled. If there -+# is more than one, others are found using this name plus a suffix to indicate -+# the purpose of the additional tree (e.g., $(SOURCE_TREE)-custom). The -+# "setup" target is responsible for creating such trees. -+#SOURCE_TREE:=$(SOURCE_DIR)/xc -+#FIXME We need to define this in our debian/rules file -+ -+# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place -+# their files. -+DEBTREEDIR:=$(CURDIR)/debian/tmp -+ -+# All "important" targets have four lines: -+# 1) A target name that is invoked by a package-building tool or the user. -+# This consists of a dependency on a "$(STAMP_DIR)/"-prefixed counterpart. -+# 2) A line delcaring 1) as a phony target (".PHONY:"). -+# 3) A "$(STAMP_DIR)/"-prefixed target which does the actual work, and may -+# depend on other targets. -+# 4) A line declaring 3) as a member of the $(stampdir_targets) variable; the -+# "$(STAMP_DIR)/" prefix is omitted. -+# -+# This indirection is needed so that the "stamp" files that signify when a rule -+# is done can be located in a separate "stampdir". Recall that make has no way -+# to know when a goal has been met for a phony target (like "build" or -+# "install"). -+# -+# At the end of each "$(STAMP_DIR)/" target, be sure to run the command ">$@" -+# so that the target will not be run again. Removing the file will make Make -+# run the target over. -+ -+# All phony targets should be declared as dependencies of .PHONY, even if they -+# do not have "($STAMP_DIR)/"-prefixed counterparts. -+ -+# Define a harmless default rule to keep things from going nuts by accident. -+.PHONY: default -+default: -+ -+# Set up the $(STAMP_DIR) directory. -+.PHONY: stampdir -+stampdir_targets+=stampdir -+stampdir: $(STAMP_DIR)/stampdir -+$(STAMP_DIR)/stampdir: -+ mkdir $(STAMP_DIR) -+ >$@ -+ -+# Set up the package build directory as quilt expects to find it. -+.PHONY: prepare -+stampdir_targets+=prepare -+prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/patches $(STAMP_DIR)/log -+$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir -+ if [ ! -e $(STAMP_DIR)/patches ]; then \ -+ mkdir $(STAMP_DIR)/patches; \ -+ ln -s $(STAMP_DIR)/patches .pc; \ -+ echo 2 >$(STAMP_DIR)/patches/.version; \ -+ fi; \ -+ if [ ! -e $(STAMP_DIR)/log ]; then \ -+ mkdir $(STAMP_DIR)/log; \ -+ fi; \ -+ if [ -e debian/patches ] && [ ! -e patches ]; then \ -+ ln -s debian/patches patches; \ -+ fi; \ -+ >$@ -+ -+# Apply all patches to the upstream source. -+.PHONY: patch -+stampdir_targets+=patch -+patch: $(STAMP_DIR)/patch -+$(STAMP_DIR)/patch: $(STAMP_DIR)/prepare -+ if ! [ `which quilt` ]; then \ -+ echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \ -+ exit 1; \ -+ fi; \ -+ if $(QUILT) next >/dev/null 2>&1; then \ -+ echo -n "Applying patches..."; \ -+ if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \ -+ cat $(STAMP_DIR)/log/patch; \ -+ echo "successful."; \ -+ else \ -+ cat $(STAMP_DIR)/log/patch; \ -+ echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \ -+ exit 1; \ -+ fi; \ -+ else \ -+ echo "No patches to apply"; \ -+ fi; \ -+ >$@ -+ -+# Revert all patches to the upstream source. -+.PHONY: unpatch -+unpatch: -+ rm -f $(STAMP_DIR)/patch -+ @echo -n "Unapplying patches..."; \ -+ if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \ -+ if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \ -+ cat $(STAMP_DIR)/log/unpatch; \ -+ echo "successful."; \ -+ else \ -+ cat $(STAMP_DIR)/log/unpatch; \ -+ echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \ -+ exit 1; \ -+ fi; \ -+ else \ -+ echo "nothing to do."; \ -+ fi -+ -+# Clean the generated maintainer scripts. -+.PHONY: cleanscripts -+cleanscripts: -+ rm -f $(STAMP_DIR)/genscripts -+ rm -f debian/*.config \ -+ debian/*.postinst \ -+ debian/*.postrm \ -+ debian/*.preinst \ -+ debian/*.prerm -+ -+# Clean the package build tree. -+.PHONY: xsfclean -+xsfclean: cleanscripts unpatch -+ dh_testdir -+ rm -f .pc patches -+ rm -rf $(STAMP_DIR) $(SOURCE_DIR) -+ rm -rf imports -+ dh_clean debian/shlibs.local \ -+ debian/po/pothead -+ -+# Generate the debconf templates POT file header. -+debian/po/pothead: debian/po/pothead.in -+ sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \ -+ -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@ -+ -+# Update POT and PO files. -+.PHONY: updatepo -+updatepo: debian/po/pothead -+ debian/scripts/debconf-updatepo --pot-header=pothead --verbose -+ -+# Remove files from the upstream source tree that we don't need, or which have -+# licensing problems. It must be run before creating the .orig.tar.gz. -+# -+# Note: This rule is for Debian package maintainers' convenience, and is not -+# needed for conventional build scenarios. -+.PHONY: prune-upstream-tree -+prune-upstream-tree: -+ # Ensure we're in the correct directory. -+ dh_testdir -+ grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf -+ -+# Verify that there are no offsets or fuzz in the patches we apply. -+# -+# Note: This rule is for Debian package maintainers' convenience, and is not -+# needed for conventional build scenarios. -+.PHONY: patch-audit -+patch-audit: prepare unpatch -+ @echo -n "Auditing patches..."; \ -+ >$(STAMP_DIR)/log/patch; \ -+ FUZZY=; \ -+ while [ -n "$$($(QUILT) next)" ]; do \ -+ RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\ -+ case "$$RESULT" in \ -+ succeeded) \ -+ echo "fuzzy patch: $$($(QUILT) top)" \ -+ | tee -a $(STAMP_DIR)/log/$$($(QUILT) top); \ -+ FUZZY=yes; \ -+ ;; \ -+ FAILED) \ -+ echo "broken patch: $$($(QUILT) next)" \ -+ | tee -a $(STAMP_DIR)/log/$$($(QUILT) next); \ -+ exit 1; \ -+ ;; \ -+ esac; \ -+ done; \ -+ if [ -n "$$FUZZY" ]; then \ -+ echo "there were fuzzy patches; please fix."; \ -+ exit 1; \ -+ else \ -+ echo "done."; \ -+ fi -+ -+# Generate the maintainer scripts. -+.PHONY: genscripts -+stampdir_targets+=genscripts -+genscripts: $(STAMP_DIR)/genscripts -+$(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir -+ for FILE in debian/*.config.in \ -+ debian/*.postinst.in \ -+ debian/*.postrm.in \ -+ debian/*.preinst.in \ -+ debian/*.prerm.in; do \ -+ if [ -e "$$FILE" ]; then \ -+ MAINTSCRIPT=$$(echo $$FILE | sed 's/.in$$//'); \ -+ sed -n '1,/^#INCLUDE_SHELL_LIB#$$/p' <$$FILE \ -+ | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >$$MAINTSCRIPT.tmp; \ -+ cat debian/xsfbs/xsfbs.sh >>$$MAINTSCRIPT.tmp; \ -+ sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' <$$FILE \ -+ | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \ -+ sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \ -+ -e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \ -+ -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \ -+ <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \ -+ rm $$MAINTSCRIPT.tmp; \ -+ fi; \ -+ done -+ # Validate syntax of generated shell scripts. -+ #sh debian/scripts/validate-posix-sh debian/*.config \ -+ # debian/*.postinst \ -+ # debian/*.postrm \ -+ # debian/*.preinst \ -+ # debian/*.prerm -+ >$@ -+ -+# Generate the shlibs.local file. -+debian/shlibs.local: -+ cat debian/*.shlibs >$@ -+ -+SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) -+VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) -+INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -+SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) -+VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) -+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) -+ifeq ($(PACKAGE),) -+PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) -+endif -+ -+.PHONY: serverabi -+serverabi: -+ifeq ($(SERVERMINVERS),) -+ @echo error: xserver-xorg-dev needs to be installed -+ @exit 1 -+else -+ echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars -+ echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars -+ echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars -+endif -+ -+include debian/xsfbs/xsfbs-autoreconf.mk -+ -+# vim:set noet ai sts=8 sw=8 tw=0: ---- xf86-input-evtouch-0.8.8.orig/debian/xsfbs/xsfbs.sh -+++ xf86-input-evtouch-0.8.8/debian/xsfbs/xsfbs.sh -@@ -0,0 +1,900 @@ -+# $Id$ -+ -+# This is the X Strike Force shell library for X Window System package -+# maintainer scripts. It serves to define shell functions commonly used by -+# such packages, and performs some error checking necessary for proper operation -+# of those functions. By itself, it does not "do" much; the maintainer scripts -+# invoke the functions defined here to accomplish package installation and -+# removal tasks. -+ -+# If you are reading this within a Debian package maintainer script (e.g., -+# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can -+# skip past this library by scanning forward in this file to the string -+# "GOBSTOPPER". -+ -+SOURCE_VERSION=@SOURCE_VERSION@ -+OFFICIAL_BUILD=@OFFICIAL_BUILD@ -+ -+# Use special abnormal exit codes so that problems with this library are more -+# easily tracked down. -+SHELL_LIB_INTERNAL_ERROR=86 -+SHELL_LIB_THROWN_ERROR=74 -+SHELL_LIB_USAGE_ERROR=99 -+ -+# old -> new variable names -+if [ -z "$DEBUG_XORG_PACKAGE" ] && [ -n "$DEBUG_XFREE86_PACKAGE" ]; then -+ DEBUG_XORG_PACKAGE="$DEBUG_XFREE86_PACKAGE" -+fi -+if [ -z "$DEBUG_XORG_DEBCONF" ] && [ -n "$DEBUG_XFREE86_DEBCONF" ]; then -+ DEBUG_XORG_DEBCONF="$DEBUG_XFREE86_DEBCONF" -+fi -+ -+# initial sanity checks -+if [ -z "$THIS_PACKAGE" ]; then -+ cat >&2 <<EOF -+Error: package maintainer script attempted to use shell library without -+definining \$THIS_PACKAGE shell variable. Please report the package name, -+version, and the text of this error message to the Debian Bug Tracking System. -+Visit <http://www.debian.org/Bugs/Reporting> on the World Wide Web for -+instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the -+"doc-debian" package, or install the "reportbug" package and use the command of -+the same name to file a report against version $SOURCE_VERSION of this package. -+EOF -+ exit $SHELL_LIB_USAGE_ERROR -+fi -+ -+if [ -z "$THIS_SCRIPT" ]; then -+ cat >&2 <<EOF -+Error: package maintainer script attempted to use shell library without -+definining \$THIS_SCRIPT shell variable. Please report the package name, -+version, and the text of this error message to the Debian Bug Tracking System. -+Visit <http://www.debian.org/Bugs/Reporting> on the World Wide Web for -+instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the -+"doc-debian" package, or install the "reportbug" package and use the command of -+the same name to file a report against version $SOURCE_VERSION of the -+"$THIS_PACKAGE" package. -+EOF -+ exit $SHELL_LIB_USAGE_ERROR -+fi -+ -+ARCHITECTURE="$(dpkg --print-installation-architecture)" -+ -+if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then -+ RECONFIGURE="true" -+else -+ RECONFIGURE= -+fi -+ -+if ([ "$1" = "install" ] || [ "$1" = "configure" ]) && [ -z "$2" ]; then -+ FIRSTINST="yes" -+fi -+ -+if [ -z "$RECONFIGURE" ] && [ -z "$FIRSTINST" ]; then -+ UPGRADE="yes" -+fi -+ -+trap "message;\ -+ message \"Received signal. Aborting $THIS_PACKAGE package $THIS_SCRIPT script.\";\ -+ message;\ -+ exit 1" HUP INT QUIT TERM -+ -+reject_nondigits () { -+ # syntax: reject_nondigits [ operand ... ] -+ # -+ # scan operands (typically shell variables whose values cannot be trusted) for -+ # characters other than decimal digits and barf if any are found -+ while [ -n "$1" ]; do -+ # does the operand contain anything but digits? -+ if ! expr "$1" : "[[:digit:]]\+$" > /dev/null 2>&1; then -+ # can't use die(), because it wraps message() which wraps this function -+ echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_nondigits() encountered" \ -+ "possibly malicious garbage \"$1\"" >&2 -+ exit $SHELL_LIB_THROWN_ERROR -+ fi -+ shift -+ done -+} -+ -+reject_whitespace () { -+ # syntax: reject_whitespace [ operand ] -+ # -+ # scan operand (typically a shell variable whose value cannot be trusted) for -+ # whitespace characters and barf if any are found -+ if [ -n "$1" ]; then -+ # does the operand contain any whitespace? -+ if expr "$1" : "[[:space:]]" > /dev/null 2>&1; then -+ # can't use die(), because I want to avoid forward references -+ echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered" \ -+ "possibly malicious garbage \"$1\"" >&2 -+ exit $SHELL_LIB_THROWN_ERROR -+ fi -+ fi -+} -+ -+reject_unlikely_path_chars () { -+ # syntax: reject_unlikely_path_chars [ operand ... ] -+ # -+ # scan operands (typically shell variables whose values cannot be trusted) for -+ # characters unlikely to be seen in a path and which the shell might -+ # interpret and barf if any are found -+ while [ -n "$1" ]; do -+ # does the operand contain any funny characters? -+ if expr "$1" : '.*[!$&()*;<>?|].*' > /dev/null 2>&1; then -+ # can't use die(), because I want to avoid forward references -+ echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_unlikely_path_chars()" \ -+ "encountered possibly malicious garbage \"$1\"" >&2 -+ exit $SHELL_LIB_THROWN_ERROR -+ fi -+ shift -+ done -+} -+ -+# Query the terminal to establish a default number of columns to use for -+# displaying messages to the user. This is used only as a fallback in the -+# event the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while -+# the script is running, and this cannot, only being calculated once.) -+DEFCOLUMNS=$(stty size 2> /dev/null | awk '{print $2}') || true -+if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" > /dev/null 2>&1; then -+ DEFCOLUMNS=80 -+fi -+ -+message () { -+ # pretty-print messages of arbitrary length -+ reject_nondigits "$COLUMNS" -+ echo "$*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} >&2 -+} -+ -+observe () { -+ # syntax: observe message ... -+ # -+ # issue observational message suitable for logging someday when support for -+ # it exists in dpkg -+ if [ -n "$DEBUG_XORG_PACKAGE" ]; then -+ message "$THIS_PACKAGE $THIS_SCRIPT note: $*" -+ fi -+} -+ -+warn () { -+ # syntax: warn message ... -+ # -+ # issue warning message suitable for logging someday when support for -+ # it exists in dpkg; also send to standard error -+ message "$THIS_PACKAGE $THIS_SCRIPT warning: $*" -+} -+ -+die () { -+ # syntax: die message ... -+ # -+ # exit script with error message -+ message "$THIS_PACKAGE $THIS_SCRIPT error: $*" -+ exit $SHELL_LIB_THROWN_ERROR -+} -+ -+internal_error () { -+ # exit script with error; essentially a "THIS SHOULD NEVER HAPPEN" message -+ message "internal error: $*" -+ if [ -n "$OFFICIAL_BUILD" ]; then -+ message "Please report a bug in the $THIS_SCRIPT script of the" \ -+ "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ -+ "Tracking System. Include all messages above that mention the" \ -+ "$THIS_PACKAGE package. Visit " \ -+ "<http://www.debian.org/Bugs/Reporting> on the World Wide Web for" \ -+ "instructions, read the file" \ -+ "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ -+ "package, or install the reportbug package and use the command of" \ -+ "the same name to file a report." -+ fi -+ exit $SHELL_LIB_INTERNAL_ERROR -+} -+ -+usage_error () { -+ message "usage error: $*" -+ message "Please report a bug in the $THIS_SCRIPT script of the" \ -+ "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ -+ "Tracking System. Include all messages above that mention the" \ -+ "$THIS_PACKAGE package. Visit " \ -+ "<http://www.debian.org/Bugs/Reporting> on the World Wide Web for" \ -+ "instructions, read the file" \ -+ "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ -+ "package, or install the reportbug package and use the command of" \ -+ "the same name to file a report." -+ exit $SHELL_LIB_USAGE_ERROR -+} -+ -+ -+maplink () { -+ # returns what symlink should point to; i.e., what the "sane" answer is -+ # Keep this in sync with the debian/*.links files. -+ # This is only needed for symlinks to directories. -+ # -+ # XXX: Most of these look wrong in the X11R7 world and need to be fixed. -+ # If we've stopped using this function, fixing it might enable us to re-enable -+ # it again and catch more errors. -+ case "$1" in -+ /etc/X11/xkb/compiled) echo /var/lib/xkb ;; -+ /etc/X11/xkb/xkbcomp) echo /usr/X11R6/bin/xkbcomp ;; -+ /usr/X11R6/lib/X11/app-defaults) echo /etc/X11/app-defaults ;; -+ /usr/X11R6/lib/X11/fs) echo /etc/X11/fs ;; -+ /usr/X11R6/lib/X11/lbxproxy) echo /etc/X11/lbxproxy ;; -+ /usr/X11R6/lib/X11/proxymngr) echo /etc/X11/proxymngr ;; -+ /usr/X11R6/lib/X11/rstart) echo /etc/X11/rstart ;; -+ /usr/X11R6/lib/X11/twm) echo /etc/X11/twm ;; -+ /usr/X11R6/lib/X11/xdm) echo /etc/X11/xdm ;; -+ /usr/X11R6/lib/X11/xinit) echo /etc/X11/xinit ;; -+ /usr/X11R6/lib/X11/xkb) echo /etc/X11/xkb ;; -+ /usr/X11R6/lib/X11/xserver) echo /etc/X11/xserver ;; -+ /usr/X11R6/lib/X11/xsm) echo /etc/X11/xsm ;; -+ /usr/bin/X11) echo ../X11R6/bin ;; -+ /usr/bin/rstartd) echo ../X11R6/bin/rstartd ;; -+ /usr/include/X11) echo ../X11R6/include/X11 ;; -+ /usr/lib/X11) echo ../X11R6/lib/X11 ;; -+ *) internal_error "maplink() called with unknown path \"$1\"" ;; -+ esac -+} -+ -+analyze_path () { -+ # given a supplied set of pathnames, break each one up by directory and do an -+ # ls -dl on each component, cumulatively; i.e. -+ # analyze_path /usr/X11R6/bin -> ls -dl /usr /usr/X11R6 /usr/X11R6/bin -+ # Thanks to Randolph Chung for this clever hack. -+ -+ #local f g -+ -+ while [ -n "$1" ]; do -+ reject_whitespace "$1" -+ _g= -+ message "Analyzing $1:" -+ for _f in $(echo "$1" | tr / \ ); do -+ if [ -e /$_g$_f ]; then -+ ls -dl /$_g$_f /$_g$_f.dpkg-* 2> /dev/null || true -+ _g=$_g$_f/ -+ else -+ message "/$_g$_f: nonexistent; directory contents of /$_g:" -+ ls -l /$_g -+ break -+ fi -+ done -+ shift -+ done -+} -+ -+find_culprits () { -+ #local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \ -+ # msg -+ -+ reject_whitespace "$1" -+ message "Searching for overlapping packages..." -+ _dpkg_info_dir=/var/lib/dpkg/info -+ if [ -d $_dpkg_info_dir ]; then -+ if [ "$(echo $_dpkg_info_dir/*.list)" != "$_dpkg_info_dir/*.list" ]; then -+ _possible_culprits=$(ls -1 $_dpkg_info_dir/*.list | egrep -v \ -+ "(xbase-clients|x11-common|xfs|xlibs)") -+ if [ -n "$_possible_culprits" ]; then -+ _smoking_guns=$(grep -l "$1" $_possible_culprits || true) -+ if [ -n "$_smoking_guns" ]; then -+ _bad_packages=$(printf "\\n") -+ for f in $_smoking_guns; do -+ # too bad you can't nest parameter expansion voodoo -+ p=${f%*.list} # strip off the trailing ".list" -+ _package=${p##*/} # strip off the directories -+ _bad_packages=$(printf "%s\n%s" "$_bad_packages" "$_package") -+ done -+ _msg=$(cat <<EOF -+The following packages appear to have file overlaps with the X.Org packages; -+these packages are either very old, or in violation of Debian Policy. Try -+upgrading each of these packages to the latest available version if possible: -+for example, with the command "apt-get install". If no newer version of a -+package is available, you will have to remove it; for example, with the command -+"apt-get remove". If even the latest available version of the package has -+this file overlap, please file a bug against that package with the Debian Bug -+Tracking System. You may want to refer the package maintainer to section 12.8 -+of the Debian Policy manual. -+EOF -+) -+ message "$_msg" -+ message "The overlapping packages are: $_bad_packages" -+ else -+ message "no overlaps found." -+ fi -+ fi -+ else -+ message "cannot search; no matches for $_dpkg_info_dir/*.list." -+ fi -+ else -+ message "cannot search; $_dpkg_info_dir does not exist." -+ fi -+} -+ -+# we require a readlink command or shell function -+if ! which readlink > /dev/null 2>&1; then -+ message "The readlink command was not found. Please install version" \ -+ "1.13.1 or later of the debianutils package." -+ readlink () { -+ # returns what symlink in $1 actually points to -+ perl -e '$l = shift; exit 1 unless -l $l; $r = readlink $l; exit 1 unless $r; print "$r\n"' "$1" -+ } -+fi -+ -+check_symlink () { -+ # syntax: check_symlink symlink -+ # -+ # See if specified symlink points where it is supposed to. Return 0 if it -+ # does, and 1 if it does not. -+ # -+ # Primarily used by check_symlinks_and_warn() and check_symlinks_and_bomb(). -+ -+ #local symlink -+ -+ # validate arguments -+ if [ $# -ne 1 ]; then -+ usage_error "check_symlink() called with wrong number of arguments;" \ -+ "expected 1, got $#" -+ exit $SHELL_LIB_USAGE_ERROR -+ fi -+ -+ _symlink="$1" -+ -+ if [ "$(maplink "$_symlink")" = "$(readlink "$_symlink")" ]; then -+ return 0 -+ else -+ return 1 -+ fi -+} -+ -+check_symlinks_and_warn () { -+ # syntax: check_symlinks_and_warn symlink ... -+ # -+ # For each argument, check for symlink sanity, and warn if it isn't sane. -+ # -+ # Call this function from a preinst script in the event $1 is "upgrade" or -+ # "install". -+ -+ #local errmsg symlink -+ -+ # validate arguments -+ if [ $# -lt 1 ]; then -+ usage_error "check_symlinks_and_warn() called with wrong number of" \ -+ "arguments; expected at least 1, got $#" -+ exit $SHELL_LIB_USAGE_ERROR -+ fi -+ -+ while [ -n "$1" ]; do -+ _symlink="$1" -+ if [ -L "$_symlink" ]; then -+ if ! check_symlink "$_symlink"; then -+ observe "$_symlink symbolic link points to wrong location" \ -+ "$(readlink "$_symlink"); removing" -+ rm "$_symlink" -+ fi -+ elif [ -e "$_symlink" ]; then -+ _errmsg="$_symlink exists and is not a symbolic link; this package cannot" -+ _errmsg="$_errmsg be installed until this" -+ if [ -f "$_symlink" ]; then -+ _errmsg="$_errmsg file" -+ elif [ -d "$_symlink" ]; then -+ _errmsg="$_errmsg directory" -+ else -+ _errmsg="$_errmsg thing" -+ fi -+ _errmsg="$_errmsg is removed" -+ die "$_errmsg" -+ fi -+ shift -+ done -+} -+ -+check_symlinks_and_bomb () { -+ # syntax: check_symlinks_and_bomb symlink ... -+ # -+ # For each argument, check for symlink sanity, and bomb if it isn't sane. -+ # -+ # Call this function from a postinst script. -+ -+ #local problem symlink -+ -+ # validate arguments -+ if [ $# -lt 1 ]; then -+ usage_error "check_symlinks_and_bomb() called with wrong number of" -+ "arguments; expected at least 1, got $#" -+ exit $SHELL_LIB_USAGE_ERROR -+ fi -+ -+ while [ -n "$1" ]; do -+ _problem= -+ _symlink="$1" -+ if [ -L "$_symlink" ]; then -+ if ! check_symlink "$_symlink"; then -+ _problem=yes -+ warn "$_symlink symbolic link points to wrong location" \ -+ "$(readlink "$_symlink")" -+ fi -+ elif [ -e "$_symlink" ]; then -+ _problem=yes -+ warn "$_symlink is not a symbolic link" -+ else -+ _problem=yes -+ warn "$_symlink symbolic link does not exist" -+ fi -+ if [ -n "$_problem" ]; then -+ analyze_path "$_symlink" "$(readlink "$_symlink")" -+ find_culprits "$_symlink" -+ die "bad symbolic links on system" -+ fi -+ shift -+ done -+} -+ -+font_update () { -+ # run $UPDATECMDS in $FONTDIRS -+ -+ #local dir cmd shortcmd x_font_dir_prefix -+ -+ _x_font_dir_prefix="/usr/share/fonts/X11" -+ -+ if [ -z "$UPDATECMDS" ]; then -+ usage_error "font_update() called but \$UPDATECMDS not set" -+ fi -+ if [ -z "$FONTDIRS" ]; then -+ usage_error "font_update() called but \$FONTDIRS not set" -+ fi -+ -+ reject_unlikely_path_chars "$UPDATECMDS" -+ reject_unlikely_path_chars "$FONTDIRS" -+ -+ for _dir in $FONTDIRS; do -+ if [ -d "$_x_font_dir_prefix/$_dir" ]; then -+ for _cmd in $UPDATECMDS; do -+ if which "$_cmd" > /dev/null 2>&1; then -+ _shortcmd=${_cmd##*/} -+ observe "running $_shortcmd in $_dir font directory" -+ _cmd_opts= -+ if [ "$_shortcmd" = "update-fonts-alias" ]; then -+ _cmd_opts=--x11r7-layout -+ fi -+ if [ "$_shortcmd" = "update-fonts-dir" ]; then -+ _cmd_opts=--x11r7-layout -+ fi -+ if [ "$_shortcmd" = "update-fonts-scale" ]; then -+ _cmd_opts=--x11r7-layout -+ fi -+ $_cmd $_cmd_opts $_dir || warn "$_cmd $_cmd_opts $_dir" \ -+ "failed; font directory data may not" \ -+ "be up to date" -+ else -+ warn "$_cmd not found; not updating corresponding $_dir font" \ -+ "directory data" -+ fi -+ done -+ else -+ warn "$_dir is not a directory; not updating font directory data" -+ fi -+ done -+} -+ -+remove_conffile_prepare () { -+ # syntax: remove_conffile_prepare filename official_md5sum ... -+ # -+ # Check a conffile "filename" against a list of canonical MD5 checksums. -+ # If the file's current MD5 checksum matches one of the "official_md5sum" -+ # operands provided, then prepare the conffile for removal from the system. -+ # We defer actual deletion until the package is configured so that we can -+ # roll this operation back if package installation fails. -+ # -+ # Call this function from a preinst script in the event $1 is "upgrade" or -+ # "install" and verify $2 to ensure the package is being upgraded from a -+ # version (or installed over a version removed-but-not-purged) prior to the -+ # one in which the conffile was obsoleted. -+ -+ #local conffile current_checksum -+ -+ # validate arguments -+ if [ $# -lt 2 ]; then -+ usage_error "remove_conffile_prepare() called with wrong number of" \ -+ "arguments; expected at least 2, got $#" -+ exit $SHELL_LIB_USAGE_ERROR -+ fi -+ -+ _conffile="$1" -+ shift -+ -+ # does the _conffile even exist? -+ if [ -e "$_conffile" ]; then -+ # calculate its checksum -+ _current_checksum=$(md5sum < "$_conffile" | sed 's/[[:space:]].*//') -+ # compare it to each supplied checksum -+ while [ -n "$1" ]; do -+ if [ "$_current_checksum" = "$1" ]; then -+ # we found a match; move the confffile and stop looking -+ observe "preparing obsolete conffile $_conffile for removal" -+ mv "$_conffile" "$_conffile.$THIS_PACKAGE-tmp" -+ break -+ fi -+ shift -+ done -+ fi -+} -+ -+remove_conffile_commit () { -+ # syntax: remove_conffile_commit filename -+ # -+ # Complete the removal of a conffile "filename" that has become obsolete. -+ # -+ # Call this function from a postinst script after having used -+ # remove_conffile_prepare() in the preinst. -+ -+ #local conffile -+ -+ # validate arguments -+ if [ $# -ne 1 ]; then -+ usage_error "remove_conffile_commit() called with wrong number of" \ -+ "arguments; expected 1, got $#" -+ exit $SHELL_LIB_USAGE_ERROR -+ fi -+ -+ _conffile="$1" -+ -+ # if the temporary file created by remove_conffile_prepare() exists, remove it -+ if [ -e "$_conffile.$THIS_PACKAGE-tmp" ]; then -+ observe "committing removal of obsolete conffile $_conffile" -+ rm "$_conffile.$THIS_PACKAGE-tmp" -+ fi -+} -+ -+remove_conffile_rollback () { -+ # syntax: remove_conffile_rollback filename -+ # -+ # Roll back the removal of a conffile "filename". -+ # -+ # Call this function from a postrm script in the event $1 is "abort-upgrade" -+ # or "abort-install" is after having used remove_conffile_prepare() in the -+ # preinst. -+ -+ #local conffile -+ -+ # validate arguments -+ if [ $# -ne 1 ]; then -+ usage_error "remove_conffile_rollback() called with wrong number of" \ -+ "arguments; expected 1, got $#" -+ exit $SHELL_LIB_USAGE_ERROR -+ fi -+ -+ _conffile="$1" -+ -+ # if the temporary file created by remove_conffile_prepare() exists, move it -+ # back -+ if [ -e "$_conffile.$THIS_PACKAGE-tmp" ]; then -+ observe "rolling back removal of obsolete conffile $_conffile" -+ mv "$_conffile.$THIS_PACKAGE-tmp" "$_conffile" -+ fi -+} -+ -+replace_conffile_with_symlink_prepare () { -+ # syntax: replace_conffile_with_symlink_prepare oldfilename newfilename \ -+ # official_md5sum ... -+ # -+ # Check a conffile "oldfilename" against a list of canonical MD5 checksums. -+ # If the file's current MD5 checksum matches one of the "official_md5sum" -+ # operands provided, then prepare the conffile for removal from the system. -+ # We defer actual deletion until the package is configured so that we can -+ # roll this operation back if package installation fails. Otherwise copy it -+ # to newfilename and let dpkg handle it through conffiles mechanism. -+ # -+ # Call this function from a preinst script in the event $1 is "upgrade" or -+ # "install" and verify $2 to ensure the package is being upgraded from a -+ # version (or installed over a version removed-but-not-purged) prior to the -+ # one in which the conffile was obsoleted. -+ -+ #local conffile current_checksum -+ -+ # validate arguments -+ if [ $# -lt 3 ]; then -+ usage_error "replace_conffile_with_symlink_prepare() called with wrong" \ -+ " number of arguments; expected at least 3, got $#" -+ exit $SHELL_LIB_USAGE_ERROR -+ fi -+ -+ _oldconffile="$1" -+ shift -+ _newconffile="$1" -+ shift -+ -+ remove_conffile_prepare "$_oldconffile" "$@" -+ # If $_oldconffile still exists, then md5sums didn't match. -+ # Copy it to new one. -+ if [ -f "$_oldconffile" ]; then -+ cp "$_oldconffile" "$_newconffile" -+ fi -+ -+} -+ -+replace_conffile_with_symlink_commit () { -+ # syntax: replace_conffile_with_symlink_commit oldfilename -+ # -+ # Complete the removal of a conffile "oldfilename" that has been -+ # replaced by a symlink. -+ # -+ # Call this function from a postinst script after having used -+ # replace_conffile_with_symlink_prepare() in the preinst. -+ -+ #local conffile -+ -+ # validate arguments -+ if [ $# -ne 1 ]; then -+ usage_error "replace_conffile_with_symlink_commit() called with wrong" \ -+ "number of arguments; expected 1, got $#" -+ exit $SHELL_LIB_USAGE_ERROR -+ fi -+ -+ _conffile="$1" -+ -+ remove_conffile_commit "$_conffile" -+} -+ -+replace_conffile_with_symlink_rollback () { -+ # syntax: replace_conffile_with_symlink_rollback oldfilename newfilename -+ # -+ # Roll back the replacing of a conffile "oldfilename" with symlink to -+ # "newfilename". -+ # -+ # Call this function from a postrm script in the event $1 is "abort-upgrade" -+ # or "abort-install" and verify $2 to ensure the package failed to upgrade -+ # from a version (or install over a version removed-but-not-purged) prior -+ # to the one in which the conffile was obsoleted. -+ # You should have used replace_conffile_with_symlink_prepare() in the -+ # preinst. -+ -+ #local conffile -+ -+ # validate arguments -+ if [ $# -ne 2 ]; then -+ usage_error "replace_conffile_with_symlink_rollback() called with wrong" \ -+ "number of arguments; expected 2, got $#" -+ exit $SHELL_LIB_USAGE_ERROR -+ fi -+ -+ _oldconffile="$1" -+ _newconffile="$2" -+ -+ remove_conffile_rollback "$_oldconffile" -+ if [ -f "$_newconffile" ]; then -+ rm "$_newconffile" -+ fi -+} -+ -+run () { -+ # syntax: run command [ argument ... ] -+ # -+ # Run specified command with optional arguments and report its exit status. -+ # Useful for commands whose exit status may be nonzero, but still acceptable, -+ # or commands whose failure is not fatal to us. -+ # -+ # NOTE: Do *not* use this function with db_get or db_metaget commands; in -+ # those cases the return value of the debconf command *must* be checked -+ # before the string returned by debconf is used for anything. -+ -+ #local retval -+ -+ # validate arguments -+ if [ $# -lt 1 ]; then -+ usage_error "run() called with wrong number of arguments; expected at" \ -+ "least 1, got $#" -+ exit $SHELL_LIB_USAGE_ERROR -+ fi -+ -+ "$@" || _retval=$? -+ -+ if [ ${_retval:-0} -ne 0 ]; then -+ observe "command \"$*\" exited with status $_retval" -+ fi -+} -+ -+register_x_lib_dir_with_ld_so () { -+ # syntax: register_x_lib_dir_with_ld_so -+ # -+ # Configure the dynamic loader ld.so to search /usr/X11R6/lib for shared -+ # libraries. -+ # -+ # Call this function from the postinst script of a package that places a -+ # shared library in /usr/X11R6/lib, before invoking ldconfig. -+ -+ #local dir ldsoconf -+ -+ _dir="/usr/X11R6/lib" -+ _ldsoconf="/etc/ld.so.conf" -+ -+ # is the line not already present? -+ if ! fgrep -qsx "$_dir" "$_ldsoconf"; then -+ observe "adding $_dir directory to $_ldsoconf" -+ echo "$_dir" >> "$_ldsoconf" -+ fi -+} -+ -+deregister_x_lib_dir_with_ld_so () { -+ # syntax: deregister_x_lib_dir_with_ld_so -+ # -+ # Configure dynamic loader ld.so to not search /usr/X11R6/lib for shared -+ # libraries, if and only if no shared libaries remain there. -+ # -+ # Call this function from the postrm script of a package that places a shared -+ # library in /usr/X11R6/lib, in the event "$1" is "remove", and before -+ # invoking ldconfig. -+ -+ #local dir ldsoconf fgrep_status cmp_status -+ -+ _dir="/usr/X11R6/lib" -+ _ldsoconf="/etc/ld.so.conf" -+ -+ # is the line present? -+ if fgrep -qsx "$_dir" "$_ldsoconf"; then -+ # are there any shared objects in the directory? -+ if [ "$(echo "$_dir"/lib*.so.*.*)" = "$_dir/lib*.so.*.*" ]; then -+ # glob expansion produced nothing, so no shared libraries are present -+ observe "removing $_dir directory from $_ldsoconf" -+ # rewrite the file (very carefully) -+ set +e -+ fgrep -svx "$_dir" "$_ldsoconf" > "$_ldsoconf.dpkg-tmp" -+ _fgrep_status=$? -+ set -e -+ case $_fgrep_status in -+ 0|1) ;; # we don't actually care if any lines matched or not -+ *) die "error reading \"$_ldsoconf\"; fgrep exited with status" \ -+ "$_fgrep_status" ;; -+ esac -+ set +e -+ cmp -s "$_ldsoconf.dpkg-tmp" "$_ldsoconf" -+ _cmp_status=$? -+ set -e -+ case $_cmp_status in -+ 0) rm "$_ldsoconf.dpkg-tmp" ;; # files are identical -+ 1) mv "$_ldsoconf.dpkg-tmp" "$_ldsoconf" ;; # files differ -+ *) die "error comparing \"$_ldsoconf.dpkg-tmp\" to \"$_ldsoconf\";" \ -+ "cmp exited with status $_cmp_status" ;; -+ esac -+ fi -+ fi -+} -+ -+make_symlink_sane () { -+ # syntax: make_symlink_sane symlink target -+ # -+ # Ensure that the symbolic link symlink exists, and points to target. -+ # -+ # If symlink does not exist, create it and point it at target. -+ # -+ # If symlink exists but is not a symbolic link, back it up. -+ # -+ # If symlink exists, is a symbolic link, but points to the wrong location, fix -+ # it. -+ # -+ # If symlink exists, is a symbolic link, and already points to target, do -+ # nothing. -+ # -+ # This function wouldn't be needed if ln had an -I, --idempotent option. -+ -+ # Validate arguments. -+ if [ $# -ne 2 ]; then -+ usage_error "make_symlink_sane() called with wrong number of arguments;" \ -+ "expected 2, got $#" -+ exit $SHELL_LIB_USAGE_ERROR -+ fi -+ -+ # We could just use the positional parameters as-is, but that makes things -+ # harder to follow. -+ #local symlink target -+ -+ _symlink="$1" -+ _target="$2" -+ -+ if [ -L "$_symlink" ] && [ "$(readlink "$_symlink")" = "$_target" ]; then -+ observe "link from $_symlink to $_target already exists" -+ else -+ observe "creating symbolic link from $_symlink to $_target" -+ mkdir -p "${_target%/*}" "${_symlink%/*}" -+ ln -s -b -S ".dpkg-old" "$_target" "$_symlink" -+ fi -+} -+ -+migrate_dir_to_symlink () { -+ # syntax: migrate_dir_to_symlink old_location new_location -+ # -+ # Per Debian Policy section 6.5.4, "A directory will never be replaced by a -+ # symbolic link to a directory or vice versa; instead, the existing state -+ # (symlink or not) will be left alone and dpkg will follow the symlink if -+ # there is one." -+ # -+ # We have to do it ourselves. -+ # -+ # This function moves the contents of old_location, a directory, into -+ # new_location, a directory, then makes old_location a symbolic link to -+ # new_location. -+ # -+ # old_location need not exist, but if it does, it must be a directory (or a -+ # symlink to a directory). If it is not, it is backed up. If new_location -+ # exists already and is not a directory, it is backed up. -+ # -+ # This function should be called from a package's preinst so that other -+ # packages unpacked after this one --- but before this package's postinst runs -+ # --- are unpacked into new_location even if their payloads contain -+ # old_location filespecs. -+ -+ # Validate arguments. -+ if [ $# -ne 2 ]; then -+ usage_error "migrate_dir_to_symlink() called with wrong number of" -+ "arguments; expected 2, got $#" -+ exit $SHELL_LIB_USAGE_ERROR -+ fi -+ -+ # We could just use the positional parameters as-is, but that makes things -+ # harder to follow. -+ local _new _old -+ -+ _old="$1" -+ _new="$2" -+ -+ # Is old location a symlink? -+ if [ -L "$_old" ]; then -+ # Does it already point to new location? -+ if [ "$(readlink "$_old")" = "$_new" ]; then -+ # Nothing to do; migration has already been done. -+ observe "migration of $_old to $_new already done" -+ return 0 -+ else -+ # Back it up. -+ warn "backing up symbolic link $_old as $_old.dpkg-old" -+ mv -b "$_old" "$_old.dpkg-old" -+ fi -+ fi -+ -+ # Does old location exist, but is not a directory? -+ if [ -e "$_old" ] && ! [ -d "$_old" ]; then -+ # Back it up. -+ warn "backing up non-directory $_old as $_old.dpkg-old" -+ mv -b "$_old" "$_old.dpkg-old" -+ fi -+ -+ observe "migrating $_old to $_new" -+ -+ # Is new location a symlink? -+ if [ -L "$_new" ]; then -+ # Does it point the wrong way, i.e., back to where we're migrating from? -+ if [ "$(readlink "$_new")" = "$_old" ]; then -+ # Get rid of it. -+ observe "removing symbolic link $_new which points to $_old" -+ rm "$_new" -+ else -+ # Back it up. -+ warn "backing up symbolic link $_new as $_new.dpkg-old" -+ mv -b "$_new" "$_new.dpkg-old" -+ fi -+ fi -+ -+ # Does new location exist, but is not a directory? -+ if [ -e "$_new" ] && ! [ -d "$_new" ]; then -+ warn "backing up non-directory $_new as $_new.dpkg-old" -+ mv -b "$_new" "$_new.dpkg-old" -+ fi -+ -+ # Create new directory if it does not yet exist. -+ if ! [ -e "$_new" ]; then -+ observe "creating $_new" -+ mkdir -p "$_new" -+ fi -+ -+ # Copy files in old location to new location. Back up any filenames that -+ # already exist in the new location with the extension ".dpkg-old". -+ observe "copying files from $_old to $_new" -+ if ! (cd "$_old" && cp -a -b -S ".dpkg-old" . "$_new"); then -+ die "error(s) encountered while copying files from $_old to $_new" -+ fi -+ -+ # Remove files at old location. -+ observe "removing $_old" -+ rm -r "$_old" -+ -+ # Create symlink from old location to new location. -+ make_symlink_sane "$_old" "$_new" -+} -+ -+# vim:set ai et sw=2 ts=2 tw=80: -+ -+# GOBSTOPPER: The X Strike Force shell library ends here. diff --git a/recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb b/recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb index 2b016e274d..4cb8e569b5 100644 --- a/recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb +++ b/recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb @@ -1,15 +1,15 @@ require xorg-driver-input.inc -PR = "r11" +PR = "r12" DESCRIPTION = "X.Org X server -- evtouch input driver" SRC_URI = "http://www.conan.de/touchscreen/xf86-input-evtouch-${PV}.tar.bz2 \ - file://xf86-input-evtouch_0.8.8-0ubuntu6.diff;patch=1 \ - file://20_fix_calibrate_submission_directions.patch;patch=1 \ - file://21_more_calibration_fixups.patch;patch=1 \ file://fdi/*.fdi \ file://udev-ett-tc5uh.patch;patch=1 \ + file://02_calibration_1.6.patch;patch=1 \ + file://03_server-1.6-ftbfs.diff;patch=1 \ + file://04_server-1.7-ftbfs.diff;patch=1 \ " EXTRA_OECONF = "--enable-evcalibrate \ diff --git a/recipes/xorg-proto/xorg-proto-common.inc b/recipes/xorg-proto/xorg-proto-common.inc index 17bd6ade9c..7cfd9e87ca 100644 --- a/recipes/xorg-proto/xorg-proto-common.inc +++ b/recipes/xorg-proto/xorg-proto-common.inc @@ -5,13 +5,11 @@ LICENSE = "MIT-X" DEPENDS = "util-macros" -XORG_PN = "${PN}" - ALLOW_EMPTY = "1" -SRC_URI = "${XORG_MIRROR}/individual/proto/${XORG_PN}-${PV}.tar.bz2;name=archive" +SRC_URI = "${XORG_MIRROR}/individual/proto/${BPN}-${PV}.tar.bz2;name=archive" -S = "${WORKDIR}/${XORG_PN}-${PV}" +S = "${WORKDIR}/${BPN}-${PV}" inherit autotools pkgconfig diff --git a/recipes/xorg-util/gccmakedep_1.0.2.bb b/recipes/xorg-util/gccmakedep_1.0.2.bb index 3abfa037a2..cb28a86703 100644 --- a/recipes/xorg-util/gccmakedep_1.0.2.bb +++ b/recipes/xorg-util/gccmakedep_1.0.2.bb @@ -3,5 +3,5 @@ require xorg-util-common.inc DESCRIPTION = "create dependencies in makefiles using 'gcc -M'" RDEPENDS = "gcc" -PR = "r2" +PR = "r3" PE = "1" diff --git a/recipes/xorg-util/imake_1.0.2.bb b/recipes/xorg-util/imake_1.0.2.bb index deeb4477a1..b0eda35823 100644 --- a/recipes/xorg-util/imake_1.0.2.bb +++ b/recipes/xorg-util/imake_1.0.2.bb @@ -3,5 +3,5 @@ require xorg-util-common.inc DESCRIPTION = "C preprocessor interface to the make utility" RDEPENDS = "perl xproto" -PR = "r1" +PR = "r2" PE = "1" diff --git a/recipes/xorg-util/lndir_1.0.1.bb b/recipes/xorg-util/lndir_1.0.1.bb index 34309a6487..fffc71034e 100644 --- a/recipes/xorg-util/lndir_1.0.1.bb +++ b/recipes/xorg-util/lndir_1.0.1.bb @@ -1,5 +1,5 @@ require xorg-util-common.inc DESCRIPTION = "create a shadow directory of symbolic links to another directory tree" -PR = "r1" +PR = "r2" PE = "1" diff --git a/recipes/xorg-util/makedepend_1.0.2.bb b/recipes/xorg-util/makedepend_1.0.2.bb index e998bba1b0..a7a2385506 100644 --- a/recipes/xorg-util/makedepend_1.0.2.bb +++ b/recipes/xorg-util/makedepend_1.0.2.bb @@ -2,5 +2,5 @@ require xorg-util-common.inc DESCRIPTION = "create dependencies in makefiles" DEPENDS = "xproto util-macros" -PR = "r2" +PR = "r3" PE = "1" diff --git a/recipes/xorg-util/util-macros_1.6.0.bb b/recipes/xorg-util/util-macros_1.6.0.bb index 661eba4654..0fb42dc55f 100644 --- a/recipes/xorg-util/util-macros_1.6.0.bb +++ b/recipes/xorg-util/util-macros_1.6.0.bb @@ -1,6 +1,7 @@ require xorg-util-common.inc DESCRIPTION = "X autotools macros" +PR = "r1" PE = "1" ALLOW_EMPTY = "1" diff --git a/recipes/xorg-util/xorg-cf-files_1.0.3.bb b/recipes/xorg-util/xorg-cf-files_1.0.3.bb index 7c3fb8d7e9..3f0f4b3f06 100644 --- a/recipes/xorg-util/xorg-cf-files_1.0.3.bb +++ b/recipes/xorg-util/xorg-cf-files_1.0.3.bb @@ -2,7 +2,7 @@ require xorg-util-common.inc DESCRIPTION = "X Window System CF files" -PR = "r1" +PR = "r2" PE = "1" FILES_${PN} += " /usr/lib/X11/config" diff --git a/recipes/xorg-util/xorg-util-common.inc b/recipes/xorg-util/xorg-util-common.inc index 998b37b3c0..b169d9ef58 100644 --- a/recipes/xorg-util/xorg-util-common.inc +++ b/recipes/xorg-util/xorg-util-common.inc @@ -2,14 +2,8 @@ HOMEPAGE = "http://www.x.org" SECTION = "x11/utils" LICENSE = "MIT-X" -XORG_PN = "${PN}" +SRC_URI = "${XORG_MIRROR}/individual/util/${BPN}-${PV}.tar.gz;name=archive" -SRC_URI = "${XORG_MIRROR}/individual/util/${XORG_PN}-${PV}.tar.gz;name=archive" - -S = "${WORKDIR}/${XORG_PN}-${PV}" +S = "${WORKDIR}/${BPN}-${PV}" inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb index 617eee66c9..1be87b16f4 100644 --- a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb +++ b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Machine specific xorg.conf files" -PR = "r20" +PR = "r21" SRC_URI = "file://xorg.conf" |