Upload Tizen2.0 source
authorSewook Park <sewook7.park@samsung.com>
Tue, 21 Aug 2012 11:10:29 +0000 (20:10 +0900)
committerSewook Park <sewook7.park@samsung.com>
Tue, 21 Aug 2012 11:10:29 +0000 (20:10 +0900)
42 files changed:
TC/build.sh [deleted file]
TC/execute.sh [deleted file]
TC/tet_code [deleted file]
TC/tet_scen [deleted file]
TC/tetbuild.cfg [deleted file]
TC/tetclean.cfg [deleted file]
TC/tetexec.cfg [deleted file]
TC/unit/Makefile [deleted file]
TC/unit/pkgname.h [deleted file]
TC/unit/tc_gen.sh [deleted file]
TC/unit/tslist [deleted file]
TC/unit/utc_ApplicationFW_alarmmgr_add_alarm_func.c [deleted file]
TC/unit/utc_ApplicationFW_alarmmgr_add_alarm_with_localtime_func.c [deleted file]
TC/unit/utc_ApplicationFW_alarmmgr_create_alarm_func.c [deleted file]
TC/unit/utc_ApplicationFW_alarmmgr_enum_alarm_ids_func.c [deleted file]
TC/unit/utc_ApplicationFW_alarmmgr_free_alarm_func.c [deleted file]
TC/unit/utc_ApplicationFW_alarmmgr_get_info_func.c [deleted file]
TC/unit/utc_ApplicationFW_alarmmgr_get_repeat_mode_func.c [deleted file]
TC/unit/utc_ApplicationFW_alarmmgr_get_time_func.c [deleted file]
TC/unit/utc_ApplicationFW_alarmmgr_get_type_func.c [deleted file]
TC/unit/utc_ApplicationFW_alarmmgr_init_func.c [deleted file]
TC/unit/utc_ApplicationFW_alarmmgr_remove_alarm_func.c [deleted file]
TC/unit/utc_ApplicationFW_alarmmgr_set_cb_func.c [deleted file]
TC/unit/utc_ApplicationFW_alarmmgr_set_repeat_mode_func.c [deleted file]
TC/unit/utc_ApplicationFW_alarmmgr_set_time_func.c [deleted file]
TC/unit/utc_ApplicationFW_alarmmgr_set_type_func.c [deleted file]
TC/unit/utc_MODULE_API_func.c.in [deleted file]
alarm-lib-stub.c [changed mode: 0755->0644]
alarm-lib.c
alarm-manager-registry.c
alarm-manager.c
alarm_mgr.xml
config.guess
config.sub
debian/alarm-server.postinst [new file with mode: 0644]
debian/changelog
include/alarm-internal.h
include/alarm.h
ltmain.sh [changed mode: 0755->0644]
m4/ltsugar.m4
m4/ltversion.m4
packaging/alarm-manager.spec

diff --git a/TC/build.sh b/TC/build.sh
deleted file mode 100755 (executable)
index e953690..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-export TET_INSTALL_PATH=/home/jhlee/tetware/TETware  # local tetware path
-export TET_TARGET_PATH=$TET_INSTALL_PATH/tetware-target
-export PATH=$TET_TARGET_PATH/bin:$PATH
-export LD_LIBRARY_PATH=$TET_TARGET_PATH/lib/tet3:$LD_LIBRARY_PATH
-export TET_ROOT=$TET_TARGET_PATH
-
-export TET_SUITE_ROOT=`pwd`
-FILE_NAME_EXTENSION=`date +%s`
-
-RESULT_DIR=results
-HTML_RESULT=$RESULT_DIR/build-tar-result-$FILE_NAME_EXTENSION.html
-JOURNAL_RESULT=$RESULT_DIR/build-tar-result-$FILE_NAME_EXTENSION.journal
-
-mkdir -p $RESULT_DIR
-
-tcc -c -p ./
-tcc -b -j $JOURNAL_RESULT -p ./
-grw -c 3 -f chtml -o $HTML_RESULT $JOURNAL_RESULT
diff --git a/TC/execute.sh b/TC/execute.sh
deleted file mode 100755 (executable)
index 6720da0..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-export TET_INSTALL_PATH=/mnt/nfs/tetware
-export TET_TARGET_PATH=$TET_INSTALL_PATH/tetware-target
-export PATH=$TET_TARGET_PATH/bin:$PATH
-export LD_LIBRARY_PATH=$TET_TARGET_PATH/lib/tet3:$LD_LIBRARY_PATH
-
-export TET_ROOT=$TET_TARGET_PATH
-
-export TET_SUITE_ROOT=`pwd`
-FILE_NAME_EXTENSION=`date +%s`
-
-RESULT_DIR=results
-HTML_RESULT=$RESULT_DIR/exec-tar-result-$FILE_NAME_EXTENSION.html
-JOURNAL_RESULT=$RESULT_DIR/exec-tar-result-$FILE_NAME_EXTENSION.journal
-
-mkdir -p $RESULT_DIR
-
-tcc -e -j $JOURNAL_RESULT -p ./
-grw -c 3 -f chtml -o $HTML_RESULT $JOURNAL_RESULT
diff --git a/TC/tet_code b/TC/tet_code
deleted file mode 100755 (executable)
index a2cf6c1..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# TET reserved codes
-0 "PASS"
-1 "FAIL"
-2 "UNRESOLVED"
-3 "NOTINUSE"
-4 "UNSUPPORTED"
-5 "UNTESTED"
-6 "UNINITIATED"
-7 "NORESULT"
-
-# Test suite additional codes
-33 "INSPECT"
diff --git a/TC/tet_scen b/TC/tet_scen
deleted file mode 100755 (executable)
index 43cbc9b..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-all
-       ^TEST
-##### Scenarios for TEST #####
-
-# Test scenario
-TEST
-       :include:/unit/tslist
diff --git a/TC/tetbuild.cfg b/TC/tetbuild.cfg
deleted file mode 100755 (executable)
index 6192c78..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-TET_OUTPUT_CAPTURE=False
-TET_BUILD_TOOL=make
-TET_PASS_TC_NAME=True
diff --git a/TC/tetclean.cfg b/TC/tetclean.cfg
deleted file mode 100755 (executable)
index c66eda4..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-TET_OUTPUT_CAPTURE=False
-TET_CLEAN_TOOL=make clean
diff --git a/TC/tetexec.cfg b/TC/tetexec.cfg
deleted file mode 100755 (executable)
index 0d9d39a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-TET_OUTPUT_CAPTURE=False
diff --git a/TC/unit/Makefile b/TC/unit/Makefile
deleted file mode 100644 (file)
index b0f35cb..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-CC ?= gcc
-
-TARGETS = utc_ApplicationFW_alarmmgr_init_func \
-         utc_ApplicationFW_alarmmgr_set_cb_func \
-         utc_ApplicationFW_alarmmgr_create_alarm_func \
-         utc_ApplicationFW_alarmmgr_free_alarm_func \
-         utc_ApplicationFW_alarmmgr_set_time_func \
-         utc_ApplicationFW_alarmmgr_get_time_func \
-         utc_ApplicationFW_alarmmgr_set_repeat_mode_func \
-         utc_ApplicationFW_alarmmgr_get_repeat_mode_func \
-         utc_ApplicationFW_alarmmgr_set_type_func \
-         utc_ApplicationFW_alarmmgr_get_type_func \
-         utc_ApplicationFW_alarmmgr_add_alarm_with_localtime_func \
-         utc_ApplicationFW_alarmmgr_add_alarm_func \
-         utc_ApplicationFW_alarmmgr_remove_alarm_func \
-         utc_ApplicationFW_alarmmgr_enum_alarm_ids_func \
-         utc_ApplicationFW_alarmmgr_get_info_func
-
-PKGS = alarm-service 
-
-LDFLAGS = `pkg-config --libs $(PKGS)`
-LDFLAGS += $(TET_ROOT)/lib/tet3/tcm_s.o
-LDFLAGS += -L$(TET_ROOT)/lib/tet3 -ltcm_s
-LDFLAGS += -L$(TET_ROOT)/lib/tet3 -lapi_s
-
-CFLAGS = -I. `pkg-config --cflags $(PKGS)`
-CFLAGS += -I$(TET_ROOT)/inc/tet3
-CFLAGS += -Wall
-
-all: $(TARGETS)
-
-$(TARGETS): %: %.c
-       $(CC) -o $@ $< $(CFLAGS) $(LDFLAGS)
-
-clean:
-       rm -f $(TARGETS)
diff --git a/TC/unit/pkgname.h b/TC/unit/pkgname.h
deleted file mode 100644 (file)
index 72f871e..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  alarm-manager
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Venkatesha Sarpangala <sarpangala.v@samsung.com>, Jayoun Lee <airjany@samsung.com>,
- * Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#define MAX_LOCAL_BUFSZ        128
-
-#define EXIST_PKGNAME          "org.tizen.calculator" 
-#define NO_EXIST_PKGNAME       "empty.fault.application"
-
-#define EXIST_FILENAME         "/usr/share/preload_list.txt"
-#define NOEXIST_FILENAME       "/empty/fault/file"
-
-#define MIMETYPE               "text/html"
-#define CONTENT                        "011-0011-1122"
-
diff --git a/TC/unit/tc_gen.sh b/TC/unit/tc_gen.sh
deleted file mode 100755 (executable)
index 54f482d..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-TMPSTR=$0
-SCRIPT=${TMPSTR##*/}
-
-if [ $# -lt 2 ]; then
-       echo "Usage) $SCRIPT module_name api_name"
-       exit 1
-fi
-
-MODULE=$1
-API=$2
-TEMPLATE=utc_MODULE_API_func.c.in
-TESTCASE=utc_${MODULE}_${API}_func
-
-sed -e '
-       s^@API@^'"$API"'^g
-       s^@MODULE@^'"$MODULE"'^g
-       ' $TEMPLATE > $TESTCASE.c
-
-if [ ! -e "$TESTCASE.c" ]; then
-       echo "Failed"
-       exit 1
-fi
-echo "Testcase file is $TESTCASE.c"
-echo "Done"
-echo "please put \"$TESTCASE\" as Target in Makefile"
-echo "please put \"/unit/$TESTCASE\" in tslist"
diff --git a/TC/unit/tslist b/TC/unit/tslist
deleted file mode 100644 (file)
index 89b346e..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-/unit/utc_ApplicationFW_alarmmgr_init_func
-/unit/utc_ApplicationFW_alarmmgr_set_cb_func
-/unit/utc_ApplicationFW_alarmmgr_create_alarm_func
-/unit/utc_ApplicationFW_alarmmgr_free_alarm_func
-/unit/utc_ApplicationFW_alarmmgr_set_time_func
-/unit/utc_ApplicationFW_alarmmgr_get_time_func
-/unit/utc_ApplicationFW_alarmmgr_set_repeat_mode_func
-/unit/utc_ApplicationFW_alarmmgr_get_repeat_mode_func
-/unit/utc_ApplicationFW_alarmmgr_set_type_func
-/unit/utc_ApplicationFW_alarmmgr_get_type_func
-/unit/utc_ApplicationFW_alarmmgr_add_alarm_with_localtime_func
-/unit/utc_ApplicationFW_alarmmgr_add_alarm_func
-/unit/utc_ApplicationFW_alarmmgr_remove_alarm_func
-/unit/utc_ApplicationFW_alarmmgr_enum_alarm_ids_func
-/unit/utc_ApplicationFW_alarmmgr_get_info_func
diff --git a/TC/unit/utc_ApplicationFW_alarmmgr_add_alarm_func.c b/TC/unit/utc_ApplicationFW_alarmmgr_add_alarm_func.c
deleted file mode 100644 (file)
index a6f2c17..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- *  alarm-manager
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Venkatesha Sarpangala <sarpangala.v@samsung.com>, Jayoun Lee <airjany@samsung.com>,
- * Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <tet_api.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "alarm.h"
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup)(void) = startup;
-void (*tet_cleanup)(void) = cleanup;
-
-static void utc_ApplicationFW_alarmmgr_add_alarm_func_01(void);
-static void utc_ApplicationFW_alarmmgr_add_alarm_func_02(void);
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-       { utc_ApplicationFW_alarmmgr_add_alarm_func_01, POSITIVE_TC_IDX },
-       { utc_ApplicationFW_alarmmgr_add_alarm_func_02, NEGATIVE_TC_IDX },
-       { NULL , 0 }
-};
-
-static int pid;
-
-static void startup(void)
-{
-}
-
-static void cleanup(void)
-{
-}
-
-/**
- * @brief Positive test case of alarmmgr_add_alarm()
- */
-static void utc_ApplicationFW_alarmmgr_add_alarm_func_01(void)
-{
-       int ret_val = ALARMMGR_RESULT_SUCCESS;
-       
-       int alarm_type = ALARM_TYPE_VOLATILE;
-       time_t trigger_at_time = 10; 
-       time_t interval = ALARM_WDAY_SUNDAY; 
-       const char* destination = NULL;
-       alarm_id_t alarm_id;
-
-       const char* pkg_name = "org.tizen.test";
-
-       g_type_init();
-
-       ret_val =alarmmgr_init(pkg_name) ;
-       if(ret_val != ALARMMGR_RESULT_SUCCESS)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_init () failed \n");
-                tet_result(TET_FAIL);
-                return;
-       }
-
-       ret_val = alarmmgr_add_alarm( alarm_type,  trigger_at_time, interval  , destination, &alarm_id);
-       if(ret_val == ALARMMGR_RESULT_SUCCESS)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_add_alarm() is successful \n");
-                tet_result(TET_PASS);
-       }
-       else
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_add_alarm() failed \n");
-                tet_result(TET_FAIL);
-       }
-       alarmmgr_remove_alarm( alarm_id) ;
-}
-
-/**
- * @brief Negative test case of ug_init alarmmgr_add_alarm()
- */
-static void utc_ApplicationFW_alarmmgr_add_alarm_func_02(void)
-{
-       int ret_val = ALARMMGR_RESULT_SUCCESS;
-
-       int alarm_type = ALARM_TYPE_VOLATILE;
-       time_t trigger_at_time = 0; 
-       time_t interval = ALARM_WDAY_SUNDAY; 
-       const char* destination = NULL;
-       alarm_id_t* alarm_id = NULL;
-
-       const char* pkg_name = "org.tizen.test";
-
-       g_type_init();
-
-       ret_val =alarmmgr_init(pkg_name) ;
-       if(ret_val != ALARMMGR_RESULT_SUCCESS)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_init () failed \n");
-                tet_result(TET_FAIL);
-                return;
-       }
-       
-       ret_val = alarmmgr_add_alarm( alarm_type,  trigger_at_time,  interval, destination, alarm_id);
-       if(ret_val == ERR_ALARM_INVALID_PARAM)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_add_alarm() with invalid parameter  is successful \n");
-                tet_result(TET_PASS);
-       }
-       else
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_add_alarm() failed \n");
-                tet_result(TET_FAIL);
-       }
-}
diff --git a/TC/unit/utc_ApplicationFW_alarmmgr_add_alarm_with_localtime_func.c b/TC/unit/utc_ApplicationFW_alarmmgr_add_alarm_with_localtime_func.c
deleted file mode 100644 (file)
index 4eded12..0000000
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- *  alarm-manager
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Venkatesha Sarpangala <sarpangala.v@samsung.com>, Jayoun Lee <airjany@samsung.com>,
- * Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <tet_api.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "alarm.h"
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup)(void) = startup;
-void (*tet_cleanup)(void) = cleanup;
-
-static void utc_ApplicationFW_alarmmgr_add_alarm_with_localtime_func_01(void);
-static void utc_ApplicationFW_alarmmgr_add_alarm_with_localtime_func_02(void);
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-       { utc_ApplicationFW_alarmmgr_add_alarm_with_localtime_func_01, POSITIVE_TC_IDX },
-       { utc_ApplicationFW_alarmmgr_add_alarm_with_localtime_func_02, NEGATIVE_TC_IDX },
-       { NULL , 0 }
-};
-
-static int pid;
-
-static void startup(void)
-{
-}
-
-static void cleanup(void)
-{
-}
-
-/**
- * @brief Positive test case of alarmmgr_add_alarm_with_localtime()
- */
-static void utc_ApplicationFW_alarmmgr_add_alarm_with_localtime_func_01(void)
-{
-       int ret_val = ALARMMGR_RESULT_SUCCESS;
-       alarm_entry_t* alarm; 
-       const char* destination = NULL; 
-       alarm_id_t alarm_id;
-
-       time_t current_time;
-       struct tm current_tm;
-       alarm_date_t test_time;
-
-       const char* pkg_name = "org.tizen.test";
-
-       g_type_init();
-
-       ret_val =alarmmgr_init(pkg_name) ;
-       if(ret_val != ALARMMGR_RESULT_SUCCESS)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_init () failed \n");
-                tet_result(TET_FAIL);
-                return;
-       }
-
-       time(&current_time);
-
-       printf("current time: %s\n", ctime(&current_time));
-       localtime_r(&current_time, &current_tm);
-
-       alarm = alarmmgr_create_alarm();
-
-       test_time.year = 0;                 
-       test_time.month = 0;                
-       test_time.day = 0;                  
-                                     
-       test_time.hour = current_tm.tm_hour;
-       test_time.min = current_tm.tm_min+1;
-       test_time.sec = 0;
-
-        
-       alarmmgr_set_time(alarm,test_time);
-       alarmmgr_set_repeat_mode(alarm,ALARM_REPEAT_MODE_WEEKLY, ALARM_WDAY_MONDAY);
-       alarmmgr_set_type(alarm,ALARM_TYPE_VOLATILE);
-
-               
-       ret_val=alarmmgr_add_alarm_with_localtime(alarm,destination,&alarm_id);
-
-       if(ret_val == ALARMMGR_RESULT_SUCCESS)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_add_alarm_with_localtime() is successful \n");
-                tet_result(TET_PASS);
-       }
-       else
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_add_alarm_with_localtime() failed \n");
-                tet_result(TET_FAIL);
-       }
-       alarmmgr_free_alarm( alarm) ;
-}
-
-/**
- * @brief Negative test case of ug_init alarmmgr_add_alarm_with_localtime()
- */
-static void utc_ApplicationFW_alarmmgr_add_alarm_with_localtime_func_02(void)
-{
-       int ret_val = ALARMMGR_RESULT_SUCCESS;
-       alarm_entry_t* alarm = NULL; 
-       const char* destination = NULL; 
-       alarm_id_t* alarm_id = NULL;
-
-       const char* pkg_name = "org.tizen.test";
-
-       g_type_init();
-
-       ret_val =alarmmgr_init(pkg_name) ;
-       if(ret_val != ALARMMGR_RESULT_SUCCESS)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_init () failed \n");
-                tet_result(TET_FAIL);
-                return;
-       }
-       
-       ret_val = alarmmgr_add_alarm_with_localtime(alarm,  destination, alarm_id);
-       if(ret_val == ERR_ALARM_INVALID_PARAM)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_add_alarm_with_localtime()  with invalid parameter  is successful \n");
-                tet_result(TET_PASS);
-       }
-       else
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_add_alarm_with_localtime() failed \n");
-                tet_result(TET_FAIL);
-       }
-}
diff --git a/TC/unit/utc_ApplicationFW_alarmmgr_create_alarm_func.c b/TC/unit/utc_ApplicationFW_alarmmgr_create_alarm_func.c
deleted file mode 100644 (file)
index 360797d..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *  alarm-manager
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Venkatesha Sarpangala <sarpangala.v@samsung.com>, Jayoun Lee <airjany@samsung.com>,
- * Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <tet_api.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "alarm.h"
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup)(void) = startup;
-void (*tet_cleanup)(void) = cleanup;
-
-static void utc_ApplicationFW_alarmmgr_create_alarm_func_01(void);
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-       { utc_ApplicationFW_alarmmgr_create_alarm_func_01, POSITIVE_TC_IDX },
-       { NULL , 0 }
-};
-
-static int pid;
-
-static void startup(void)
-{
-}
-
-static void cleanup(void)
-{
-}
-
-/**
- * @brief Positive test case of alarmmgr_create_alarm()
- */
-static void utc_ApplicationFW_alarmmgr_create_alarm_func_01(void)
-{
-       alarm_entry_t* alarm;
-
-       alarm = alarmmgr_create_alarm() ;
-       if(alarm != NULL)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_create_alarm() is successful \n");
-                tet_result(TET_PASS);
-       }
-       else
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_create_alarm () failed \n");
-                tet_result(TET_FAIL);
-       }
-}
-
diff --git a/TC/unit/utc_ApplicationFW_alarmmgr_enum_alarm_ids_func.c b/TC/unit/utc_ApplicationFW_alarmmgr_enum_alarm_ids_func.c
deleted file mode 100644 (file)
index ec97179..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- *  alarm-manager
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Venkatesha Sarpangala <sarpangala.v@samsung.com>, Jayoun Lee <airjany@samsung.com>,
- * Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <tet_api.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "alarm.h"
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup)(void) = startup;
-void (*tet_cleanup)(void) = cleanup;
-
-static void utc_ApplicationFW_alarmmgr_enum_alarm_ids_func_01(void);
-static void utc_ApplicationFW_alarmmgr_enum_alarm_ids_func_02(void);
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-       { utc_ApplicationFW_alarmmgr_enum_alarm_ids_func_01, POSITIVE_TC_IDX },
-       { utc_ApplicationFW_alarmmgr_enum_alarm_ids_func_02, NEGATIVE_TC_IDX },
-       { NULL , 0 }
-};
-
-static int pid;
-
-static void startup(void)
-{
-}
-
-static void cleanup(void)
-{
-}
-
-int callback_2(alarm_id_t id, void* user_param)
-{
-       int* n = (int*)user_param;
-       printf("[%d]alarm id : %d\n",*n,id);
-       (*n)++;
-       return 0;
-}
-
-/**
- * @brief Positive test case of alarmmgr_enum_alarm_ids()
- */
-static void utc_ApplicationFW_alarmmgr_enum_alarm_ids_func_01(void)
-{
-       int ret_val = ALARMMGR_RESULT_SUCCESS;
-       int n = 1;
-
-       const char* pkg_name = "org.tizen.test";
-
-       g_type_init();
-
-       ret_val =alarmmgr_init(pkg_name) ;
-       if(ret_val != ALARMMGR_RESULT_SUCCESS)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_init () failed \n");
-                tet_result(TET_FAIL);
-                return;
-       }
-
-       ret_val = alarmmgr_enum_alarm_ids( callback_2, (void*)&n) ;
-       if(ret_val == ALARMMGR_RESULT_SUCCESS)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_enum_alarm_ids() is successful \n");
-                tet_result(TET_PASS);
-       }
-       else
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_enum_alarm_ids() failed \n");
-                tet_result(TET_FAIL);
-       }
-}
-
-/**
- * @brief Negative test case of ug_init alarmmgr_enum_alarm_ids()
- */
-static void utc_ApplicationFW_alarmmgr_enum_alarm_ids_func_02(void)
-{
-       int ret_val = ALARMMGR_RESULT_SUCCESS;  
-
-       ret_val =alarmmgr_enum_alarm_ids( NULL, NULL) ;
-       if(ret_val != ALARMMGR_RESULT_SUCCESS)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_enum_alarm_ids() with invalid parameter  is successful \n");
-                tet_result(TET_PASS);
-       }
-       else
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_enum_alarm_ids() failed \n");
-                tet_result(TET_FAIL);
-       }
-}
diff --git a/TC/unit/utc_ApplicationFW_alarmmgr_free_alarm_func.c b/TC/unit/utc_ApplicationFW_alarmmgr_free_alarm_func.c
deleted file mode 100644 (file)
index ae0b870..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- *  alarm-manager
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Venkatesha Sarpangala <sarpangala.v@samsung.com>, Jayoun Lee <airjany@samsung.com>,
- * Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <tet_api.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "alarm.h"
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup)(void) = startup;
-void (*tet_cleanup)(void) = cleanup;
-
-static void utc_ApplicationFW_alarmmgr_free_alarm_func_01(void);
-static void utc_ApplicationFW_alarmmgr_free_alarm_func_02(void);
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-       { utc_ApplicationFW_alarmmgr_free_alarm_func_01, POSITIVE_TC_IDX },
-       { utc_ApplicationFW_alarmmgr_free_alarm_func_02, NEGATIVE_TC_IDX },
-       { NULL , 0 }
-};
-
-static int pid;
-
-static void startup(void)
-{
-}
-
-static void cleanup(void)
-{
-}
-
-/**
- * @brief Positive test case of alarmmgr_free_alarm()
- */
-static void utc_ApplicationFW_alarmmgr_free_alarm_func_01(void)
-{
-       int ret_val = ALARMMGR_RESULT_SUCCESS;
-       alarm_entry_t* alarm;
-
-       alarm = alarmmgr_create_alarm() ;
-       if(alarm == NULL)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_create_alarm() is failed \n");
-                tet_result(TET_FAIL);
-       }
-       else
-               {
-
-                       ret_val = alarmmgr_free_alarm( alarm) ;
-                       if(ret_val == ALARMMGR_RESULT_SUCCESS)
-                       {
-                                tet_infoline("\nAlarm Manager : call to alarmmgr_free_alarm() is successful \n");
-                                tet_result(TET_PASS);
-                       }
-                       else
-                       {
-                                tet_infoline("\nAlarm Manager : call to alarmmgr_free_alarm() failed \n");
-                                tet_result(TET_FAIL);
-                       }                       
-               }
-}
-
-/**
- * @brief Negative test case of ug_init alarmmgr_free_alarm()
- */
-static void utc_ApplicationFW_alarmmgr_free_alarm_func_02(void)
-{
-       int ret_val = ALARMMGR_RESULT_SUCCESS;
-       alarm_entry_t* alarm = NULL;
-
-       ret_val = alarmmgr_free_alarm( alarm);
-       if(ret_val == ERR_ALARM_INVALID_PARAM)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_free_alarm() with invalid parameter  is successful \n");
-                tet_result(TET_PASS);
-       }
-       else
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_free_alarm() failed \n");
-                tet_result(TET_FAIL);
-       }
-}
diff --git a/TC/unit/utc_ApplicationFW_alarmmgr_get_info_func.c b/TC/unit/utc_ApplicationFW_alarmmgr_get_info_func.c
deleted file mode 100644 (file)
index ecb5e8e..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- *  alarm-manager
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Venkatesha Sarpangala <sarpangala.v@samsung.com>, Jayoun Lee <airjany@samsung.com>,
- * Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <tet_api.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "alarm.h"
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup)(void) = startup;
-void (*tet_cleanup)(void) = cleanup;
-
-static void utc_ApplicationFW_alarmmgr_get_info_func_01(void);
-static void utc_ApplicationFW_alarmmgr_get_info_func_02(void);
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-       { utc_ApplicationFW_alarmmgr_get_info_func_01, POSITIVE_TC_IDX },
-       { utc_ApplicationFW_alarmmgr_get_info_func_02, NEGATIVE_TC_IDX },
-       { NULL , 0 }
-};
-
-static int pid;
-
-static void startup(void)
-{
-}
-
-static void cleanup(void)
-{
-}
-
-/**
- * @brief Positive test case of alarmmgr_get_info()
- */
-static void utc_ApplicationFW_alarmmgr_get_info_func_01(void)
-{
-       int ret_val = ALARMMGR_RESULT_SUCCESS;
-       int alarm_type = ALARM_TYPE_VOLATILE;
-       time_t trigger_at_time = 10; 
-       time_t interval = 10; 
-       const char* destination = NULL;
-       alarm_id_t alarm_id;
-
-       alarm_entry_t *alarm;
-
-       const char* pkg_name = "org.tizen.test_get_info1";
-
-       
-       g_type_init();
-
-       ret_val =alarmmgr_init(pkg_name) ;
-       if(ret_val != ALARMMGR_RESULT_SUCCESS)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_init () failed \n");
-                tet_result(TET_FAIL);
-                return;
-       }
-       
-       ret_val = alarmmgr_add_alarm( alarm_type,  trigger_at_time, interval  , destination, &alarm_id);
-
-       if(ret_val != ALARMMGR_RESULT_SUCCESS)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_get_info () failed \n");
-                tet_result(TET_FAIL);
-                return;
-       }
-
-       alarm = alarmmgr_create_alarm();
-       
-       ret_val = alarmmgr_get_info(alarm_id, alarm);
-       if(ret_val == ALARMMGR_RESULT_SUCCESS)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_get_info() is successful \n");
-                tet_result(TET_PASS);
-       }
-       else
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_get_info() failed \n");
-                tet_result(TET_FAIL);
-       }
-       alarmmgr_remove_alarm( alarm_id) ;
-}
-
-/**
- * @brief Negative test case of ug_init alarmmgr_get_info()
- */
-static void utc_ApplicationFW_alarmmgr_get_info_func_02(void)
-{
-       int ret_val = ALARMMGR_RESULT_SUCCESS;
-       alarm_id_t alarm_id = -1;
-       alarm_entry_t* alarm = NULL;
-
-       const char* pkg_name = "org.tizen.test_get_info2";
-
-       g_type_init();
-
-       ret_val =alarmmgr_init(pkg_name) ;
-       if(ret_val != ALARMMGR_RESULT_SUCCESS)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_init () failed \n");
-                tet_result(TET_FAIL);
-                return;
-       }
-
-       ret_val =alarmmgr_get_info( alarm_id, alarm) ;
-       if(ret_val == ERR_ALARM_INVALID_PARAM)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_get_info() with invalid parameter  is successful \n");
-                tet_result(TET_PASS);
-       }
-       else
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_get_info() failed \n");
-                tet_result(TET_FAIL);
-       }
-}
diff --git a/TC/unit/utc_ApplicationFW_alarmmgr_get_repeat_mode_func.c b/TC/unit/utc_ApplicationFW_alarmmgr_get_repeat_mode_func.c
deleted file mode 100644 (file)
index 009a7de..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- *  alarm-manager
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Venkatesha Sarpangala <sarpangala.v@samsung.com>, Jayoun Lee <airjany@samsung.com>,
- * Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <tet_api.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "alarm.h"
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup)(void) = startup;
-void (*tet_cleanup)(void) = cleanup;
-
-static void utc_ApplicationFW_alarmmgr_get_repeat_mode_func_01(void);
-static void utc_ApplicationFW_alarmmgr_get_repeat_mode_func_02(void);
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-       { utc_ApplicationFW_alarmmgr_get_repeat_mode_func_01, POSITIVE_TC_IDX },
-       { utc_ApplicationFW_alarmmgr_get_repeat_mode_func_02, NEGATIVE_TC_IDX },
-       { NULL , 0 }
-};
-
-static int pid;
-
-static void startup(void)
-{
-}
-
-static void cleanup(void)
-{
-}
-
-/**
- * @brief Positive test case of alarmmgr_get_repeat_mode()
- */
-static void utc_ApplicationFW_alarmmgr_get_repeat_mode_func_01(void)
-{
-       int ret_val = ALARMMGR_RESULT_SUCCESS;
-       alarm_entry_t* alarm;
-       alarm_repeat_mode_t repeat;
-       int interval;
-
-       alarm = alarmmgr_create_alarm();
-       if(alarm == NULL)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_create_alarm() is failed \n");
-                tet_result(TET_FAIL);
-       }
-       else
-               {
-                       ret_val =alarmmgr_get_repeat_mode(alarm, &repeat, &interval) ;
-                       if(ret_val == ALARMMGR_RESULT_SUCCESS && repeat == ALARM_REPEAT_MODE_ONCE)
-                       {
-                                tet_infoline("\nAlarm Manager : call to alarmmgr_get_repeat_mode() is successful \n");
-                                tet_result(TET_PASS);
-                       }
-                       else
-                       {
-                                tet_infoline("\nAlarm Manager : call to alarmmgr_get_repeat_mode() failed \n");
-                                tet_result(TET_FAIL);
-                       }
-                       alarmmgr_free_alarm(alarm) ;
-               }
-}
-
-/**
- * @brief Negative test case of ug_init alarmmgr_get_repeat_mode()
- */
-static void utc_ApplicationFW_alarmmgr_get_repeat_mode_func_02(void)
-{
-       int ret_val = ALARMMGR_RESULT_SUCCESS;
-       alarm_entry_t* alarm = NULL;
-       alarm_repeat_mode_t repeat;
-       int interval;
-       
-       ret_val = alarmmgr_get_repeat_mode( alarm, &repeat, &interval);
-       if(ret_val == ERR_ALARM_INVALID_PARAM)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_get_repeat_mode() with invalid parameter  is successful \n");
-                tet_result(TET_PASS);
-       }
-       else
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_get_repeat_mode() failed \n");
-                tet_result(TET_FAIL);
-       }
-}
diff --git a/TC/unit/utc_ApplicationFW_alarmmgr_get_time_func.c b/TC/unit/utc_ApplicationFW_alarmmgr_get_time_func.c
deleted file mode 100644 (file)
index e3a07bf..0000000
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- *  alarm-manager
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Venkatesha Sarpangala <sarpangala.v@samsung.com>, Jayoun Lee <airjany@samsung.com>,
- * Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <tet_api.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "alarm.h"
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup)(void) = startup;
-void (*tet_cleanup)(void) = cleanup;
-
-static void utc_ApplicationFW_alarmmgr_get_time_func_01(void);
-static void utc_ApplicationFW_alarmmgr_get_time_func_02(void);
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-       { utc_ApplicationFW_alarmmgr_get_time_func_01, POSITIVE_TC_IDX },
-       { utc_ApplicationFW_alarmmgr_get_time_func_02, NEGATIVE_TC_IDX },
-       { NULL , 0 }
-};
-
-static int pid;
-
-static void startup(void)
-{
-}
-
-static void cleanup(void)
-{
-}
-
-/**
- * @brief Positive test case of alarmmgr_get_time()
- */
-static void utc_ApplicationFW_alarmmgr_get_time_func_01(void)
-{
-       int ret_val = ALARMMGR_RESULT_SUCCESS;
-       alarm_entry_t* alarm;
-
-       time_t current_time;
-       struct tm current_tm;
-       alarm_date_t test_time;
-       alarm_date_t new_time;
-
-
-       time(&current_time);
-       localtime_r(&current_time, &current_tm);
-       
-       alarm = alarmmgr_create_alarm();
-       if(alarm == NULL)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_create_alarm() is failed \n");
-                tet_result(TET_FAIL);
-       }
-       else
-               {
-       
-                   test_time.year = current_tm.tm_year+1900;                 
-                       test_time.month = current_tm.tm_mon+1;                
-                       test_time.day = current_tm.tm_mday;                  
-                                                   
-                       test_time.hour = current_tm.tm_hour;
-                       test_time.min = current_tm.tm_min+1;
-                       test_time.sec = 0;
-                       
-                      ret_val = alarmmgr_set_time(alarm,test_time);
-                       if(ret_val == ALARMMGR_RESULT_SUCCESS)
-                       {
-                                tet_infoline("\nAlarm Manager : call to alarmmgr_set_time() is successful \n");
-                                tet_result(TET_PASS);
-                       }
-                       else
-                       {
-                                tet_infoline("\nAlarm Manager : call to alarmmgr_set_time() failed \n");
-                                tet_result(TET_FAIL);
-                       }
-
-                       
-       
-                       ret_val = alarmmgr_get_time(alarm, &new_time);
-                       if(ret_val == ALARMMGR_RESULT_SUCCESS)
-                       {
-                                tet_infoline("\nAlarm Manager : call to alarmmgr_get_time() is successful \n");
-                                tet_result(TET_PASS);
-                       }
-                       else
-                       {
-                                tet_infoline("\nAlarm Manager : call to alarmmgr_get_time() failed \n");
-                                tet_result(TET_FAIL);
-                       }
-                       alarmmgr_free_alarm( alarm) ;
-               }
-}
-
-/**
- * @brief Negative test case of ug_init alarmmgr_get_time()
- */
-static void utc_ApplicationFW_alarmmgr_get_time_func_02(void)
-{
-       int ret_val = ALARMMGR_RESULT_SUCCESS;
-       const alarm_entry_t* alarm = NULL;
-       alarm_date_t* time = NULL;
-
-       ret_val =alarmmgr_get_time( alarm,  time) ;
-       if(ret_val == ERR_ALARM_INVALID_PARAM)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_get_time()  with invalid parameter is successful \n");
-                tet_result(TET_PASS);
-       }
-       else
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_get_time() failed \n");
-                tet_result(TET_FAIL);
-       }
-}
diff --git a/TC/unit/utc_ApplicationFW_alarmmgr_get_type_func.c b/TC/unit/utc_ApplicationFW_alarmmgr_get_type_func.c
deleted file mode 100644 (file)
index 159a932..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- *  alarm-manager
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Venkatesha Sarpangala <sarpangala.v@samsung.com>, Jayoun Lee <airjany@samsung.com>,
- * Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <tet_api.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "alarm.h"
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup)(void) = startup;
-void (*tet_cleanup)(void) = cleanup;
-
-static void utc_ApplicationFW_alarmmgr_get_type_func_01(void);
-static void utc_ApplicationFW_alarmmgr_get_type_func_02(void);
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-       { utc_ApplicationFW_alarmmgr_get_type_func_01, POSITIVE_TC_IDX },
-       { utc_ApplicationFW_alarmmgr_get_type_func_02, NEGATIVE_TC_IDX },
-       { NULL , 0 }
-};
-
-static int pid;
-
-static void startup(void)
-{
-}
-
-static void cleanup(void)
-{
-}
-
-/**
- * @brief Positive test case of alarmmgr_get_type()
- */
-static void utc_ApplicationFW_alarmmgr_get_type_func_01(void)
-{
-       int ret_val = ALARMMGR_RESULT_SUCCESS;
-       alarm_entry_t* alarm; 
-       int alarm_type;
-
-       alarm = alarmmgr_create_alarm();
-       if(alarm == NULL)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_create_alarm() is failed \n");
-                tet_result(TET_FAIL);
-       }
-       else
-               {
-               
-                       ret_val = alarmmgr_get_type(  alarm, &alarm_type);
-                       if(ret_val == ALARMMGR_RESULT_SUCCESS && alarm_type == ALARM_TYPE_DEFAULT )
-                       {
-                                tet_infoline("\nAlarm Manager : call to alarmmgr_get_type() is successful \n");
-                                tet_result(TET_PASS);
-                       }
-                       else
-                       {
-                                tet_infoline("\nAlarm Manager : call to alarmmgr_get_type() failed \n");
-                                tet_result(TET_FAIL);
-                       }
-                       alarmmgr_free_alarm( alarm) ;
-               }
-}
-
-/**
- * @brief Negative test case of ug_init alarmmgr_get_type()
- */
-static void utc_ApplicationFW_alarmmgr_get_type_func_02(void)
-{
-       int ret_val = ALARMMGR_RESULT_SUCCESS;
-       alarm_entry_t* alarm = NULL; 
-       int* alarm_type = NULL;
-       
-       ret_val =alarmmgr_get_type(alarm, alarm_type) ;
-       if(ret_val == ERR_ALARM_INVALID_PARAM)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_get_type() with invalid parameter  is successful \n");
-                tet_result(TET_PASS);
-       }
-       else
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_get_type() failed \n");
-                tet_result(TET_FAIL);
-       }
-}
diff --git a/TC/unit/utc_ApplicationFW_alarmmgr_init_func.c b/TC/unit/utc_ApplicationFW_alarmmgr_init_func.c
deleted file mode 100644 (file)
index bb49127..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- *  alarm-manager
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Venkatesha Sarpangala <sarpangala.v@samsung.com>, Jayoun Lee <airjany@samsung.com>,
- * Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <tet_api.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "alarm.h"
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup)(void) = startup;
-void (*tet_cleanup)(void) = cleanup;
-
-static void utc_ApplicationFW_alarmmgr_init_func_01(void);
-static void utc_ApplicationFW_alarmmgr_init_func_02(void);
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-       { utc_ApplicationFW_alarmmgr_init_func_01, POSITIVE_TC_IDX },
-       { utc_ApplicationFW_alarmmgr_init_func_02, NEGATIVE_TC_IDX },
-       { NULL , 0 }
-};
-
-static int pid;
-
-static void startup(void)
-{
-}
-
-static void cleanup(void)
-{
-}
-
-/**
- * @brief Positive test case of alarmmgr_init()
- */
-static void utc_ApplicationFW_alarmmgr_init_func_01(void)
-{
-       int ret_val = ALARMMGR_RESULT_SUCCESS;
-       const char* pkg_name = "org.tizen.test";
-
-       g_type_init();
-
-       ret_val =alarmmgr_init(pkg_name) ;
-       if(ret_val == ALARMMGR_RESULT_SUCCESS)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_init() is successful \n");
-                tet_result(TET_PASS);
-       }
-       else
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_init () failed \n");
-                tet_result(TET_FAIL);
-       }
-}
-
-/**
- * @brief Negative test case of ug_init alarmmgr_init()
- */
-static void utc_ApplicationFW_alarmmgr_init_func_02(void)
-{
-       int ret_val = ALARMMGR_RESULT_SUCCESS;
-       const char* pkg_name = NULL;
-
-       g_type_init();
-               
-       ret_val = alarmmgr_init(pkg_name);
-       if(ret_val == ERR_ALARM_SYSTEM_FAIL ||ret_val == ERR_ALARM_INVALID_PARAM )
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_init() with invalid parameter is successful \n");
-                tet_result(TET_PASS);
-       }
-       else
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_init() failed \n");
-                tet_result(TET_FAIL);
-       }
-}
diff --git a/TC/unit/utc_ApplicationFW_alarmmgr_remove_alarm_func.c b/TC/unit/utc_ApplicationFW_alarmmgr_remove_alarm_func.c
deleted file mode 100644 (file)
index 7ad0371..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- *  alarm-manager
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Venkatesha Sarpangala <sarpangala.v@samsung.com>, Jayoun Lee <airjany@samsung.com>,
- * Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <tet_api.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "alarm.h"
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup)(void) = startup;
-void (*tet_cleanup)(void) = cleanup;
-
-static void utc_ApplicationFW_alarmmgr_remove_alarm_func_01(void);
-static void utc_ApplicationFW_alarmmgr_remove_alarm_func_02(void);
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-       { utc_ApplicationFW_alarmmgr_remove_alarm_func_01, POSITIVE_TC_IDX },
-       { utc_ApplicationFW_alarmmgr_remove_alarm_func_02, NEGATIVE_TC_IDX },
-       { NULL , 0 }
-};
-
-static int pid;
-
-static void startup(void)
-{
-}
-
-static void cleanup(void)
-{
-}
-
-/**
- * @brief Positive test case of alarmmgr_remove_alarm()
- */
-static void utc_ApplicationFW_alarmmgr_remove_alarm_func_01(void)
-{
-       int ret_val = ALARMMGR_RESULT_SUCCESS;
-       int alarm_type = ALARM_TYPE_VOLATILE;
-       time_t trigger_at_time = 10; 
-       time_t interval = ALARM_WDAY_SUNDAY; 
-       const char* destination = NULL;
-       alarm_id_t alarm_id;
-
-       const char* pkg_name = "org.tizen.test";
-
-       g_type_init();
-
-       ret_val =alarmmgr_init(pkg_name) ;
-       if(ret_val != ALARMMGR_RESULT_SUCCESS)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_init () failed \n");
-                tet_result(TET_FAIL);
-                return;
-       }
-
-       alarmmgr_add_alarm( alarm_type,  trigger_at_time, interval  , destination, &alarm_id);
-
-       ret_val =alarmmgr_remove_alarm( alarm_id) ;
-       if(ret_val == ALARMMGR_RESULT_SUCCESS)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_remove_alarm() is successful \n");
-                tet_result(TET_PASS);
-       }
-       else
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_remove_alarm() failed \n");
-                tet_result(TET_FAIL);
-       }
-}
-
-/**
- * @brief Negative test case of ug_init alarmmgr_remove_alarm()
- */
-static void utc_ApplicationFW_alarmmgr_remove_alarm_func_02(void)
-{
-       int ret_val = ALARMMGR_RESULT_SUCCESS;
-       alarm_id_t alarm_id= -1;
-
-       const char* pkg_name = "org.tizen.test";
-
-       g_type_init();
-
-       ret_val =alarmmgr_init(pkg_name) ;
-       if(ret_val != ALARMMGR_RESULT_SUCCESS)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_init () failed \n");
-                tet_result(TET_FAIL);
-                return;
-       }
-               
-       ret_val = alarmmgr_remove_alarm(alarm_id);
-       if(ret_val == ERR_ALARM_INVALID_ID)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_remove_alarm() with invalid parameter  is successful \n");
-                tet_result(TET_PASS);
-       }
-       else
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_remove_alarm() failed \n");
-                tet_result(TET_FAIL);
-       }
-}
diff --git a/TC/unit/utc_ApplicationFW_alarmmgr_set_cb_func.c b/TC/unit/utc_ApplicationFW_alarmmgr_set_cb_func.c
deleted file mode 100644 (file)
index efb0300..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- *  alarm-manager
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Venkatesha Sarpangala <sarpangala.v@samsung.com>, Jayoun Lee <airjany@samsung.com>,
- * Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <tet_api.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "alarm.h"
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup)(void) = startup;
-void (*tet_cleanup)(void) = cleanup;
-
-static void utc_ApplicationFW_alarmmgr_set_cb_func_01(void);
-static void utc_ApplicationFW_alarmmgr_set_cb_func_02(void);
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-       { utc_ApplicationFW_alarmmgr_set_cb_func_01, POSITIVE_TC_IDX },
-       { utc_ApplicationFW_alarmmgr_set_cb_func_02, NEGATIVE_TC_IDX },
-       { NULL , 0 }
-};
-
-static int pid;
-
-static void startup(void)
-{
-}
-
-static void cleanup(void)
-{
-}
-
-/* Call back function */
-
-int callback(alarm_id_t alarm_id,void* user_param)
-{
-        time_t current_time;
-        time(&current_time);
-
-        printf("Alarm[%d] has expired at %s\n", alarm_id, ctime(&current_time));
-
-        return 0;
-
-}
-
-/**
- * @ alarmmgr_set_cb :Successfull  : return 0 : ALARMMGR_RESULT_SUCCESS
- */
-static void utc_ApplicationFW_alarmmgr_set_cb_func_01(void)
-{
-       int ret_val = ALARMMGR_RESULT_SUCCESS;
-       void *user_param = NULL;
-
-       ret_val = alarmmgr_set_cb( callback, user_param);
-       if(ret_val == ALARMMGR_RESULT_SUCCESS)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_set_cb() is successful \n");
-                tet_result(TET_PASS);
-       }
-       else
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_set_cb () failed \n");
-                tet_result(TET_FAIL);
-       }
-}
-
-/**
- * @brief Negative test case of ug_init alarmmgr_set_cb()
- */
-static void utc_ApplicationFW_alarmmgr_set_cb_func_02(void)
-{
-       int ret_val = ALARMMGR_RESULT_SUCCESS;
-       void *user_param = NULL;
-       
-       ret_val =alarmmgr_set_cb( NULL, user_param) ;
-       if(ret_val == ERR_ALARM_INVALID_PARAM)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_set_cb() with invalid parameter is successful \n");
-                tet_result(TET_PASS);
-       }
-       else
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_set_cb() failed \n");
-                tet_result(TET_FAIL);
-       }
-}
diff --git a/TC/unit/utc_ApplicationFW_alarmmgr_set_repeat_mode_func.c b/TC/unit/utc_ApplicationFW_alarmmgr_set_repeat_mode_func.c
deleted file mode 100644 (file)
index 042d0ab..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *  alarm-manager
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Venkatesha Sarpangala <sarpangala.v@samsung.com>, Jayoun Lee <airjany@samsung.com>,
- * Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <tet_api.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "alarm.h"
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup)(void) = startup;
-void (*tet_cleanup)(void) = cleanup;
-
-static void utc_ApplicationFW_alarmmgr_set_repeat_mode_func_01(void);
-static void utc_ApplicationFW_alarmmgr_set_repeat_mode_func_02(void);
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-       { utc_ApplicationFW_alarmmgr_set_repeat_mode_func_01, POSITIVE_TC_IDX },
-       { utc_ApplicationFW_alarmmgr_set_repeat_mode_func_02, NEGATIVE_TC_IDX },
-       { NULL , 0 }
-};
-
-static int pid;
-
-static void startup(void)
-{
-}
-
-static void cleanup(void)
-{
-}
-
-/**
- * @brief Positive test case of alarmmgr_set_repeat_mode()
- */
-static void utc_ApplicationFW_alarmmgr_set_repeat_mode_func_01(void)
-{
-       int ret_val = ALARMMGR_RESULT_SUCCESS;
-       alarm_entry_t* alarm;   
-       alarm_repeat_mode_t repeat_mode =ALARM_REPEAT_MODE_WEEKLY;      
-       int interval = ALARM_WDAY_MONDAY; //| ALARM_WDAY_TUESDAY|ALARM_WDAY_WEDNESDAY| ALARM_WDAY_THURSDAY|ALARM_WDAY_FRIDAY ;
-
-
-       alarm = alarmmgr_create_alarm();
-       if(alarm == NULL)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_create_alarm() is failed \n");
-                tet_result(TET_FAIL);
-       }
-       else
-               {
-                     ret_val = alarmmgr_set_repeat_mode(alarm, repeat_mode,interval);
-
-                       if(ret_val == ALARMMGR_RESULT_SUCCESS)
-                       {
-                                tet_infoline("\nAlarm Manager : call to alarmmgr_set_repeat_mode() is successful \n");
-                                tet_result(TET_PASS);
-                       }
-                       else
-                       {
-                                tet_infoline("\nAlarm Manager : call to alarmmgr_set_repeat_mode() failed \n");
-                                tet_result(TET_FAIL);
-                       }
-                       alarmmgr_free_alarm( alarm) ;
-               }
-}
-
-/**
- * @brief Negative test case of ug_init alarmmgr_set_repeat_mode()
- */
-static void utc_ApplicationFW_alarmmgr_set_repeat_mode_func_02(void)
-{
-       int ret_val = ALARMMGR_RESULT_SUCCESS;
-       alarm_entry_t* alarm = NULL; 
-       alarm_repeat_mode_t repeat = ALARM_REPEAT_MODE_MAX+1; 
-       int interval = 0;
-       
-       ret_val = alarmmgr_set_repeat_mode(alarm,  repeat,  interval) ;
-       if(ret_val == ERR_ALARM_INVALID_PARAM)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_set_repeat_mode() with invalid parameter is successful \n");
-                tet_result(TET_PASS);
-       }
-       else
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_set_repeat_mode() failed \n");
-                tet_result(TET_FAIL);
-       }
-}
diff --git a/TC/unit/utc_ApplicationFW_alarmmgr_set_time_func.c b/TC/unit/utc_ApplicationFW_alarmmgr_set_time_func.c
deleted file mode 100644 (file)
index 9c7f584..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- *  alarm-manager
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Venkatesha Sarpangala <sarpangala.v@samsung.com>, Jayoun Lee <airjany@samsung.com>,
- * Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <tet_api.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "alarm.h"
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup)(void) = startup;
-void (*tet_cleanup)(void) = cleanup;
-
-static void utc_ApplicationFW_alarmmgr_set_time_func_01(void);
-static void utc_ApplicationFW_alarmmgr_set_time_func_02(void);
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-       { utc_ApplicationFW_alarmmgr_set_time_func_01, POSITIVE_TC_IDX },
-       { utc_ApplicationFW_alarmmgr_set_time_func_02, NEGATIVE_TC_IDX },
-       { NULL , 0 }
-};
-
-static int pid;
-
-static void startup(void)
-{
-}
-
-static void cleanup(void)
-{
-}
-
-/**
- * @brief Positive test case of alarmmgr_set_time()
- */
-static void utc_ApplicationFW_alarmmgr_set_time_func_01(void)
-{
-       int ret_val = ALARMMGR_RESULT_SUCCESS;
-       alarm_entry_t* alarm;
-       time_t current_time;
-       struct tm current_tm;
-       alarm_date_t test_time;
-
-
-       time(&current_time);
-       localtime_r(&current_time, &current_tm);
-       
-       alarm = alarmmgr_create_alarm();
-       if(alarm == NULL)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_create_alarm() is failed \n");
-                tet_result(TET_FAIL);
-       }
-       else
-               {       
-                   test_time.year = current_tm.tm_year+1900;                 
-                       test_time.month = current_tm.tm_mon+1;                
-                       test_time.day = current_tm.tm_mday;                  
-                                                   
-                       test_time.hour = current_tm.tm_hour;
-                       test_time.min = current_tm.tm_min+1;
-                       test_time.sec = 0;
-                       
-                      ret_val=alarmmgr_set_time(alarm,test_time);
-                       if(ret_val == ALARMMGR_RESULT_SUCCESS)
-                       {
-                                tet_infoline("\nAlarm Manager : call to alarmmgr_set_time() is successful \n");
-                                tet_result(TET_PASS);                           
-                       }
-                       else
-                       {
-                                tet_infoline("\nAlarm Manager : call to alarmmgr_set_time() failed \n");
-                                tet_result(TET_FAIL);
-                       }
-                       alarmmgr_free_alarm( alarm) ;
-               }
-}
-
-/**
- * @brief Negative test case of ug_init alarmmgr_set_time()
- */
-static void utc_ApplicationFW_alarmmgr_set_time_func_02(void)
-{
-       int ret_val = ALARMMGR_RESULT_SUCCESS;
-       alarm_entry_t* alarm = NULL;
-       alarm_date_t time = {0,};
-       
-
-       ret_val =alarmmgr_set_time(alarm,  time) ;
-       if(ret_val == ERR_ALARM_INVALID_PARAM)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_set_time()  with invalid parameter is successful \n");
-                tet_result(TET_PASS);
-       }
-       else
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_set_time() failed \n");
-                tet_result(TET_FAIL);
-       }
-}
diff --git a/TC/unit/utc_ApplicationFW_alarmmgr_set_type_func.c b/TC/unit/utc_ApplicationFW_alarmmgr_set_type_func.c
deleted file mode 100644 (file)
index 569dad6..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- *  alarm-manager
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Venkatesha Sarpangala <sarpangala.v@samsung.com>, Jayoun Lee <airjany@samsung.com>,
- * Sewook Park <sewook7.park@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <tet_api.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "alarm.h"
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup)(void) = startup;
-void (*tet_cleanup)(void) = cleanup;
-
-static void utc_ApplicationFW_alarmmgr_set_type_func_01(void);
-static void utc_ApplicationFW_alarmmgr_set_type_func_02(void);
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-       { utc_ApplicationFW_alarmmgr_set_type_func_01, POSITIVE_TC_IDX },
-       { utc_ApplicationFW_alarmmgr_set_type_func_02, NEGATIVE_TC_IDX },
-       { NULL , 0 }
-};
-
-static int pid;
-
-static void startup(void)
-{
-}
-
-static void cleanup(void)
-{
-}
-
-/**
- * @brief Positive test case of alarmmgr_set_type()
- */
-static void utc_ApplicationFW_alarmmgr_set_type_func_01(void)
-{
-       int ret_val = ALARMMGR_RESULT_SUCCESS;
-       alarm_entry_t* alarm;
-       int alarm_type = ALARM_TYPE_VOLATILE;
-       alarm = alarmmgr_create_alarm();
-       if(alarm == NULL)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_create_alarm() is failed \n");
-                tet_result(TET_FAIL);
-       }
-       else
-               {               
-                       ret_val = alarmmgr_set_type(alarm,  alarm_type);
-                       if(ret_val == ALARMMGR_RESULT_SUCCESS)
-                       {
-                                tet_infoline("\nAlarm Manager : call to alarmmgr_set_type() is successful \n");
-                                tet_result(TET_PASS);
-                       }
-                       else
-                       {
-                                tet_infoline("\nAlarm Manager : call to alarmmgr_set_type() failed \n");
-                                tet_result(TET_FAIL);
-                       }
-                       alarmmgr_free_alarm( alarm) ;
-               }
-}
-
-/**
- * @brief Negative test case of ug_init alarmmgr_set_type()
- */
-static void utc_ApplicationFW_alarmmgr_set_type_func_02(void)
-{
-       int ret_val = ALARMMGR_RESULT_SUCCESS;
-       alarm_entry_t* alarm = NULL;
-       int alarm_type=0;
-       
-       ret_val =alarmmgr_set_type(alarm,  alarm_type) ;
-       if(ret_val == ERR_ALARM_INVALID_PARAM)
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_set_type() with invalid parameter  is successful \n");
-                tet_result(TET_PASS);
-       }
-       else
-       {
-                tet_infoline("\nAlarm Manager : call to alarmmgr_set_type() failed \n");
-                tet_result(TET_FAIL);
-       }
-}
diff --git a/TC/unit/utc_MODULE_API_func.c.in b/TC/unit/utc_MODULE_API_func.c.in
deleted file mode 100644 (file)
index 5edf1b7..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-#include <tet_api.h>
-#include "pkgname.h"
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup)(void) = startup;
-void (*tet_cleanup)(void) = cleanup;
-
-static void utc_@MODULE@_@API@_func_01(void);
-static void utc_@MODULE@_@API@_func_02(void);
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-       { utc_@MODULE@_@API@_func_01, POSITIVE_TC_IDX },
-       { utc_@MODULE@_@API@_func_02, NEGATIVE_TC_IDX },
-};
-
-static int pid;
-
-static void startup(void)
-{
-}
-
-static void cleanup(void)
-{
-}
-
-/**
- * @brief Positive test case of @API@()
- */
-static void utc_@MODULE@_@API@_func_01(void)
-{
-       int r = 0;
-       char buf[MAX_LOCAL_BUFSZ];
-       
-       r = @API@(...);
-
-       if (r<0) {
-               tet_infoline("@API@() failed in positive test case");
-               tet_result(TET_FAIL);
-               return;
-       }
-       tet_result(TET_PASS);
-}
-
-/**
- * @brief Negative test case of ug_init @API@()
- */
-static void utc_@MODULE@_@API@_func_02(void)
-{
-       int r = 0;
-       char buf[MAX_LOCAL_BUFSZ];
-
-       r = @API@(...);
-
-       if (r>=0) {
-               tet_infoline("@API@() failed in negative test case");
-               tet_result(TET_FAIL);
-               return;
-       }
-       tet_result(TET_PASS);
-}
old mode 100755 (executable)
new mode 100644 (file)
index 769065f..fd8bea2
@@ -309,6 +309,73 @@ bundle *_send_alarm_get_appsvc_info(alarm_context_t context, alarm_id_t alarm_id
        return b;
 }
 
+
+bool _send_alarm_set_rtc_time(alarm_context_t context, alarm_date_t *time, int *error_code){
+
+       GError *error = NULL;
+       int return_code = 0;
+
+       char cookie[256] = {0,};
+       char *e_cookie = NULL;
+       int size = 0;
+       int retval = 0;
+
+       size = security_server_get_cookie_size();
+       retval = security_server_request_cookie(cookie, size);
+
+       if (retval < 0) {
+               ALARM_MGR_EXCEPTION_PRINT(
+                       "security_server_request_cookie failed\n");
+               if (error_code)
+                       *error_code = -1; /*TODO: define error*/
+               return false;
+       }
+
+       e_cookie = g_base64_encode((const guchar *)cookie, size);
+
+       if (NULL == e_cookie)
+       {
+               ALARM_MGR_EXCEPTION_PRINT(
+                       "g_base64_encode failed\n");
+               if (error_code)
+                       *error_code = -1; /*TODO: define error*/
+               return false;
+       }
+
+       if (!org_tizen_alarm_manager_alarm_set_rtc_time
+           (context.proxy, context.pid,
+               time->year, time->month, time->day,
+                time->hour, time->min, time->sec,
+                 e_cookie, &return_code, &error)) {
+               /* dbus-glib error */
+               /*error_code should be set */
+               ALARM_MGR_EXCEPTION_PRINT(
+               "org_tizen_alarm_manager_alarm_set_rtc_time() failed. "
+                    "return_code[%d]\n", return_code);
+               if (error_code)
+                       *error_code = ERR_ALARM_SYSTEM_FAIL; /*-1 means that system
+                                                               failed internally.*/
+               if (e_cookie)
+                       g_free(e_cookie);
+
+               return false;
+       }
+       if (e_cookie)
+       {
+               g_free(e_cookie);
+               e_cookie = NULL;
+       }
+
+       if (return_code != 0) {
+               if (error_code)
+                       *error_code = return_code;
+               return false;
+       }
+
+       return true;
+
+}
+
 bool _send_alarm_delete(alarm_context_t context, alarm_id_t alarm_id,
                        int *error_code)
 {
index da24dbd..2bb484a 100755 (executable)
@@ -551,6 +551,44 @@ EXPORT_API void *alarmmgr_get_alarm_appsvc_info(alarm_id_t alarm_id, int *return
 
 }
 
+EXPORT_API int alarmmgr_set_rtc_time(alarm_date_t *time){
+
+       int ret = 0;
+       int error_code = 0;
+
+       if (!time){
+               ALARM_MGR_EXCEPTION_PRINT("Invalid parameter time\n");
+               return ERR_ALARM_INVALID_PARAM;
+       }
+
+       ret = __sub_init();
+       if (ret < 0){
+               return ret;
+       }
+
+       ALARM_MGR_LOG_PRINT("[alarm-lib]:alarmmgr_set_rtc_time() is called\n");
+
+       if (!__alarm_validate_date(time, &error_code)) {
+               ALARM_MGR_EXCEPTION_PRINT("RTC date error\n");
+               return error_code;
+       }
+
+       if (!__alarm_validate_time(time, &error_code)) {
+               ALARM_MGR_EXCEPTION_PRINT("RTC time error\n");
+               return error_code;
+       }
+
+       time->year-=1900;
+       time->month-=1;
+
+       if (!_send_alarm_set_rtc_time
+               (alarm_context, time, &error_code)){
+                       return error_code;
+       }
+
+       return ALARMMGR_RESULT_SUCCESS;
+
+}
 
 EXPORT_API int alarmmgr_add_alarm_appsvc_with_localtime(alarm_entry_t *alarm, void *bundle_data, alarm_id_t *alarm_id)
 {
@@ -645,6 +683,9 @@ EXPORT_API int alarmmgr_add_alarm_with_localtime(alarm_entry_t *alarm,
        }
 
        alarm_info = (alarm_info_t *) alarm;
+       if (alarm_info == NULL || alarm_id == NULL) {
+               return ERR_ALARM_INVALID_PARAM;
+       }
 
        int error_code;
        alarm_mode_t *mode = &alarm_info->mode;
@@ -660,9 +701,6 @@ EXPORT_API int alarmmgr_add_alarm_with_localtime(alarm_entry_t *alarm,
                            alarm_info->start.year, alarm_info->start.month,
                            alarm_info->start.day);
 
-       if (alarm_info == NULL || alarm_id == NULL) {
-               return ERR_ALARM_INVALID_PARAM;
-       }
        /* TODO: This should be changed to > ALARM_REPEAT_MODE_MAX ? */
        if (mode->repeat >= ALARM_REPEAT_MODE_MAX) {
                return ERR_ALARM_INVALID_PARAM;
index 7de3e14..444e2e0 100644 (file)
 #include<dbus/dbus.h>
 #include<glib.h>
 #include <db-util.h>
+#if !GLIB_CHECK_VERSION (2, 31, 0)
 #include <glib/gmacros.h>
+#else
+#endif
 
 #include"alarm.h"
 #include"alarm-internal.h"
@@ -124,7 +127,7 @@ bool _update_alarms(__alarm_info_t *__alarm_info)
                        pid=%d, app_unique_name='%s', app_service_name='%s', app_service_name_mod='%s',\
                        bundle='%s', year=%d, month=%d, day=%d, hour=%d, min=%d, sec=%d,\
                        day_of_week=%d, repeat=%d, alarm_type=%d,\
-                       reserved_info=%d, dst_service_name='%s', dst_service_name_mod='%s',\
+                       reserved_info=%d, dst_service_name='%s', dst_service_name_mod='%s'\
                        where alarm_id=%d",\
                        (int)__alarm_info->start,
                        (int)__alarm_info->end,
@@ -136,7 +139,7 @@ bool _update_alarms(__alarm_info_t *__alarm_info)
                        (char *)g_quark_to_string(
                                __alarm_info->quark_app_service_name_mod),
                        (char *)g_quark_to_string(
-                               __alarm_info->quark_bundle),                            
+                               __alarm_info->quark_bundle),
                        start->year,
                        start->month,
                        start->day,
index 5e4bac6..fb21867 100755 (executable)
 #include<dbus/dbus.h>
 #include<dbus/dbus-glib-lowlevel.h>
 #include<glib.h>
+#if !GLIB_CHECK_VERSION (2, 31, 0)
 #include <glib/gmacros.h>
+#else
+#endif
 
 /*#include "global-gconf.h"*/
 #include"alarm.h"
@@ -720,6 +723,8 @@ static bool __alarm_create_appsvc(alarm_info_t *alarm_info, alarm_id_t *alarm_id
        __alarm_info->quark_bundle=g_quark_from_string(bundle_data);
        __alarm_info->quark_app_service_name = g_quark_from_string("null");
        __alarm_info->quark_dst_service_name = g_quark_from_string("null");
+       __alarm_info->quark_app_service_name_mod = g_quark_from_string("null");
+       __alarm_info->quark_dst_service_name_mod = g_quark_from_string("null");
 
        __alarm_set_start_and_end_time(alarm_info, __alarm_info);
        memcpy(&(__alarm_info->alarm_info), alarm_info, sizeof(alarm_info_t));
@@ -1613,6 +1618,12 @@ static void __on_system_time_changed(keynode_t *node, void *data)
                            alarm_context.c_due_time);
 
        _set_time(_time);
+
+       vconf_set_dbl(VCONFKEY_SYSTEM_TIMEDIFF, diff_time);
+
+       if (heynoti_publish(SYSTEM_TIME_CHANGED))
+               ALARM_MGR_EXCEPTION_PRINT("alarm-server: Unable to publish heynoti for system time change\n");
+
        __alarm_update_due_time_of_all_items_in_list(diff_time);
 
        ALARM_MGR_LOG_PRINT("2.alarm_context.c_due_time is %d\n",
@@ -1634,6 +1645,134 @@ this value to 0(zero)
        return;
 }
 
+gboolean alarm_manager_alarm_set_rtc_time(void *pObject, int pid,
+                               int year, int mon, int day,
+                               int hour, int min, int sec, char *e_cookie,
+                               int *return_code){
+       guchar *cookie = NULL;
+       gsize size;
+       int retval = 0;
+       gboolean result = true;
+       gid_t call_gid;
+
+       const char *rtc = power_rtc;
+       int fd = 0;
+       struct rtc_time rtc_tm = {0,};
+       struct rtc_wkalrm rtc_wk;
+       struct tm *alarm_tm = NULL;
+       struct tm due_tm = {0,};
+
+
+       if (return_code){
+               *return_code = ALARMMGR_RESULT_SUCCESS;
+       }
+
+       cookie = g_base64_decode(e_cookie, &size);
+       if (NULL == cookie)
+       {
+               if (return_code)
+                       *return_code = ERR_ALARM_NO_PERMISSION;
+               ALARM_MGR_EXCEPTION_PRINT("Unable to decode cookie!!!\n");
+               return true;
+       }
+
+       call_gid = security_server_get_gid("alarm");
+
+       ALARM_MGR_LOG_PRINT("call_gid : %d\n", call_gid);
+
+       retval = security_server_check_privilege((const char *)cookie, call_gid);
+       if (retval < 0) {
+               if (retval == SECURITY_SERVER_API_ERROR_ACCESS_DENIED) {
+                       ALARM_MGR_EXCEPTION_PRINT(
+                               "%s", "access has been denied\n");
+               }
+               ALARM_MGR_EXCEPTION_PRINT("Error has occurred in security_server_check_privilege()\n");
+               if (return_code)
+                       *return_code = ERR_ALARM_NO_PERMISSION;
+       }
+       else {
+
+               /*extract day of the week, day in the year &
+               daylight saving time from system*/
+               time_t ctime;
+               ctime = time(NULL);
+               alarm_tm = localtime(&ctime);
+
+               alarm_tm->tm_year = year;
+               alarm_tm->tm_mon = mon;
+               alarm_tm->tm_mday = day;
+               alarm_tm->tm_hour = hour;
+               alarm_tm->tm_min = min;
+               alarm_tm->tm_sec = sec;
+
+               /*convert to calendar time representation*/
+               time_t rtc_time = mktime(alarm_tm);
+
+               /*convert to Coordinated Universal Time (UTC)*/
+               gmtime_r(&rtc_time, &due_tm);
+
+               fd = open(rtc, O_RDONLY);
+               if (fd == -1) {
+                       ALARM_MGR_EXCEPTION_PRINT("RTC open failed.\n");
+                       if (return_code)
+                               *return_code = ERR_ALARM_SYSTEM_FAIL;
+                       return result;
+               }
+
+               /* Read the RTC time/date */
+               retval = ioctl(fd, RTC_RD_TIME, &rtc_tm);
+               if (retval == -1) {
+                       ALARM_MGR_EXCEPTION_PRINT("RTC_RD_TIME ioctl failed");
+                       close(fd);
+                       if (return_code)
+                               *return_code = ERR_ALARM_SYSTEM_FAIL;
+                       return result;
+               }
+
+               rtc_tm.tm_mday = due_tm.tm_mday;
+               rtc_tm.tm_mon = due_tm.tm_mon;
+               rtc_tm.tm_year = due_tm.tm_year;
+               rtc_tm.tm_hour = due_tm.tm_hour;
+               rtc_tm.tm_min = due_tm.tm_min;
+               rtc_tm.tm_sec = due_tm.tm_sec;
+
+               memcpy(&rtc_wk.time, &rtc_tm, sizeof(rtc_tm));
+
+               rtc_wk.enabled = 1;
+               rtc_wk.pending = 0;
+
+               retval = ioctl(fd, RTC_WKALM_SET, &rtc_wk);
+               if (retval == -1) {
+                       if (errno == ENOTTY) {
+                               ALARM_MGR_EXCEPTION_PRINT("\nAlarm IRQs not"
+                                                         "supported.\n");
+                       }
+                       ALARM_MGR_EXCEPTION_PRINT("RTC_ALM_SET ioctl");
+                       close(fd);
+                       if (return_code)
+                               *return_code = ERR_ALARM_SYSTEM_FAIL;
+               }
+               else{
+                       ALARM_MGR_LOG_PRINT("[alarm-server]RTC alarm is setted");
+                       /* Enable alarm interrupts */
+                       retval = ioctl(fd, RTC_AIE_ON, 0);
+                       if (retval == -1) {
+                               ALARM_MGR_EXCEPTION_PRINT("RTC_AIE_ON ioctl failed");
+                               if (return_code)
+                                       *return_code = ERR_ALARM_SYSTEM_FAIL;
+                       }
+                       close(fd);
+               }
+       }
+
+       if (cookie){
+               g_free(cookie);
+               cookie = NULL;
+       }
+
+       return result;
+
+}
 
 gboolean alarm_manager_alarm_create_appsvc(void *pObject, int pid,
                                    int start_year,
index 03aa308..92a83f2 100644 (file)
       <arg type="i" name="alarm_info_reserved_info" direction="out" />
       <arg type="i" name="return_code" direction="out" />
     </method>
+       <method name="alarm_set_rtc_time">
+      <arg type="i" name="pid" direction="in" />
+      <arg type="i" name="alarm_info_year" direction="in" />
+      <arg type="i" name="alarm_info_month" direction="in" />
+      <arg type="i" name="alarm_info_day" direction="in" />
+      <arg type="i" name="alarm_info_hour" direction="in" />
+      <arg type="i" name="alarm_info_min" direction="in" />
+      <arg type="i" name="alarm_info_sec" direction="in" />
+      <arg type="s" name="cookie" direction="in" />
+      <arg type="i" name="return_code" direction="out" />
+    </method>
   </interface>
 </node>
index 40eaed4..45bee13 100644 (file)
@@ -1,10 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2011-05-11'
+timestamp='2005-04-22'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -18,25 +17,23 @@ timestamp='2011-05-11'
 #
 # 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.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
+# Originally written by Per Bothner <per@bothner.com>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# The plan is that this can be called by configure scripts if you
+# don't specify an explicit build system type.
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,9 +53,8 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -70,11 +66,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )        # Use stdin as input.
@@ -108,7 +104,7 @@ set_cc_for_build='
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -127,7 +123,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
        ;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+esac ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -162,7 +158,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
            arm*) machine=arm-unknown ;;
            sh3el) machine=shl-unknown ;;
            sh3eb) machine=sh-unknown ;;
-           sh5el) machine=sh5le-unknown ;;
            *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
        esac
        # The Operating System including object format, if it has switched
@@ -171,7 +166,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
            arm*|i386|m68k|ns32k|sh3*|sparc|vax)
                eval $set_cc_for_build
                if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-                       | grep -q __ELF__
+                       | grep __ELF__ >/dev/null
                then
                    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
                    # Return netbsd for either.  FIX?
@@ -181,7 +176,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
                fi
                ;;
            *)
-               os=netbsd
+               os=netbsd
                ;;
        esac
        # The OS release
@@ -201,30 +196,62 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
        # contains redundant information, the shorter form:
        # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
        echo "${machine}-${os}${release}"
-       exit ;;
+       exit 0 ;;
+    amd64:OpenBSD:*:*)
+       echo x86_64-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    amiga:OpenBSD:*:*)
+       echo m68k-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    cats:OpenBSD:*:*)
+       echo arm-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    hp300:OpenBSD:*:*)
+       echo m68k-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    luna88k:OpenBSD:*:*)
+       echo m88k-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    mac68k:OpenBSD:*:*)
+       echo m68k-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    macppc:OpenBSD:*:*)
+       echo powerpc-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+       echo m68k-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+       echo m88k-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    mvmeppc:OpenBSD:*:*)
+       echo powerpc-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    sgi:OpenBSD:*:*)
+       echo mips64-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    sun3:OpenBSD:*:*)
+       echo m68k-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
     *:OpenBSD:*:*)
-       UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-       echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-       exit ;;
+       echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
     *:ekkoBSD:*:*)
        echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-       exit ;;
-    *:SolidBSD:*:*)
-       echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-       exit ;;
+       exit 0 ;;
     macppc:MirBSD:*:*)
-       echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-       exit ;;
+       echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+       exit ;;
     *:MirBSD:*:*)
        echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-       exit ;;
+       exit ;;
     alpha:OSF1:*:*)
        case $UNAME_RELEASE in
        *4.0)
                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
                ;;
        *5.*)
-               UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+               UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
                ;;
        esac
        # According to Compaq, /usr/sbin/psrinfo has been available on
@@ -270,46 +297,40 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
        # A Xn.n version is an unreleased experimental baselevel.
        # 1.2 uses "1.2" for uname -r.
        echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-       # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-       exitcode=$?
-       trap '' 0
-       exit $exitcode ;;
+       exit 0 ;;
     Alpha\ *:Windows_NT*:*)
        # How do we know it's Interix rather than the generic POSIX subsystem?
        # Should we change UNAME_MACHINE based on the output of uname instead
        # of the specific Alpha model?
        echo alpha-pc-interix
-       exit ;;
+       exit ;;
     21064:Windows_NT:50:3)
        echo alpha-dec-winnt3.5
-       exit ;;
+       exit ;;
     Amiga*:UNIX_System_V:4.0:*)
        echo m68k-unknown-sysv4
-       exit ;;
+       exit 0;;
     *:[Aa]miga[Oo][Ss]:*:*)
        echo ${UNAME_MACHINE}-unknown-amigaos
-       exit ;;
+       exit ;;
     *:[Mm]orph[Oo][Ss]:*:*)
        echo ${UNAME_MACHINE}-unknown-morphos
-       exit ;;
+       exit ;;
     *:OS/390:*:*)
        echo i370-ibm-openedition
-       exit ;;
+       exit ;;
     *:z/VM:*:*)
        echo s390-ibm-zvmoe
-       exit ;;
+       exit ;;
     *:OS400:*:*)
-       echo powerpc-ibm-os400
-       exit ;;
+        echo powerpc-ibm-os400
+       exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
        echo arm-acorn-riscix${UNAME_RELEASE}
-       exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-       echo arm-unknown-riscos
-       exit ;;
+       exit 0;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
        echo hppa1.1-hitachi-hiuxmpp
-       exit ;;
+       exit 0;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
        # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
        if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -317,51 +338,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
        else
                echo pyramid-pyramid-bsd
        fi
-       exit ;;
+       exit ;;
     NILE*:*:*:dcosx)
        echo pyramid-pyramid-svr4
-       exit ;;
+       exit ;;
     DRS?6000:unix:4.0:6*)
        echo sparc-icl-nx6
-       exit ;;
+       exit ;;
     DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
        case `/usr/bin/uname -p` in
-           sparc) echo sparc-icl-nx7; exit ;;
+           sparc) echo sparc-icl-nx7 && exit 0 ;;
        esac ;;
-    s390x:SunOS:*:*)
-       echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit ;;
     sun4H:SunOS:5.*:*)
        echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit ;;
+       exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
        echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit ;;
-    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-       echo i386-pc-auroraux${UNAME_RELEASE}
-       exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-       eval $set_cc_for_build
-       SUN_ARCH="i386"
-       # If there is a compiler, see if it is configured for 64-bit objects.
-       # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-       # This test works for both compilers.
-       if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-           if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-               (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-               grep IS_64BIT_ARCH >/dev/null
-           then
-               SUN_ARCH="x86_64"
-           fi
-       fi
-       echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit ;;
+       exit 0 ;;
+    i86pc:SunOS:5.*:*)
+       echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+       exit 0 ;;
     sun4*:SunOS:6*:*)
        # According to config.sub, this is the proper way to canonicalize
        # SunOS6.  Hard to guess exactly what SunOS6 will be like, but
        # it's likely to be more like Solaris than SunOS4.
        echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit ;;
+       exit ;;
     sun4*:SunOS:*:*)
        case "`/usr/bin/arch -k`" in
            Series*|S4*)
@@ -370,10 +372,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
        esac
        # Japanese Language versions have a version number like `4.1.3-JL'.
        echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-       exit ;;
+       exit ;;
     sun3*:SunOS:*:*)
        echo m68k-sun-sunos${UNAME_RELEASE}
-       exit ;;
+       exit ;;
     sun*:*:4.2BSD:*)
        UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
        test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -385,10 +387,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
                echo sparc-sun-sunos${UNAME_RELEASE}
                ;;
        esac
-       exit ;;
+       exit ;;
     aushp:SunOS:*:*)
        echo sparc-auspex-sunos${UNAME_RELEASE}
-       exit ;;
+       exit ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -398,41 +400,41 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-       echo m68k-atari-mint${UNAME_RELEASE}
-       exit ;;
+        echo m68k-atari-mint${UNAME_RELEASE}
+       exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
        echo m68k-atari-mint${UNAME_RELEASE}
-       exit ;;
+        exit 0 ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-       echo m68k-atari-mint${UNAME_RELEASE}
-       exit ;;
+        echo m68k-atari-mint${UNAME_RELEASE}
+       exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-       echo m68k-milan-mint${UNAME_RELEASE}
-       exit ;;
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit 0 ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-       echo m68k-hades-mint${UNAME_RELEASE}
-       exit ;;
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit 0 ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-       echo m68k-unknown-mint${UNAME_RELEASE}
-       exit ;;
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit 0 ;;
     m68k:machten:*:*)
        echo m68k-apple-machten${UNAME_RELEASE}
-       exit ;;
+       exit ;;
     powerpc:machten:*:*)
        echo powerpc-apple-machten${UNAME_RELEASE}
-       exit ;;
+       exit ;;
     RISC*:Mach:*:*)
        echo mips-dec-mach_bsd4.3
-       exit ;;
+       exit ;;
     RISC*:ULTRIX:*:*)
        echo mips-dec-ultrix${UNAME_RELEASE}
-       exit ;;
+       exit ;;
     VAX*:ULTRIX*:*:*)
        echo vax-dec-ultrix${UNAME_RELEASE}
-       exit ;;
+       exit ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
        echo clipper-intergraph-clix${UNAME_RELEASE}
-       exit ;;
+       exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
        eval $set_cc_for_build
        sed 's/^        //' << EOF >$dummy.c
@@ -456,36 +458,35 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
          exit (-1);
        }
 EOF
-       $CC_FOR_BUILD -o $dummy $dummy.c &&
-         dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-         SYSTEM_NAME=`$dummy $dummyarg` &&
-           { echo "$SYSTEM_NAME"; exit; }
+       $CC_FOR_BUILD -o $dummy $dummy.c \
+         && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+         && exit 0
        echo mips-mips-riscos${UNAME_RELEASE}
-       exit ;;
+       exit ;;
     Motorola:PowerMAX_OS:*:*)
        echo powerpc-motorola-powermax
-       exit ;;
+       exit ;;
     Motorola:*:4.3:PL8-*)
        echo powerpc-harris-powermax
-       exit ;;
+       exit ;;
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
        echo powerpc-harris-powermax
-       exit ;;
+       exit ;;
     Night_Hawk:Power_UNIX:*:*)
        echo powerpc-harris-powerunix
-       exit ;;
+       exit ;;
     m88k:CX/UX:7*:*)
        echo m88k-harris-cxux7
-       exit ;;
+       exit ;;
     m88k:*:4*:R4*)
        echo m88k-motorola-sysv4
-       exit ;;
+       exit ;;
     m88k:*:3*:R3*)
        echo m88k-motorola-sysv3
-       exit ;;
+       exit ;;
     AViiON:dgux:*:*)
-       # DG/UX returns AViiON for all architectures
-       UNAME_PROCESSOR=`/usr/bin/uname -p`
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
        if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
        then
            if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -498,29 +499,29 @@ EOF
        else
            echo i586-dg-dgux${UNAME_RELEASE}
        fi
-       exit ;;
+       exit ;;
     M88*:DolphinOS:*:*)        # DolphinOS (SVR3)
        echo m88k-dolphin-sysv3
-       exit ;;
+       exit ;;
     M88*:*:R3*:*)
        # Delta 88k system running SVR3
        echo m88k-motorola-sysv3
-       exit ;;
+       exit ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
        echo m88k-tektronix-sysv3
-       exit ;;
+       exit ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
        echo m68k-tektronix-bsd
-       exit ;;
+       exit ;;
     *:IRIX*:*:*)
        echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-       exit ;;
+       exit ;;
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-       echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-       exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+       echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+       exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
        echo i386-ibm-aix
-       exit ;;
+       exit ;;
     ia64:AIX:*:*)
        if [ -x /usr/bin/oslevel ] ; then
                IBM_REV=`/usr/bin/oslevel`
@@ -528,7 +529,7 @@ EOF
                IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
        fi
        echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-       exit ;;
+       exit ;;
     *:AIX:2:3)
        if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
                eval $set_cc_for_build
@@ -543,19 +544,15 @@ EOF
                        exit(0);
                        }
 EOF
-               if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-               then
-                       echo "$SYSTEM_NAME"
-               else
-                       echo rs6000-ibm-aix3.2.5
-               fi
+               $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+               echo rs6000-ibm-aix3.2.5
        elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
                echo rs6000-ibm-aix3.2.4
        else
                echo rs6000-ibm-aix3.2
        fi
-       exit ;;
-    *:AIX:*:[4567])
+       exit ;;
+    *:AIX:*:[45])
        IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
        if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
                IBM_ARCH=rs6000
@@ -568,28 +565,28 @@ EOF
                IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
        fi
        echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-       exit ;;
+       exit ;;
     *:AIX:*:*)
        echo rs6000-ibm-aix
-       exit ;;
+       exit ;;
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
        echo romp-ibm-bsd4.4
-       exit ;;
+       exit ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
        echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-       exit ;;                             # report: romp-ibm BSD 4.3
+       exit 0 ;;                           # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
        echo rs6000-bull-bosx
-       exit ;;
+       exit ;;
     DPX/2?00:B.O.S.:*:*)
        echo m68k-bull-sysv3
-       exit ;;
+       exit ;;
     9000/[34]??:4.3bsd:1.*:*)
        echo m68k-hp-bsd
-       exit ;;
+       exit ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
        echo m68k-hp-bsd4.4
-       exit ;;
+       exit ;;
     9000/[34678]??:HP-UX:*:*)
        HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
        case "${UNAME_MACHINE}" in
@@ -598,52 +595,52 @@ EOF
            9000/[678][0-9][0-9])
                if [ -x /usr/bin/getconf ]; then
                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                   sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                   case "${sc_cpu_version}" in
-                     523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                     528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                     532)                      # CPU_PA_RISC2_0
-                       case "${sc_kernel_bits}" in
-                         32) HP_ARCH="hppa2.0n" ;;
-                         64) HP_ARCH="hppa2.0w" ;;
+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                    case "${sc_cpu_version}" in
+                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+                      532)                      # CPU_PA_RISC2_0
+                        case "${sc_kernel_bits}" in
+                          32) HP_ARCH="hppa2.0n" ;;
+                          64) HP_ARCH="hppa2.0w" ;;
                          '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                       esac ;;
-                   esac
+                        esac ;;
+                    esac
                fi
                if [ "${HP_ARCH}" = "" ]; then
                    eval $set_cc_for_build
-                   sed 's/^            //' << EOF >$dummy.c
+                   sed 's/^              //' << EOF >$dummy.c
 
-               #define _HPUX_SOURCE
-               #include <stdlib.h>
-               #include <unistd.h>
+              #define _HPUX_SOURCE
+              #include <stdlib.h>
+              #include <unistd.h>
 
-               int main ()
-               {
-               #if defined(_SC_KERNEL_BITS)
-                   long bits = sysconf(_SC_KERNEL_BITS);
-               #endif
-                   long cpu  = sysconf (_SC_CPU_VERSION);
+              int main ()
+              {
+              #if defined(_SC_KERNEL_BITS)
+                  long bits = sysconf(_SC_KERNEL_BITS);
+              #endif
+                  long cpu  = sysconf (_SC_CPU_VERSION);
 
-                   switch (cpu)
-                       {
-                       case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-                       case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-                       case CPU_PA_RISC2_0:
-               #if defined(_SC_KERNEL_BITS)
-                           switch (bits)
-                               {
-                               case 64: puts ("hppa2.0w"); break;
-                               case 32: puts ("hppa2.0n"); break;
-                               default: puts ("hppa2.0"); break;
-                               } break;
-               #else  /* !defined(_SC_KERNEL_BITS) */
-                           puts ("hppa2.0"); break;
-               #endif
-                       default: puts ("hppa1.0"); break;
-                       }
-                   exit (0);
-               }
+                  switch (cpu)
+               {
+               case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+               case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+               case CPU_PA_RISC2_0:
+              #if defined(_SC_KERNEL_BITS)
+                   switch (bits)
+                       {
+                       case 64: puts ("hppa2.0w"); break;
+                       case 32: puts ("hppa2.0n"); break;
+                       default: puts ("hppa2.0"); break;
+                       } break;
+              #else  /* !defined(_SC_KERNEL_BITS) */
+                   puts ("hppa2.0"); break;
+              #endif
+               default: puts ("hppa1.0"); break;
+               }
+                  exit (0);
+              }
 EOF
                    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
                    test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -651,19 +648,9 @@ EOF
        esac
        if [ ${HP_ARCH} = "hppa2.0w" ]
        then
-           eval $set_cc_for_build
-
-           # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-           # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-           # generating 64-bit code.  GNU and HP use different nomenclature:
-           #
-           # $ CC_FOR_BUILD=cc ./config.guess
-           # => hppa2.0w-hp-hpux11.23
-           # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-           # => hppa64-hp-hpux11.23
-
-           if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-               grep -q __LP64__
+           # avoid double evaluation of $set_cc_for_build
+           test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+           if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
            then
                HP_ARCH="hppa2.0w"
            else
@@ -671,11 +658,11 @@ EOF
            fi
        fi
        echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-       exit ;;
+       exit ;;
     ia64:HP-UX:*:*)
        HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
        echo ia64-hp-hpux${HPUX_REV}
-       exit ;;
+       exit ;;
     3050*:HI-UX:*:*)
        eval $set_cc_for_build
        sed 's/^        //' << EOF >$dummy.c
@@ -703,254 +690,219 @@ EOF
          exit (0);
        }
 EOF
-       $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-               { echo "$SYSTEM_NAME"; exit; }
+       $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
        echo unknown-hitachi-hiuxwe2
-       exit ;;
+       exit ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
        echo hppa1.1-hp-bsd
-       exit ;;
+       exit ;;
     9000/8??:4.3bsd:*:*)
        echo hppa1.0-hp-bsd
-       exit ;;
+       exit ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
        echo hppa1.0-hp-mpeix
-       exit ;;
+       exit ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
        echo hppa1.1-hp-osf
-       exit ;;
+       exit ;;
     hp8??:OSF1:*:*)
        echo hppa1.0-hp-osf
-       exit ;;
+       exit ;;
     i*86:OSF1:*:*)
        if [ -x /usr/sbin/sysversion ] ; then
            echo ${UNAME_MACHINE}-unknown-osf1mk
        else
            echo ${UNAME_MACHINE}-unknown-osf1
        fi
-       exit ;;
+       exit ;;
     parisc*:Lites*:*:*)
        echo hppa1.1-hp-lites
-       exit ;;
+       exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
        echo c1-convex-bsd
-       exit ;;
+        exit 0 ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
        if getsysinfo -f scalar_acc
        then echo c32-convex-bsd
        else echo c2-convex-bsd
        fi
-       exit ;;
+        exit 0 ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
        echo c34-convex-bsd
-       exit ;;
+        exit 0 ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
        echo c38-convex-bsd
-       exit ;;
+        exit 0 ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
        echo c4-convex-bsd
-       exit ;;
+        exit 0 ;;
     CRAY*Y-MP:*:*:*)
        echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit ;;
+       exit ;;
     CRAY*[A-Z]90:*:*:*)
        echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
        | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
              -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
              -e 's/\.[^.]*$/.X/'
-       exit ;;
+       exit ;;
     CRAY*TS:*:*:*)
        echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit ;;
+       exit ;;
     CRAY*T3E:*:*:*)
        echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit ;;
+       exit ;;
     CRAY*SV1:*:*:*)
        echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit ;;
+       exit ;;
     *:UNICOS/mp:*:*)
        echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit ;;
+       exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
        FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-       FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-       FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-       echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-       exit ;;
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit 0 ;;
     5000:UNIX_System_V:4.*:*)
-       FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-       FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-       echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-       exit ;;
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+       exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
        echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-       exit ;;
+       exit ;;
     sparc*:BSD/OS:*:*)
        echo sparc-unknown-bsdi${UNAME_RELEASE}
-       exit ;;
+       exit ;;
     *:BSD/OS:*:*)
        echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-       exit ;;
+       exit ;;
     *:FreeBSD:*:*)
-       case ${UNAME_MACHINE} in
-           pc98)
-               echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-           amd64)
-               echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-           *)
-               echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-       esac
-       exit ;;
+       echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+       exit 0 ;;
     i*:CYGWIN*:*)
        echo ${UNAME_MACHINE}-pc-cygwin
-       exit ;;
-    *:MINGW*:*)
+       exit ;;
+    i*:MINGW*:*)
        echo ${UNAME_MACHINE}-pc-mingw32
-       exit ;;
-    i*:windows32*:*)
-       # uname -m includes "-pc" on this system.
-       echo ${UNAME_MACHINE}-mingw32
-       exit ;;
+       exit 0 ;;
     i*:PW*:*)
        echo ${UNAME_MACHINE}-pc-pw32
-       exit ;;
-    *:Interix*:*)
-       case ${UNAME_MACHINE} in
-           x86)
-               echo i586-pc-interix${UNAME_RELEASE}
-               exit ;;
-           authenticamd | genuineintel | EM64T)
-               echo x86_64-unknown-interix${UNAME_RELEASE}
-               exit ;;
-           IA64)
-               echo ia64-unknown-interix${UNAME_RELEASE}
-               exit ;;
-       esac ;;
+       exit 0 ;;
+    x86:Interix*:[34]*)
+       echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+       exit 0 ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
        echo i${UNAME_MACHINE}-pc-mks
-       exit ;;
-    8664:Windows_NT:*)
-       echo x86_64-pc-mks
-       exit ;;
+       exit 0 ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
        # How do we know it's Interix rather than the generic POSIX subsystem?
        # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
        # UNAME_MACHINE based on the output of uname instead of i386?
        echo i586-pc-interix
-       exit ;;
+       exit ;;
     i*:UWIN*:*)
        echo ${UNAME_MACHINE}-pc-uwin
-       exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+       exit ;;
+    amd64:CYGWIN*:*:*)
        echo x86_64-unknown-cygwin
-       exit ;;
+       exit ;;
     p*:CYGWIN*:*)
        echo powerpcle-unknown-cygwin
-       exit ;;
+       exit ;;
     prep*:SunOS:5.*:*)
        echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit ;;
+       exit ;;
     *:GNU:*:*)
        # the GNU system
        echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-       exit ;;
+       exit ;;
     *:GNU/*:*:*)
        # other systems with GNU libc and userland
        echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-       exit ;;
+       exit ;;
     i*86:Minix:*:*)
        echo ${UNAME_MACHINE}-pc-minix
-       exit ;;
-    alpha:Linux:*:*)
-       case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-         EV5)   UNAME_MACHINE=alphaev5 ;;
-         EV56)  UNAME_MACHINE=alphaev56 ;;
-         PCA56) UNAME_MACHINE=alphapca56 ;;
-         PCA57) UNAME_MACHINE=alphapca56 ;;
-         EV6)   UNAME_MACHINE=alphaev6 ;;
-         EV67)  UNAME_MACHINE=alphaev67 ;;
-         EV68*) UNAME_MACHINE=alphaev68 ;;
-       esac
-       objdump --private-headers /bin/sh | grep -q ld.so.1
-       if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-       echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-       exit ;;
+       exit 0 ;;
     arm*:Linux:*:*)
-       eval $set_cc_for_build
-       if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-           | grep -q __ARM_EABI__
-       then
-           echo ${UNAME_MACHINE}-unknown-linux-gnu
-       else
-           if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-               | grep -q __ARM_PCS_VFP
-           then
-               echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-           else
-               echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
-           fi
-       fi
-       exit ;;
-    avr32*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
+       exit ;;
     cris:Linux:*:*)
        echo cris-axis-linux-gnu
-       exit ;;
+       exit ;;
     crisv32:Linux:*:*)
        echo crisv32-axis-linux-gnu
-       exit ;;
+       exit ;;
     frv:Linux:*:*)
-       echo frv-unknown-linux-gnu
-       exit ;;
-    i*86:Linux:*:*)
-       LIBC=gnu
-       eval $set_cc_for_build
-       sed 's/^        //' << EOF >$dummy.c
-       #ifdef __dietlibc__
-       LIBC=dietlibc
-       #endif
-EOF
-       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-       echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-       exit ;;
+       echo frv-unknown-linux-gnu
+       exit 0 ;;
     ia64:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
+       exit ;;
     m32r*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
+       exit ;;
     m68*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    mips:Linux:*:* | mips64:Linux:*:*)
+       exit ;;
+    mips:Linux:*:*)
        eval $set_cc_for_build
        sed 's/^        //' << EOF >$dummy.c
        #undef CPU
-       #undef ${UNAME_MACHINE}
-       #undef ${UNAME_MACHINE}el
+       #undef mips
+       #undef mipsel
        #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-       CPU=${UNAME_MACHINE}el
+       CPU=mipsel
        #else
        #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-       CPU=${UNAME_MACHINE}
+       CPU=mips
        #else
        CPU=
        #endif
        #endif
 EOF
-       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-       test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+       test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
        ;;
-    or32:Linux:*:*)
-       echo or32-unknown-linux-gnu
-       exit ;;
-    padre:Linux:*:*)
-       echo sparc-unknown-linux-gnu
-       exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-       echo hppa64-unknown-linux-gnu
-       exit ;;
+    mips64:Linux:*:*)
+       eval $set_cc_for_build
+       sed 's/^        //' << EOF >$dummy.c
+       #undef CPU
+       #undef mips64
+       #undef mips64el
+       #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+       CPU=mips64el
+       #else
+       #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+       CPU=mips64
+       #else
+       CPU=
+       #endif
+       #endif
+EOF
+       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+       test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+       ;;
+    ppc:Linux:*:*)
+       echo powerpc-unknown-linux-gnu
+       exit 0 ;;
+    ppc64:Linux:*:*)
+       echo powerpc64-unknown-linux-gnu
+       exit 0 ;;
+    alpha:Linux:*:*)
+       case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+         EV5)   UNAME_MACHINE=alphaev5 ;;
+         EV56)  UNAME_MACHINE=alphaev56 ;;
+         PCA56) UNAME_MACHINE=alphapca56 ;;
+         PCA57) UNAME_MACHINE=alphapca56 ;;
+         EV6)   UNAME_MACHINE=alphaev6 ;;
+         EV67)  UNAME_MACHINE=alphaev67 ;;
+         EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+       objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+       if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+       echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+       exit 0 ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
        # Look for CPU level
        case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -958,71 +910,115 @@ EOF
          PA8*) echo hppa2.0-unknown-linux-gnu ;;
          *)    echo hppa-unknown-linux-gnu ;;
        esac
-       exit ;;
-    ppc64:Linux:*:*)
-       echo powerpc64-unknown-linux-gnu
-       exit ;;
-    ppc:Linux:*:*)
-       echo powerpc-unknown-linux-gnu
-       exit ;;
+       exit 0 ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+       echo hppa64-unknown-linux-gnu
+       exit 0 ;;
     s390:Linux:*:* | s390x:Linux:*:*)
        echo ${UNAME_MACHINE}-ibm-linux
-       exit ;;
+       exit ;;
     sh64*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
+       exit ;;
     sh*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
+       exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    tile*:Linux:*:*)
-       echo ${UNAME_MACHINE}-tilera-linux-gnu
-       exit ;;
-    vax:Linux:*:*)
-       echo ${UNAME_MACHINE}-dec-linux-gnu
-       exit ;;
+       exit 0 ;;
     x86_64:Linux:*:*)
        echo x86_64-unknown-linux-gnu
-       exit ;;
-    xtensa*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
+       exit 0 ;;
+    i*86:Linux:*:*)
+       # The BFD linker knows what the default object file format is, so
+       # first see if it will tell us. cd to the root directory to prevent
+       # problems with other programs or directories called `ld' in the path.
+       # Set LC_ALL=C to ensure ld outputs messages in English.
+       ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+                        | sed -ne '/supported targets:/!d
+                                   s/[         ][      ]*/ /g
+                                   s/.*supported targets: *//
+                                   s/ .*//
+                                   p'`
+        case "$ld_supported_targets" in
+         elf32-i386)
+               TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+               ;;
+         a.out-i386-linux)
+               echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+               exit 0 ;;
+         coff-i386)
+               echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+               exit 0 ;;
+         "")
+               # Either a pre-BFD a.out linker (linux-gnuoldld) or
+               # one that does not give us useful --help.
+               echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+               exit 0 ;;
+       esac
+       # Determine whether the default compiler is a.out or elf
+       eval $set_cc_for_build
+       sed 's/^        //' << EOF >$dummy.c
+       #include <features.h>
+       #ifdef __ELF__
+       # ifdef __GLIBC__
+       #  if __GLIBC__ >= 2
+       LIBC=gnu
+       #  else
+       LIBC=gnulibc1
+       #  endif
+       # else
+       LIBC=gnulibc1
+       # endif
+       #else
+       #ifdef __INTEL_COMPILER
+       LIBC=gnu
+       #else
+       LIBC=gnuaout
+       #endif
+       #endif
+       #ifdef __dietlibc__
+       LIBC=dietlibc
+       #endif
+EOF
+       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+       test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+       test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+       ;;
     i*86:DYNIX/ptx:4*:*)
        # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
        # earlier versions are messed up and put the nodename in both
        # sysname and nodename.
        echo i386-sequent-sysv4
-       exit ;;
+       exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
-       # Unixware is an offshoot of SVR4, but it has its own version
-       # number series starting with 2...
-       # I am not positive that other SVR4 systems won't match this,
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
        # I just have to hope.  -- rms.
-       # Use sysv4.2uw... so that sysv4* matches it.
+        # Use sysv4.2uw... so that sysv4* matches it.
        echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-       exit ;;
+       exit ;;
     i*86:OS/2:*:*)
        # If we were able to find `uname', then EMX Unix compatibility
        # is probably installed.
        echo ${UNAME_MACHINE}-pc-os2-emx
-       exit ;;
+       exit ;;
     i*86:XTS-300:*:STOP)
        echo ${UNAME_MACHINE}-unknown-stop
-       exit ;;
+       exit ;;
     i*86:atheos:*:*)
        echo ${UNAME_MACHINE}-unknown-atheos
-       exit ;;
-    i*86:syllable:*:*)
+       exit ;;
+       i*86:syllable:*:*)
        echo ${UNAME_MACHINE}-pc-syllable
-       exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+       exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
        echo i386-unknown-lynxos${UNAME_RELEASE}
-       exit ;;
+       exit ;;
     i*86:*DOS:*:*)
        echo ${UNAME_MACHINE}-pc-msdosdjgpp
-       exit ;;
+       exit ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
        UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
        if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -1030,16 +1026,15 @@ EOF
        else
                echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
        fi
-       exit ;;
-    i*86:*:5:[678]*)
-       # UnixWare 7.x, OpenUNIX and OpenServer 6.
+       exit 0 ;;
+    i*86:*:5:[78]*)
        case `/bin/uname -X | grep "^Machine"` in
            *486*)           UNAME_MACHINE=i486 ;;
            *Pentium)        UNAME_MACHINE=i586 ;;
            *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
        esac
        echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-       exit ;;
+       exit ;;
     i*86:*:3.2:*)
        if test -f /usr/options/cb.name; then
                UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1057,86 +1052,73 @@ EOF
        else
                echo ${UNAME_MACHINE}-pc-sysv32
        fi
-       exit ;;
+       exit ;;
     pc:*:*:*)
        # Left here for compatibility:
-       # uname -m prints for DJGPP always 'pc', but it prints nothing about
-       # the processor, so we play safe by assuming i586.
-       # Note: whatever this is, it MUST be the same as what config.sub
-       # prints for the "djgpp" host, or else GDB configury will decide that
-       # this is a cross-build.
-       echo i586-pc-msdosdjgpp
-       exit ;;
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i386.
+       echo i386-pc-msdosdjgpp
+        exit 0 ;;
     Intel:Mach:3*:*)
        echo i386-pc-mach3
-       exit ;;
+       exit ;;
     paragon:*:*:*)
        echo i860-intel-osf1
-       exit ;;
+       exit ;;
     i860:*:4.*:*) # i860-SVR4
        if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
          echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
        else # Add other i860-SVR4 vendors below as they are discovered.
          echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
        fi
-       exit ;;
+       exit ;;
     mini*:CTIX:SYS*5:*)
        # "miniframe"
        echo m68010-convergent-sysv
-       exit ;;
+       exit ;;
     mc68k:UNIX:SYSTEM5:3.51m)
        echo m68k-convergent-sysv
-       exit ;;
+       exit ;;
     M680?0:D-NIX:5.3:*)
        echo m68k-diab-dnix
-       exit ;;
+       exit ;;
     M68*:*:R3V[5678]*:*)
-       test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+       test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
        OS_REL=''
        test -r /etc/.relid \
        && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-         && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+         && echo i486-ncr-sysv4.3${OS_REL} && exit 0
        /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-         && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+         && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-       /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-         && { echo i486-ncr-sysv4; exit; } ;;
-    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-       OS_REL='.3'
-       test -r /etc/.relid \
-           && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-       /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-           && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-       /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-           && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-       /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-           && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && echo i486-ncr-sysv4 && exit 0 ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
        echo m68k-unknown-lynxos${UNAME_RELEASE}
-       exit ;;
+       exit ;;
     mc68030:UNIX_System_V:4.*:*)
        echo m68k-atari-sysv4
-       exit ;;
+       exit ;;
     TSUNAMI:LynxOS:2.*:*)
        echo sparc-unknown-lynxos${UNAME_RELEASE}
-       exit ;;
+       exit ;;
     rs6000:LynxOS:2.*:*)
        echo rs6000-unknown-lynxos${UNAME_RELEASE}
-       exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+       exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
        echo powerpc-unknown-lynxos${UNAME_RELEASE}
-       exit ;;
+       exit ;;
     SM[BE]S:UNIX_SV:*:*)
        echo mips-dde-sysv${UNAME_RELEASE}
-       exit ;;
+       exit ;;
     RM*:ReliantUNIX-*:*:*)
        echo mips-sni-sysv4
-       exit ;;
+       exit ;;
     RM*:SINIX-*:*:*)
        echo mips-sni-sysv4
-       exit ;;
+       exit ;;
     *:SINIX-*:*:*)
        if uname -p 2>/dev/null >/dev/null ; then
                UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1144,94 +1126,73 @@ EOF
        else
                echo ns32k-sni-sysv
        fi
-       exit ;;
-    PENTIUM:*:4.0*:*)  # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                       # says <Richard.M.Bartel@ccMail.Census.GOV>
-       echo i586-unisys-sysv4
-       exit ;;
+       exit ;;
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit 0 ;;
     *:UNIX_System_V:4*:FTX*)
        # From Gerald Hewes <hewes@openmarket.com>.
        # How about differentiating between stratus architectures? -djm
        echo hppa1.1-stratus-sysv4
-       exit ;;
+       exit ;;
     *:*:*:FTX*)
        # From seanf@swdc.stratus.com.
        echo i860-stratus-sysv4
-       exit ;;
+       exit ;;
     i*86:VOS:*:*)
        # From Paul.Green@stratus.com.
        echo ${UNAME_MACHINE}-stratus-vos
-       exit ;;
+       exit ;;
     *:VOS:*:*)
        # From Paul.Green@stratus.com.
        echo hppa1.1-stratus-vos
-       exit ;;
+       exit ;;
     mc68*:A/UX:*:*)
        echo m68k-apple-aux${UNAME_RELEASE}
-       exit ;;
+       exit ;;
     news*:NEWS-OS:6*:*)
        echo mips-sony-newsos6
-       exit ;;
+       exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
        if [ -d /usr/nec ]; then
-               echo mips-nec-sysv${UNAME_RELEASE}
+               echo mips-nec-sysv${UNAME_RELEASE}
        else
-               echo mips-unknown-sysv${UNAME_RELEASE}
+               echo mips-unknown-sysv${UNAME_RELEASE}
        fi
-       exit ;;
+        exit 0 ;;
     BeBox:BeOS:*:*)    # BeOS running on hardware made by Be, PPC only.
        echo powerpc-be-beos
-       exit ;;
+       exit ;;
     BeMac:BeOS:*:*)    # BeOS running on Mac or Mac clone, PPC only.
        echo powerpc-apple-beos
-       exit ;;
+       exit ;;
     BePC:BeOS:*:*)     # BeOS running on Intel PC compatible.
        echo i586-pc-beos
-       exit ;;
-    BePC:Haiku:*:*)    # Haiku running on Intel PC compatible.
-       echo i586-pc-haiku
-       exit ;;
+       exit 0 ;;
     SX-4:SUPER-UX:*:*)
        echo sx4-nec-superux${UNAME_RELEASE}
-       exit ;;
+       exit ;;
     SX-5:SUPER-UX:*:*)
        echo sx5-nec-superux${UNAME_RELEASE}
-       exit ;;
+       exit ;;
     SX-6:SUPER-UX:*:*)
        echo sx6-nec-superux${UNAME_RELEASE}
-       exit ;;
-    SX-7:SUPER-UX:*:*)
-       echo sx7-nec-superux${UNAME_RELEASE}
-       exit ;;
-    SX-8:SUPER-UX:*:*)
-       echo sx8-nec-superux${UNAME_RELEASE}
-       exit ;;
-    SX-8R:SUPER-UX:*:*)
-       echo sx8r-nec-superux${UNAME_RELEASE}
-       exit ;;
+       exit 0 ;;
     Power*:Rhapsody:*:*)
        echo powerpc-apple-rhapsody${UNAME_RELEASE}
-       exit ;;
+       exit ;;
     *:Rhapsody:*:*)
        echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-       exit ;;
+       exit ;;
     *:Darwin:*:*)
        UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
        case $UNAME_PROCESSOR in
-           i386)
-               eval $set_cc_for_build
-               if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-                 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-                     (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-                     grep IS_64BIT_ARCH >/dev/null
-                 then
-                     UNAME_PROCESSOR="x86_64"
-                 fi
-               fi ;;
+           *86) UNAME_PROCESSOR=i686 ;;
            unknown) UNAME_PROCESSOR=powerpc ;;
        esac
        echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-       exit ;;
+       exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
        UNAME_PROCESSOR=`uname -p`
        if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1239,28 +1200,25 @@ EOF
                UNAME_MACHINE=pc
        fi
        echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-       exit ;;
+       exit ;;
     *:QNX:*:4*)
        echo i386-pc-qnx
-       exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
-       echo neo-tandem-nsk${UNAME_RELEASE}
-       exit ;;
+       exit 0 ;;
     NSE-?:NONSTOP_KERNEL:*:*)
        echo nse-tandem-nsk${UNAME_RELEASE}
-       exit ;;
+       exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
        echo nsr-tandem-nsk${UNAME_RELEASE}
-       exit ;;
+       exit ;;
     *:NonStop-UX:*:*)
        echo mips-compaq-nonstopux
-       exit ;;
+       exit ;;
     BS2000:POSIX*:*:*)
        echo bs2000-siemens-sysv
-       exit ;;
+       exit ;;
     DS/*:UNIX_System_V:*:*)
        echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-       exit ;;
+       exit ;;
     *:Plan9:*:*)
        # "uname -m" is not consistent, so use $cputype instead. 386
        # is converted to i386 for consistency with other x86
@@ -1271,50 +1229,41 @@ EOF
            UNAME_MACHINE="$cputype"
        fi
        echo ${UNAME_MACHINE}-unknown-plan9
-       exit ;;
+       exit ;;
     *:TOPS-10:*:*)
        echo pdp10-unknown-tops10
-       exit ;;
+       exit ;;
     *:TENEX:*:*)
        echo pdp10-unknown-tenex
-       exit ;;
+       exit ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
        echo pdp10-dec-tops20
-       exit ;;
+       exit ;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
        echo pdp10-xkl-tops20
-       exit ;;
+       exit ;;
     *:TOPS-20:*:*)
        echo pdp10-unknown-tops20
-       exit ;;
+       exit ;;
     *:ITS:*:*)
        echo pdp10-unknown-its
-       exit ;;
+       exit ;;
     SEI:*:*:SEIUX)
-       echo mips-sei-seiux${UNAME_RELEASE}
-       exit ;;
+        echo mips-sei-seiux${UNAME_RELEASE}
+       exit ;;
     *:DragonFly:*:*)
        echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-       exit ;;
+       exit ;;
     *:*VMS:*:*)
-       UNAME_MACHINE=`(uname -p) 2>/dev/null`
+       UNAME_MACHINE=`(uname -p) 2>/dev/null`
        case "${UNAME_MACHINE}" in
-           A*) echo alpha-dec-vms ; exit ;;
-           I*) echo ia64-dec-vms ; exit ;;
-           V*) echo vax-dec-vms ; exit ;;
+           A*) echo alpha-dec-vms && exit 0 ;;
+           I*) echo ia64-dec-vms && exit 0 ;;
+           V*) echo vax-dec-vms && exit 0 ;;
        esac ;;
     *:XENIX:*:SysV)
        echo i386-pc-xenix
-       exit ;;
-    i*86:skyos:*:*)
-       echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-       exit ;;
-    i*86:rdos:*:*)
-       echo ${UNAME_MACHINE}-pc-rdos
-       exit ;;
-    i*86:AROS:*:*)
-       echo ${UNAME_MACHINE}-pc-aros
-       exit ;;
+       exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1337,16 +1286,16 @@ main ()
 #include <sys/param.h>
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-       "4"
+          "4"
 #else
-       ""
+         ""
 #endif
-       ); exit (0);
+         ); exit (0);
 #endif
 #endif
 
 #if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
+  printf ("arm-acorn-riscix"); exit (0);
 #endif
 
 #if defined (hp300) && !defined (hpux)
@@ -1435,12 +1384,11 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-       { echo "$SYSTEM_NAME"; exit; }
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
 
 # Apollos put the system type in the environment.
 
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
 
 # Convex versions that predate uname can use getsysinfo(1)
 
@@ -1449,22 +1397,22 @@ then
     case `getsysinfo -f cpu_type` in
     c1*)
        echo c1-convex-bsd
-       exit ;;
+       exit ;;
     c2*)
        if getsysinfo -f scalar_acc
        then echo c32-convex-bsd
        else echo c2-convex-bsd
        fi
-       exit ;;
+       exit ;;
     c34*)
        echo c34-convex-bsd
-       exit ;;
+       exit ;;
     c38*)
        echo c38-convex-bsd
-       exit ;;
+       exit ;;
     c4*)
        echo c4-convex-bsd
-       exit ;;
+       exit ;;
     esac
 fi
 
@@ -1475,9 +1423,9 @@ This script, last modified $timestamp, has failed to recognize
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
index 30fdca8..87a1ee4 100644 (file)
@@ -1,10 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2011-03-23'
+timestamp='2005-04-22'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -22,26 +21,22 @@ timestamp='2011-03-23'
 #
 # 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.
-#
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-
 # Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# diff and a properly formatted ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -75,9 +70,8 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -89,11 +83,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )        # Use stdin as input.
@@ -105,7 +99,7 @@ while test $# -gt 0 ; do
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit ;;
+       exit 0;;
 
     * )
        break ;;
@@ -124,11 +118,8 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
-  kopensolaris*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -154,13 +145,10 @@ case $os in
        -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
        -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
        -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-       -apple | -axis | -knuth | -cray | -microblaze)
+       -apple | -axis | -knuth | -cray)
                os=
                basic_machine=$1
                ;;
-       -bluegene*)
-               os=-cnk
-               ;;
        -sim | -cisco | -oki | -wec | -winbond)
                os=
                basic_machine=$1
@@ -175,17 +163,13 @@ case $os in
                os=-chorusos
                basic_machine=$1
                ;;
-       -chorusrdb)
-               os=-chorusrdb
+       -chorusrdb)
+               os=-chorusrdb
                basic_machine=$1
-               ;;
+               ;;
        -hiux*)
                os=-hiuxwe2
                ;;
-       -sco6)
-               os=-sco5v6
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
        -sco5)
                os=-sco3.2v5
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -202,10 +186,6 @@ case $os in
                # Don't forget version if it is 3.2v4 or newer.
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
                ;;
-       -sco5v6*)
-               # Don't forget version if it is 3.2v4 or newer.
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
        -sco*)
                os=-sco3.2v2
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -250,28 +230,23 @@ case $basic_machine in
        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
        | am33_2.0 \
-       | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+       | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
        | bfin \
        | c4x | clipper \
        | d10v | d30v | dlx | dsp16xx \
-       | fido | fr30 | frv \
+       | fr30 | frv \
        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
        | i370 | i860 | i960 | ia64 \
        | ip2k | iq2000 \
-       | lm32 \
-       | m32c | m32r | m32rle | m68000 | m68k | m88k \
-       | maxq | mb | microblaze | mcore | mep | metag \
+       | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
        | mips | mipsbe | mipseb | mipsel | mipsle \
        | mips16 \
        | mips64 | mips64el \
-       | mips64octeon | mips64octeonel \
-       | mips64orion | mips64orionel \
-       | mips64r5900 | mips64r5900el \
        | mips64vr | mips64vrel \
+       | mips64orion | mips64orionel \
        | mips64vr4100 | mips64vr4100el \
        | mips64vr4300 | mips64vr4300el \
        | mips64vr5000 | mips64vr5000el \
-       | mips64vr5900 | mips64vr5900el \
        | mipsisa32 | mipsisa32el \
        | mipsisa32r2 | mipsisa32r2el \
        | mipsisa64 | mipsisa64el \
@@ -280,63 +255,31 @@ case $basic_machine in
        | mipsisa64sr71k | mipsisa64sr71kel \
        | mipstx39 | mipstx39el \
        | mn10200 | mn10300 \
-       | moxie \
-       | mt \
        | msp430 \
-       | nds32 | nds32le | nds32be \
-       | nios | nios2 \
        | ns16k | ns32k \
-       | open8 \
-       | or32 \
+       | openrisc | or32 \
        | pdp10 | pdp11 | pj | pjl \
-       | powerpc | powerpc64 | powerpc64le | powerpcle \
+       | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
        | pyramid \
-       | rx \
-       | score \
-       | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+       | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
        | sh64 | sh64le \
-       | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-       | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-       | spu \
-       | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-       | ubicom32 \
+       | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+       | sparcv8 | sparcv9 | sparcv9b \
+       | strongarm \
+       | tahoe | thumb | tic4x | tic80 | tron \
        | v850 | v850e \
        | we32k \
-       | x86 | xc16x | xstormy16 | xtensa \
-       | z8k | z80)
+       | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+       | z8k)
                basic_machine=$basic_machine-unknown
                ;;
-       c54x)
-               basic_machine=tic54x-unknown
-               ;;
-       c55x)
-               basic_machine=tic55x-unknown
-               ;;
-       c6x)
-               basic_machine=tic6x-unknown
-               ;;
-       m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+       m6811 | m68hc11 | m6812 | m68hc12)
                # Motorola 68HC11/12.
                basic_machine=$basic_machine-unknown
                os=-none
                ;;
        m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
                ;;
-       ms1)
-               basic_machine=mt-unknown
-               ;;
-
-       strongarm | thumb | xscale)
-               basic_machine=arm-unknown
-               ;;
-
-       xscaleeb)
-               basic_machine=armeb-unknown
-               ;;
-
-       xscaleel)
-               basic_machine=armel-unknown
-               ;;
 
        # We use `pc' rather than `unknown'
        # because (1) that's what they normally are, and
@@ -356,32 +299,28 @@ case $basic_machine in
        | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
        | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-       | avr-* | avr32-* \
+       | avr-* \
        | bfin-* | bs2000-* \
-       | c[123]* | c30-* | [cjt]90-* | c4x-* \
+       | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
        | clipper-* | craynv-* | cydra-* \
        | d10v-* | d30v-* | dlx-* \
        | elxsi-* \
-       | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+       | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
        | h8300-* | h8500-* \
        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
        | i*86-* | i860-* | i960-* | ia64-* \
        | ip2k-* | iq2000-* \
-       | lm32-* \
-       | m32c-* | m32r-* | m32rle-* \
+       | m32r-* | m32rle-* \
        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-       | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+       | m88110-* | m88k-* | maxq-* | mcore-* \
        | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
        | mips16-* \
        | mips64-* | mips64el-* \
-       | mips64octeon-* | mips64octeonel-* \
-       | mips64orion-* | mips64orionel-* \
-       | mips64r5900-* | mips64r5900el-* \
        | mips64vr-* | mips64vrel-* \
+       | mips64orion-* | mips64orionel-* \
        | mips64vr4100-* | mips64vr4100el-* \
        | mips64vr4300-* | mips64vr4300el-* \
        | mips64vr5000-* | mips64vr5000el-* \
-       | mips64vr5900-* | mips64vr5900el-* \
        | mipsisa32-* | mipsisa32el-* \
        | mipsisa32r2-* | mipsisa32r2el-* \
        | mipsisa64-* | mipsisa64el-* \
@@ -390,37 +329,27 @@ case $basic_machine in
        | mipsisa64sr71k-* | mipsisa64sr71kel-* \
        | mipstx39-* | mipstx39el-* \
        | mmix-* \
-       | mt-* \
        | msp430-* \
-       | nds32-* | nds32le-* | nds32be-* \
-       | nios-* | nios2-* \
        | none-* | np1-* | ns16k-* | ns32k-* \
-       | open8-* \
        | orion-* \
        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-       | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+       | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
        | pyramid-* \
-       | romp-* | rs6000-* | rx-* \
-       | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+       | romp-* | rs6000-* \
+       | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-       | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+       | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
        | sparclite-* \
-       | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
-       | tahoe-* \
+       | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+       | tahoe-* | thumb-* \
        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-       | tile-* | tilegx-* \
        | tron-* \
-       | ubicom32-* \
        | v850-* | v850e-* | vax-* \
        | we32k-* \
-       | x86-* | x86_64-* | xc16x-* | xps100-* \
-       | xstormy16-* | xtensa*-* \
+       | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+       | xstormy16-* | xtensa-* \
        | ymp-* \
-       | z8k-* | z80-*)
-               ;;
-       # Recognize the basic CPU types without company name, with glob match.
-       xtensa*)
-               basic_machine=$basic_machine-unknown
+       | z8k-*)
                ;;
        # Recognize the various machine names and aliases which stand
        # for a CPU type and a company and sometimes even an OS.
@@ -438,7 +367,7 @@ case $basic_machine in
                basic_machine=a29k-amd
                os=-udi
                ;;
-       abacus)
+       abacus)
                basic_machine=abacus-unknown
                ;;
        adobe68k)
@@ -484,10 +413,6 @@ case $basic_machine in
                basic_machine=m68k-apollo
                os=-bsd
                ;;
-       aros)
-               basic_machine=i386-pc
-               os=-aros
-               ;;
        aux)
                basic_machine=m68k-apple
                os=-aux
@@ -496,35 +421,10 @@ case $basic_machine in
                basic_machine=ns32k-sequent
                os=-dynix
                ;;
-       blackfin)
-               basic_machine=bfin-unknown
-               os=-linux
-               ;;
-       blackfin-*)
-               basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-               os=-linux
-               ;;
-       bluegene*)
-               basic_machine=powerpc-ibm
-               os=-cnk
-               ;;
-       c54x-*)
-               basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       c55x-*)
-               basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       c6x-*)
-               basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
        c90)
                basic_machine=c90-cray
                os=-unicos
                ;;
-       cegcc)
-               basic_machine=arm-unknown
-               os=-cegcc
-               ;;
        convex-c1)
                basic_machine=c1-convex
                os=-bsd
@@ -553,8 +453,8 @@ case $basic_machine in
                basic_machine=craynv-cray
                os=-unicosmp
                ;;
-       cr16 | cr16-*)
-               basic_machine=cr16-unknown
+       cr16c)
+               basic_machine=cr16c-unknown
                os=-elf
                ;;
        crds | unos)
@@ -592,10 +492,6 @@ case $basic_machine in
                basic_machine=m88k-motorola
                os=-sysv3
                ;;
-       dicos)
-               basic_machine=i686-pc
-               os=-dicos
-               ;;
        djgpp)
                basic_machine=i586-pc
                os=-msdosdjgpp
@@ -750,14 +646,6 @@ case $basic_machine in
                basic_machine=m68k-isi
                os=-sysv
                ;;
-       m68knommu)
-               basic_machine=m68k-unknown
-               os=-linux
-               ;;
-       m68knommu-*)
-               basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-               os=-linux
-               ;;
        m88k-omron*)
                basic_machine=m88k-omron
                ;;
@@ -769,17 +657,10 @@ case $basic_machine in
                basic_machine=ns32k-utek
                os=-sysv
                ;;
-       microblaze)
-               basic_machine=microblaze-xilinx
-               ;;
        mingw32)
                basic_machine=i386-pc
                os=-mingw32
                ;;
-       mingw32ce)
-               basic_machine=arm-unknown
-               os=-mingw32ce
-               ;;
        miniframe)
                basic_machine=m68000-convergent
                ;;
@@ -805,9 +686,6 @@ case $basic_machine in
                basic_machine=i386-pc
                os=-msdos
                ;;
-       ms1-*)
-               basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-               ;;
        mvs)
                basic_machine=i370-ibm
                os=-mvs
@@ -876,12 +754,6 @@ case $basic_machine in
        np1)
                basic_machine=np1-gould
                ;;
-       neo-tandem)
-               basic_machine=neo-tandem
-               ;;
-       nse-tandem)
-               basic_machine=nse-tandem
-               ;;
        nsr-tandem)
                basic_machine=nsr-tandem
                ;;
@@ -889,8 +761,9 @@ case $basic_machine in
                basic_machine=hppa1.1-oki
                os=-proelf
                ;;
-       openrisc | openrisc-*)
+       or32 | or32-*)
                basic_machine=or32-unknown
+               os=-coff
                ;;
        os400)
                basic_machine=powerpc-ibm
@@ -912,14 +785,6 @@ case $basic_machine in
                basic_machine=i860-intel
                os=-osf
                ;;
-       parisc)
-               basic_machine=hppa-unknown
-               os=-linux
-               ;;
-       parisc-*)
-               basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-               os=-linux
-               ;;
        pbd)
                basic_machine=sparc-tti
                ;;
@@ -929,12 +794,6 @@ case $basic_machine in
        pc532 | pc532-*)
                basic_machine=ns32k-pc532
                ;;
-       pc98)
-               basic_machine=i386-pc
-               ;;
-       pc98-*)
-               basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
        pentium | p5 | k5 | k6 | nexgen | viac3)
                basic_machine=i586-pc
                ;;
@@ -964,10 +823,9 @@ case $basic_machine in
                ;;
        power)  basic_machine=power-ibm
                ;;
-       ppc | ppcbe)    basic_machine=powerpc-unknown
+       ppc)    basic_machine=powerpc-unknown
                ;;
-       ppc-* | ppcbe-*)
-               basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+       ppc-*)  basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        ppcle | powerpclittle | ppc-le | powerpc-little)
                basic_machine=powerpcle-unknown
@@ -992,10 +850,6 @@ case $basic_machine in
                basic_machine=i586-unknown
                os=-pw32
                ;;
-       rdos)
-               basic_machine=i386-pc
-               os=-rdos
-               ;;
        rom68k)
                basic_machine=m68k-rom68k
                os=-coff
@@ -1022,10 +876,6 @@ case $basic_machine in
        sb1el)
                basic_machine=mipsisa64sb1el-unknown
                ;;
-       sde)
-               basic_machine=mipsisa32-sde
-               os=-elf
-               ;;
        sei)
                basic_machine=mips-sei
                os=-seiux
@@ -1037,9 +887,6 @@ case $basic_machine in
                basic_machine=sh-hitachi
                os=-hms
                ;;
-       sh5el)
-               basic_machine=sh5le-unknown
-               ;;
        sh64)
                basic_machine=sh64-unknown
                ;;
@@ -1061,9 +908,6 @@ case $basic_machine in
                basic_machine=i860-stratus
                os=-sysv4
                ;;
-       strongarm-* | thumb-*)
-               basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
        sun2)
                basic_machine=m68000-sun
                ;;
@@ -1120,14 +964,17 @@ case $basic_machine in
                basic_machine=t90-cray
                os=-unicos
                ;;
-       # This must be matched before tile*.
-       tilegx*)
-               basic_machine=tilegx-unknown
-               os=-linux-gnu
+       tic54x | c54x*)
+               basic_machine=tic54x-unknown
+               os=-coff
+               ;;
+       tic55x | c55x*)
+               basic_machine=tic55x-unknown
+               os=-coff
                ;;
-       tile*)
-               basic_machine=tile-unknown
-               os=-linux-gnu
+       tic6x | c6x*)
+               basic_machine=tic6x-unknown
+               os=-coff
                ;;
        tx39)
                basic_machine=mipstx39-unknown
@@ -1196,9 +1043,6 @@ case $basic_machine in
        xps | xps100)
                basic_machine=xps100-honeywell
                ;;
-       xscale-* | xscalee[bl]-*)
-               basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
-               ;;
        ymp)
                basic_machine=ymp-cray
                os=-unicos
@@ -1207,10 +1051,6 @@ case $basic_machine in
                basic_machine=z8k-unknown
                os=-sim
                ;;
-       z80-*-coff)
-               basic_machine=z80-unknown
-               os=-sim
-               ;;
        none)
                basic_machine=none-none
                os=-none
@@ -1249,10 +1089,13 @@ case $basic_machine in
        we32k)
                basic_machine=we32k-att
                ;;
-       sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+       sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
                basic_machine=sh-unknown
                ;;
-       sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+       sh64)
+               basic_machine=sh64-unknown
+               ;;
+       sparc | sparcv8 | sparcv9 | sparcv9b)
                basic_machine=sparc-sun
                ;;
        cydra)
@@ -1296,12 +1139,9 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
-       # First match some system type aliases
-       # that might get confused with valid system types.
+        # First match some system type aliases
+        # that might get confused with valid system types.
        # -solaris* is a basic system type, with this one exception.
-       -auroraux)
-               os=-auroraux
-               ;;
        -solaris1 | -solaris1.*)
                os=`echo $os | sed -e 's|solaris1|sunos4|'`
                ;;
@@ -1322,31 +1162,26 @@ case $os in
        # Each alternative MUST END IN A *, to match a version number.
        # -sysv* is not here because it comes later, after sysvr4.
        -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-             | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-             | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-             | -sym* | -kopensolaris* \
+             | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+             | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
              | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-             | -aos* | -aros* \
+             | -aos* \
              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
              | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-             | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-             | -openbsd* | -solidbsd* \
+             | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
              | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
              | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-             | -chorusos* | -chorusrdb* | -cegcc* \
+             | -chorusos* | -chorusrdb* \
              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-             | -mingw32* | -linux-gnu* | -linux-android* \
-             | -linux-newlib* | -linux-uclibc* \
-             | -uxpv* | -beos* | -mpeix* | -udk* \
+             | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-             | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-             | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+             | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
        -qnx*)
@@ -1364,7 +1199,7 @@ case $os in
                os=`echo $os | sed -e 's|nto|nto-qnx|'`
                ;;
        -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-             | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+             | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
              | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
                ;;
        -mac*)
@@ -1385,7 +1220,7 @@ case $os in
        -opened*)
                os=-openedition
                ;;
-       -os400*)
+        -os400*)
                os=-os400
                ;;
        -wince*)
@@ -1434,7 +1269,7 @@ case $os in
        -sinix*)
                os=-sysv4
                ;;
-       -tpf*)
+        -tpf*)
                os=-tpf
                ;;
        -triton*)
@@ -1476,11 +1311,6 @@ case $os in
        -zvmoe)
                os=-zvmoe
                ;;
-       -dicos*)
-               os=-dicos
-               ;;
-       -nacl*)
-               ;;
        -none)
                ;;
        *)
@@ -1503,12 +1333,6 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
-       score-*)
-               os=-elf
-               ;;
-       spu-*)
-               os=-elf
-               ;;
        *-acorn)
                os=-riscix1.2
                ;;
@@ -1518,18 +1342,9 @@ case $basic_machine in
        arm*-semi)
                os=-aout
                ;;
-       c4x-* | tic4x-*)
-               os=-coff
-               ;;
-       tic54x-*)
-               os=-coff
-               ;;
-       tic55x-*)
-               os=-coff
-               ;;
-       tic6x-*)
-               os=-coff
-               ;;
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
        # This must come before the *-dec entry.
        pdp10-*)
                os=-tops20
@@ -1555,9 +1370,6 @@ case $basic_machine in
        m68*-cisco)
                os=-aout
                ;;
-       mep-*)
-               os=-elf
-               ;;
        mips*-cisco)
                os=-elf
                ;;
@@ -1576,13 +1388,10 @@ case $basic_machine in
        *-be)
                os=-beos
                ;;
-       *-haiku)
-               os=-haiku
-               ;;
        *-ibm)
                os=-aix
                ;;
-       *-knuth)
+       *-knuth)
                os=-mmixware
                ;;
        *-wec)
@@ -1687,7 +1496,7 @@ case $basic_machine in
                        -sunos*)
                                vendor=sun
                                ;;
-                       -cnk*|-aix*)
+                       -aix*)
                                vendor=ibm
                                ;;
                        -beos*)
@@ -1750,7 +1559,7 @@ case $basic_machine in
 esac
 
 echo $basic_machine$os
-exit
+exit 0
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/debian/alarm-server.postinst b/debian/alarm-server.postinst
new file mode 100644 (file)
index 0000000..f21c28f
--- /dev/null
@@ -0,0 +1,4 @@
+#!/bin/sh
+heynotitool set setting_time_changed -a
+vconftool set -t int db/system/timechange 0 -i
+vconftool set -t double memory/system/timediff 0 -i
index e5b3bdf..3889502 100644 (file)
@@ -1,7 +1,792 @@
+alarm-manager (0.4.51) unstable; urgency=low
+
+  * set a vconf when time is changed
+  * Git: slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.51
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Mon, 04 Jun 2012 19:10:36 +0900
+
+alarm-manager (0.4.50) unstable; urgency=low
+
+  * Add vconf key set
+  * Git: slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.50
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 17 May 2012 19:44:25 +0900
+
+alarm-manager (0.4.49) unstable; urgency=low
+
+  * Support API for power-on rtc
+  * Git: slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.49
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Wed, 13 Apr 2012 10:15:00 +0900
+
+alarm-manager (0.4.48) unstable; urgency=low
+
+  * allow "setting_time_changed" heynoti publication by application
+  * Git: slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.48
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 12 Apr 2012 21:45:11 +0900
+
+alarm-manager (0.4.47) unstable; urgency=low
+
+  * Support "setting_time_changed" heynoti publication upon system time change, cleanup
+  * Git: slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.47
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Wed, 28 Mar 2012 18:10:16 +0900
+
 alarm-manager (0.4.46) unstable; urgency=low
 
-  * Initial release
-  * Git: pkgs/a/alarm-manager
+  * Removed tel_set_misc_timezone_info API
+  * Git: slp/pkgs/a/alarm-manager
   * Tag: alarm-manager_0.4.46
 
  -- Jaeho Lee <jaeho81.lee@samsung.com>  Mon, 26 Mar 2012 13:43:41 +0900
+
+alarm-manager (0.4.45) unstable; urgency=low
+
+  * Changed prefix
+  * Git: slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.45
+
+ -- jaeho81.lee <jaeho81.lee@samsung.com>  Fri, 16 Mar 2012 10:25:31 +0900
+
+alarm-manager (0.4.44) unstable; urgency=low
+
+  * Fix a thread bug
+  * Git: slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.44
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Tue, 28 Feb 2012 18:16:26 +0900
+
+alarm-manager (0.4.43) unstable; urgency=low
+
+  * API to get appsvc bundle information
+  * Git: slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.43
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Wed, 08 Feb 2012 14:30:00 +0900
+
+alarm-manager (0.4.42) unstable; urgency=low
+
+  * Clenup, bug fix.
+  * Git: slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.42
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 02 Feb 2012 14:30:00 +0900
+
+alarm-manager (0.4.41) unstable; urgency=low
+
+  * Fixed alarm information API error no.
+  * Git: slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.41
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Tue, 17 Jan 2012 14:30:00 +0900
+
+alarm-manager (0.4.40) unstable; urgency=low
+
+  * Added test pgm which covers TS
+  * Git: slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.40
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Mon, 19 Dec 2011 19:00:00 +0900
+
+alarm-manager (0.4.39) unstable; urgency=low
+
+  * Cleaning, Remove unused files & postinst files
+  * Git: 165.213.180.234:/slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.39
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Mon, 06 Dec 2011 10:30:00 +0900
+
+alarm-manager (0.4.38) unstable; urgency=low
+
+  * Changed boilerplate
+  * Git: 165.213.180.234:/slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.38
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Mon, 05 Dec 2011 16:32:01 +0900
+
+alarm-manager (0.4.37) unstable; urgency=low
+
+  * Fixed Klockwork reported defects
+  * Git: 165.213.180.234:/slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.37
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Wed, 30 Nov 2011 22:00:00 +0900
+
+alarm-manager (0.4.36) unstable; urgency=low
+
+  * Fixed Klockwork reported defects
+  * Git: 165.213.180.234:/slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.36
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Tue, 08 Nov 2011 10:00:00 +0900
+
+alarm-manager (0.4.35) unstable; urgency=low
+
+  * Changed Boilerplate as per the guideline
+  * Git: 165.213.180.234:/slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.35
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Fri, 21 Oct 2011 11:50:00 +0900
+
+alarm-manager (0.4.34) unstable; urgency=low
+
+  * Fix GCC Warning & Set Alarm RTC upon Alarm manager initialization
+  * Git: 165.213.180.234:/slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.34
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Wed, 12 Oct 2011 10:15:00 +0900
+
+alarm-manager (0.4.33) unstable; urgency=low
+
+  * Add app-svc support
+  * Git: 165.213.180.234:/slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.33
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Mon, 03 Oct 2011 11:10:35 +0900
+
+alarm-manager (0.4.32) unstable; urgency=low
+
+  * Remove tapi-priv dependency
+  * Git: 165.213.180.234:/slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.32 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 29 Sep 2011 21:20:21 +0900
+
+alarm-manager (0.4.31) unstable; urgency=low
+
+  * Fix prevent issues
+  * Git: 165.213.180.234:/slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.31 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Fri, 26 Aug 2011 15:10:35 +0900
+
+alarm-manager (0.4.30) unstable; urgency=low
+
+  * Apply code cleanup
+  * Git: 165.213.180.234:/slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.30 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 11 Aug 2011 10:57:15 +0900
+
+alarm-manager (0.4.29) unstable; urgency=low
+
+  * About time change
+  * Git: 165.213.180.234:/slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.29
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 04 Aug 2011 11:33:17 +0900
+
+alarm-manager (0.4.28) unstable; urgency=low
+
+  * Apply code cleanup
+  * Git: 165.213.180.234:/slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.28 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Mon, 01 Aug 2011 21:08:40 +0900
+
+alarm-manager (0.4.27) unstable; urgency=low
+
+  * Code cleanup
+  * Git: 165.213.180.234:/slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.27 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Wed, 13 Jul 2011 16:02:25 +0900
+
+alarm-manager (0.4.26) unstable; urgency=low
+
+  * Fix wrong alarm bug
+  * Git: 165.213.180.234:/slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.26 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Tue, 05 Jul 2011 17:32:06 +0900
+
+alarm-manager (0.4.25) unstable; urgency=low
+
+  * Fix prevent defects
+  * Git: 165.213.180.234:/slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.25 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Mon, 13 Jun 2011 16:04:43 +0900
+
+alarm-manager (0.4.24) unstable; urgency=low
+
+  * about TC
+  * Git: 165.213.180.234:/slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.24 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Tue, 26 Apr 2011 13:29:56 +0900
+
+alarm-manager (0.4.23) unstable; urgency=low
+
+  * about time change
+  * Git: 165.213.180.234:/slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.23
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Tue, 19 Apr 2011 16:05:35 +0900
+
+alarm-manager (0.4.22) unstable; urgency=low
+
+  * change of system FW
+  * Git: 165.213.180.234:/slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.22
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Wed, 09 Mar 2011 14:17:26 +0900
+
+alarm-manager (0.4.21) unstable; urgency=low
+
+  * reupload
+  * Git: 165.213.180.234:/slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.21
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Mon, 07 Mar 2011 19:39:16 +0900
+
+alarm-manager (0.4.20) unstable; urgency=low
+
+  * about initialize db
+  * Git: 165.213.180.234:/slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.20
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Mon, 07 Mar 2011 16:47:30 +0900
+
+alarm-manager (0.4.19) unstable; urgency=low
+
+  * about alarmmgr_init() & gconf -> sqlite
+  * Git: 165.213.180.234:/slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.19
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Mon, 07 Mar 2011 14:54:32 +0900
+
+alarm-manager (0.4.18) unstable; urgency=low
+
+  * about pm
+  * Git: 165.213.180.234:/slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.18 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Tue, 08 Feb 2011 11:30:27 +0900
+
+alarm-manager (0.4.17) unstable; urgency=low
+
+  * add fini API
+  * Git: 165.213.180.234:/slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.17 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Tue, 25 Jan 2011 17:36:31 +0900
+
+alarm-manager (0.4.16) unstable; urgency=low
+
+  * modify TC
+  * Git: 165.213.180.234:/slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.16 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Mon, 24 Jan 2011 16:35:40 +0900
+
+alarm-manager (0.4.15) unstable; urgency=low
+
+  * prevent
+  * Git: 165.213.180.234:/slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.15 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 20 Jan 2011 13:26:57 +0900
+
+alarm-manager (0.4.14) unstable; urgency=low
+
+  * about tet_testlist
+  * Git: 165.213.180.234:/slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.14 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Mon, 17 Jan 2011 13:58:07 +0900
+
+alarm-manager (0.4.13) unstable; urgency=low
+
+  * bug fix
+  * Git: 165.213.180.234:/slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.13 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Wed, 05 Jan 2011 17:05:07 +0900
+
+alarm-manager (0.4.12) unstable; urgency=low
+
+  * Git: 165.213.180.234:/slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.12
+
+  commit a6dae1529f48318d914a151f63482082376d4cc5
+    about interval 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Tue, 04 Jan 2011 18:18:50 +0900
+
+alarm-manager (0.4.11) unstable; urgency=low
+
+  * change repository path
+  * Git: 165.213.180.234:/slp/pkgs/a/alarm-manager
+  * Tag: alarm-manager_0.4.11 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Tue, 28 Dec 2010 13:24:14 +0900
+
+alarm-manager (0.4.10) unstable; urgency=low
+
+  * modify TC
+  * Git: 165.213.180.234:/git/slp/pkgs/alarm-manager
+  * Tag: alarm-manager_0.4.10 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Tue, 28 Dec 2010 10:48:18 +0900
+
+alarm-manager (0.4.9) unstable; urgency=low
+
+  * modify ltmain.sh
+  * Git: 165.213.180.234:/git/slp/pkgs/alarm-manager
+  * Tag: alarm-manager_0.4.9 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Mon, 06 Dec 2010 15:42:55 +0900
+
+alarm-manager (0.4.8) unstable; urgency=low
+
+  * as-needed
+  * Git: 165.213.180.234:/git/slp/pkgs/alarm-manager
+  * Tag: alarm-manager_0.4.8
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Sat, 27 Nov 2010 11:54:08 +0900
+
+alarm-manager (0.4.4) unstable; urgency=low
+
+  * modify PG
+  * Git: 165.213.180.234:/git/slp/pkgs/alarm-manager
+  * Tag: alarm-manager_0.4.4
+
+ -- Newton Lee <newton.lee@samsung.com>  Fri, 26 Nov 2010 17:14:05 +0900
+
+alarm-manager (0.4.2-7) unstable; urgency=low
+
+  * modify PG
+  * Git: 165.213.180.234:/git/slp/pkgs/alarm-manager
+  * Tag: alarm-manager_0.4.2-7 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 18 Nov 2010 14:03:11 +0900
+
+alarm-manager (0.4.2-6) unstable; urgency=low
+
+  * modify PG
+  * Git: 165.213.180.234:/git/slp/pkgs/alarm-manager
+  * Tag: alarm-manager_0.4.2-6 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Tue, 16 Nov 2010 15:37:39 +0900
+
+alarm-manager (0.4.2-5) unstable; urgency=low
+
+  * modify PG
+  * Git: 165.213.180.234:/git/slp/pkgs/alarm-manager
+  * Tag: alarm-manager_0.4.2-5 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Tue, 16 Nov 2010 14:50:19 +0900
+
+alarm-manager (0.4.2-4) unstable; urgency=low
+
+  * about license
+  * Git: 165.213.180.234:/git/slp/pkgs/alarm-manager
+  * Tag: alarm-manager_0.4.2-4
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Tue, 26 Oct 2010 22:50:57 +0900
+
+alarm-manager (0.4.2-3) unstable; urgency=low
+
+  * add link file(rc5.d) 
+  * Git: 165.213.180.234:/git/slp/pkgs/alarm-manager
+  * Tag: alarm-manager_0.4.2-3 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Wed, 20 Oct 2010 10:41:56 +0900
+
+alarm-manager (0.4.2-2) unstable; urgency=low
+
+  * add PG
+  * Git: 165.213.180.234:/git/slp/pkgs/alarm-manager
+  * Tag: alarm-manager_0.4.2-2 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Fri, 08 Oct 2010 21:28:59 +0900
+
+alarm-manager (0.4.2-1) unstable; urgency=low
+
+  * modify TC
+  * Git: 165.213.180.234:/git/slp/pkgs/alarm-manager
+  * Tag: alarm-manager_0.4.2-1 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Tue, 05 Oct 2010 13:48:25 +0900
+
+alarm-manager (0.4.1-5) unstable; urgency=low
+
+  * bug fix (about destination)
+  * Git: 165.213.180.234:/git/slp/pkgs/alarm-manager
+  * Tag: alarm-manager_0.4.1-5 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Mon, 04 Oct 2010 17:33:40 +0900
+
+alarm-manager (0.4.1-4) unstable; urgency=low
+
+  * add TC
+  * Git: 165.213.180.234:/git/slp/pkgs/alarm-manager
+  * Tag: alarm-manager_0.4.1-4
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Tue, 28 Sep 2010 14:04:57 +0900
+
+alarm-manager (0.4.1-3) unstable; urgency=low
+
+  * modify a bug
+  * Git: 165.213.180.234:/git/slp/pkgs/alarm-manager
+  * Tag: alarm-manager_0.4.1-3 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Mon, 13 Sep 2010 18:02:28 +0900
+
+alarm-manager (0.4.1-2) unstable; urgency=low
+
+  * modify doxygen
+  * Git: 165.213.180.234:/git/slp/pkgs/alarm-manager
+  * Tag: alarm-manager_0.4.1-2
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 02 Sep 2010 14:02:23 +0900
+
+alarm-manager (0.4.1-1) unstable; urgency=low
+
+  * APIs change
+  * Git: 165.213.180.234:/git/slp/pkgs/alarm-manager
+  * Tag: alarm-manager_0.4.1-1
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 02 Sep 2010 14:02:07 +0900
+
+alarm-manager (0.4.0-0) unstable; urgency=low
+
+  * APIs change
+  * Git: 165.213.180.234:/git/slp/pkgs/alarm-manager
+  * Tag: alarm-manager_0.4.0-0 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Wed, 25 Aug 2010 10:43:15 +0900
+
+alarm-manager (0.3.2-7) unstable; urgency=low
+
+  * alarmring
+  * Git: 165.213.180.234:/git/slp/pkgs/alarm-manager
+  * Tag: alarm-manager_0.3.2-7 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Sat, 07 Aug 2010 16:53:01 +0900
+
+alarm-manager (0.3.2-6) unstable; urgency=low
+
+  * new aul
+  * Git: 165.213.180.234:/git/slp/pkgs/alarm-manager
+  * Tag: alarm-manager_0.3.2-6
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 05 Aug 2010 14:32:55 +0900
+
+alarm-manager (0.3.2-5) unstable; urgency=low
+
+  * Release 0.3.2-5
+  * Git: 165.213.180.234:/git/slp/pkgs/alarm-manager
+  * Tag: alarm-manager_0.3.2-5
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 29 Jul 2010 21:27:30 +0900
+
+alarm-manager (0.3.2-4) unstable; urgency=low
+
+  * buf fix : alarmring doesn't expire.
+  * Git: 165.213.180.234:/git/slp/pkgs/alarm-manager
+  * Tag: alarm-manager_0.3.2-4 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 22 Jul 2010 16:37:05 +0900
+
+alarm-manager (0.3.2-3) unstable; urgency=low
+
+  * remove alarmmgr_check_next_duetime
+  * Git: 165.213.180.234:/git/slp/pkgs/alarm-manager
+  * Tag: alarm-manager_0.3.2-3 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Mon, 19 Jul 2010 15:10:05 +0900
+
+alarm-manager (0.3.2-2) unstable; urgency=low
+
+  * change alarmmgr_set_cb return value
+  * Git: 165.213.180.234:/git/slp/pkgs/alarm-manager
+  * Tag: alarm-manager_0.3.2-2 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Fri, 16 Jul 2010 11:29:13 +0900
+
+alarm-manager (0.3.2-1) unstable; urgency=low
+
+  * rollback prototype of alarmmgr_set_cb
+  * Git: 165.213.180.234:/git/slp/pkgs/alarm-manager
+  * Tag: alarm-manager_0.3.2-1 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Fri, 16 Jul 2010 09:58:54 +0900
+
+alarm-manager (0.3.1-13) unstable; urgency=low
+
+  * rollback prototype of alarmmgr_set_cb
+  * Git: 165.213.180.234:/git/slp/pkgs/alarm-manager
+  * Tag: alarm-manager_0.3.1-13 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 15 Jul 2010 18:11:32 +0900
+
+alarm-manager (0.3.1-12) unstable; urgency=low
+
+  * rollback prototype of alarmmgr_set_cb
+  * Git: 165.213.180.234:/git/slp/pkgs/alarm-manager
+  * Tag: alarm-manager_0.3.1-12 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 15 Jul 2010 17:07:54 +0900
+
+alarm-manager (0.3.1-11) unstable; urgency=low
+
+  * rollback prototype of alarmmgr_set_cb
+  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/alarm-manager-0
+  * Tag: alarm-manager_0.3.1-11 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 15 Jul 2010 15:55:30 +0900
+
+alarm-manager (0.3.1-10) unstable; urgency=low
+
+  * EXPORT_API 
+  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/alarm-manager-0
+  * Tag: alarm-manager_0.3.1-10
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 15 Jul 2010 11:14:14 +0900
+
+alarm-manager (0.3.1-9) unstable; urgency=low
+
+  * Add XB-Generate-Docs tag for doxygen
+  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/alarm-manager-0
+  * Tag: alarm-manager_0.3.1-9
+
+ -- Sangjung Woo <sangjung.woo@samsung.com>  Mon, 05 July 2010 11:01:42 +0900
+
+alarm-manager (0.3.1-8) unstable; urgency=low
+
+  * re-build
+  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/alarm-manager-0
+  * Tag: alarm-manager_0.3.1-8 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Fri, 18 Jun 2010 11:01:42 +0900
+
+alarm-manager (0.3.1-7) unstable; urgency=low
+
+  * remove deprecated functions
+  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/alarm-manager-0
+  * Tag: alarm-manager_0.3.1-7 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 17 Jun 2010 10:44:54 +0900
+
+alarm-manager (0.3.1-6) unstable; urgency=low
+
+  * buf fix about auto power on alarm
+  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/alarm-manager-0
+  * Tag: alarm-manager_0.3.1-6 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Wed, 09 Jun 2010 21:09:32 +0900
+
+alarm-manager (0.3.1-5) unstable; urgency=low
+
+  * add an org.tizen.timer exception
+  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/alarm-manager-0
+  * Tag: alarm-manager_0.3.1-5 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 03 Jun 2010 18:34:53 +0900
+
+alarm-manager (0.3.1-4) unstable; urgency=low
+
+  * buf fix (memory corruption)
+  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/alarm-manager-0
+  * Tag: alarm-manager_0.3.1-4 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 03 Jun 2010 16:49:18 +0900
+
+alarm-manager (0.3.1-3) unstable; urgency=low
+
+  * buf fix (timer case)
+  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/alarm-manager-0
+  * Tag: alarm-manager_0.3.1-3
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 03 Jun 2010 10:48:55 +0900
+
+alarm-manager (0.3.1-2) unstable; urgency=low
+
+  * modify doxygen
+  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/alarm-manager-0
+  * Tag: alarm-manager_0.3.1-2
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Fri, 28 May 2010 15:49:19 +0900
+
+alarm-manager (0.3.1-1) unstable; urgency=low
+
+  * modify APIs
+  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/alarm-manager-0
+  * Tag: alarm-manager_0.3.1-1 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Wed, 26 May 2010 09:42:16 +0900
+
+alarm-manager (0.2.8-10) unstable; urgency=low
+
+  * modify .postinst file
+  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/alarm-manager-0
+  * Tag: alarm-manager_0.2.8-10 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Wed, 19 May 2010 11:26:14 +0900
+
+alarm-manager (0.2.8-9) unstable; urgency=low
+
+  * add .postinst file (chown & chmod)
+  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/alarm-manager-0
+  * Tag: alarm-manager_0.2.8-9 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Wed, 21 Apr 2010 14:55:19 +0900
+
+alarm-manager (0.2.8-8) unstable; urgency=low
+
+  * add HIBERNATION_LEAVE cb 
+  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/alarm-manager-0
+  * Tag: alarm-manager_0.2.8-8 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Fri, 16 Apr 2010 14:12:23 +0900
+
+alarm-manager (0.2.8-7) unstable; urgency=low
+
+  * add S80alarm-server
+  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/alarm-manager-0
+  * Tag: alarm-manager_0.2.8-7
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 08 Apr 2010 19:45:37 +0900
+
+alarm-manager (0.2.8-6) unstable; urgency=low
+
+  * add S80alarm-server
+  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/alarm-manager-0
+  * Tag: alarm-manager_0.2.8-6
+
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 08 Apr 2010 15:11:53 +0900
+
+alarm-manager (0.2.8-5) unstable; urgency=low
+
+  * /proc/<pid>/exe ->  /proc/<pid>/cmdline
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Fri, 02 Apr 2010 14:05:12 +0900
+
+alarm-manager (0.2.8-4) unstable; urgency=low
+
+  * remove telephony header file 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Tue, 30 Mar 2010 17:15:57 +0900
+
+alarm-manager (0.2.8-3) unstable; urgency=low
+
+  * Toolchain Upgrade
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 25 Mar 2010 15:29:27 +0900
+
+alarm-manager (0.2.8-2) unstable; urgency=low
+
+  * rtc1 : RTC_ALM_SET -> RTC_WKALM_SET
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Mon, 15 Mar 2010 16:03:25 +0900
+
+alarm-manager (0.2.8-1) unstable; urgency=low
+
+  * sync rtc0 & rtc1
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Tue, 02 Mar 2010 18:38:24 +0900
+
+alarm-manager (0.2.7-1) unstable; urgency=low
+
+  * bug fix : alarm ring BS
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Tue, 23 Feb 2010 10:10:52 +0900
+
+alarm-manager (0.2.6-1) unstable; urgency=low
+
+  * enable power on alarm
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Mon, 22 Feb 2010 19:24:21 +0900
+
+alarm-manager (0.2.5-1) unstable; urgency=low
+
+  * modify pm api
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Fri, 19 Feb 2010 10:11:48 +0900
+
+alarm-manager (0.2.4-1) unstable; urgency=low
+
+  * add dlog_init 
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Fri, 29 Jan 2010 15:39:15 +0900
+
+alarm-manager (0.2.3-2) unstable; urgency=low
+
+  * add alarm-manager-dbg pkg
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 28 Jan 2010 16:30:50 +0900
+
+alarm-manager (0.2.3-1) unstable; urgency=low
+
+  * remove SLP prefix
+
+ -- Jaeho Lee <jaeho81.lee@samsung.com>  Tue, 26 Jan 2010 19:47:22 +0900
+
+alarm-manager (0.2.2-3) unstable; urgency=low
+
+  * modify doxygen 
+
+ -- hojun Lee <rcn95@samsung.com>  Fri, 22 Jan 2010 22:39:55 -0800
+
+alarm-manager (0.2.2-2) unstable; urgency=low
+
+  * build error : undefined symbol _dlog 
+
+ -- jaeho Lee <jaeho81.lee@samsung.com>  Mon, 18 Jan 2010 19:26:37 +0900
+
+alarm-manager (0.2.2-1) unstable; urgency=low
+
+  * edit doxygen document
+
+ -- jaeho Lee <jaeho81.lee@samsung.com>  Mon, 18 Jan 2010 15:16:12 +0900
+
+alarm-manager (0.2.1-1) unstable; urgency=low
+
+  * add dbg pkg & adjust dlog
+
+ -- jaeho Lee <jaeho81.lee@samsung.com>  Mon, 18 Jan 2010 12:10:53 +0900
+
+alarm-manager (0.2.0-3) unstable; urgency=low
+
+  * change doxygen comment 
+
+ -- jaeho Lee <jaeho81.lee@samsung.com>  Fri, 15 Jan 2010 13:55:35 +0900
+
+alarm-manager (0.2.0-2) unstable; urgency=low
+
+  * fix debian/control file 
+
+ -- jaeho Lee <jaeho81.lee@samsung.com>  Thu, 24 Dec 2009 16:28:43 +0900
+
+alarm-manager (0.2.0-1) unstable; urgency=low
+
+  * replace limo alarm-manager with slp alarm-manager
+
+ -- jaeho Lee <jaeho81.lee@samsung.com>  Wed, 23 Dec 2009 16:29:45 +0900
+
+alarm-manager (0.1.0-3) unstable; urgency=low
+
+  * modified x1, sl notation
+
+ -- jeesun Kim <iamjs.kim@samsung.com>  Fri, 20 Nov 2009 21:31:31 +0900
+
+alarm-manager (0.1.0-2) unstable; urgency=low
+
+  * modified depends
+
+ -- jeesun Kim <iamjs.kim@samsung.com>  Mon, 16 Nov 2009 16:23:16 +0900
+
+alarm-manager (0.1.0-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- jeesun Kim <iamjs.kim@samsung.com>  Fri, 16 Nov 2009 09:34:39 +0900
index 2331e1a..307ebf8 100755 (executable)
@@ -45,6 +45,8 @@
 #define MAX_SERVICE_NAME_LEN 256
 #define MAX_PKG_NAME_LEN MAX_SERVICE_NAME_LEN-8
 
+#define SYSTEM_TIME_CHANGED "setting_time_changed"
+
 #ifdef LOG_TAG
 #undef LOG_TAG
 #endif
@@ -140,6 +142,8 @@ bool _send_alarm_power_off(alarm_context_t context, int *error_code);
 bool _remove_from_scheduled_alarm_list(int pid, alarm_id_t alarm_id);
 bool _load_alarms_from_registry();
 bool _alarm_find_mintime_power_on(time_t *min_time);
+bundle *_send_alarm_get_appsvc_info(alarm_context_t context, alarm_id_t alarm_id, int *error_code);
+bool _send_alarm_set_rtc_time(alarm_context_t context, alarm_date_t *time, int *error_code);
 
 /*  alarm manager*/
 typedef struct {
index 3e2367f..7f80d3b 100644 (file)
@@ -1296,6 +1296,42 @@ int main(int argc,char **argv {
  */
 void *alarmmgr_get_alarm_appsvc_info(alarm_id_t alarm_id, int *return_code);
 
+
+
+/**
+ * This function sets power RTC (which can power on the system).
+ * @param      [in]            alarm_date_t            time
+ *
+ * @return     This function returns the result. On success, ALARMMGR_RESULT_SUCCESS will be returned
+ *             else, appropriate error no will be returned.
+ * @pre None.
+ * @post None.
+ * @see None
+ * @remark  None.
+ *
+ * @par Sample code:
+ * @code
+#include <alarm.h>
+
+ ...
+
+alarm_date_t alarm_date={2012,04,05,10,10,00};
+
+int main(int argc,char **argv {
+       int return_code = 0;
+       return_code = alarmmgr_set_rtc_time(&alarm_date);
+       if (return_code != ALARMMGR_RESULT_SUCCESS){
+               printf("Error returned is %d\n",return_code);
+       }
+       return 0;
+
+ }
+ * @endcode
+ * @limo
+ */
+int alarmmgr_set_rtc_time(alarm_date_t *time);
+
+
 /**
  * @}
  */
old mode 100755 (executable)
new mode 100644 (file)
index d88da2c..c8485ab
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,6 +1,6 @@
 # Generated from ltmain.m4sh.
 
-# ltmain.sh (GNU libtool) 2.2.6b
+# ltmain.sh (GNU libtool) 2.2.4
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
@@ -65,7 +65,7 @@
 #       compiler:              $LTCC
 #       compiler flags:                $LTCFLAGS
 #       linker:                $LD (gnu? $with_gnu_ld)
-#       $progname:             (GNU libtool) 2.2.6b Debian-2.2.6b-2
+#       $progname:             (GNU libtool) 2.2.4
 #       automake:              $automake_version
 #       autoconf:              $autoconf_version
 #
@@ -73,9 +73,9 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="2.2.6b Debian-2.2.6b-2"
+VERSION=2.2.4
 TIMESTAMP=""
-package_revision=1.3017
+package_revision=1.2976
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -116,15 +116,15 @@ $lt_unset CDPATH
 
 : ${CP="cp -f"}
 : ${ECHO="echo"}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
+: ${EGREP="/usr/bin/grep -E"}
+: ${FGREP="/usr/bin/grep -F"}
+: ${GREP="/usr/bin/grep"}
 : ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="/bin/sed"}
+: ${SED="/opt/local/bin/gsed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -805,7 +805,7 @@ func_enable_tag ()
 
 
   case $host in
-    *cygwin* | *mingw* | *pw32* | *cegcc*)
+    *cygwin* | *mingw* | *pw32*)
       # don't eliminate duplications in $postdeps and $predeps
       opt_duplicate_compiler_generated_deps=:
       ;;
@@ -893,9 +893,8 @@ $opt_help || {
 # determined imposters.
 func_lalib_p ()
 {
-    test -f "$1" &&
-      $SED -e 4q "$1" 2>/dev/null \
-        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+    $SED -e 4q "$1" 2>/dev/null \
+      | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
 }
 
 # func_lalib_unsafe_p file
@@ -908,7 +907,7 @@ func_lalib_p ()
 func_lalib_unsafe_p ()
 {
     lalib_p=no
-    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
+    if test -r "$1" && exec 5<&0 <"$1"; then
        for lalib_p_l in 1 2 3 4
        do
            read lalib_p_line
@@ -1276,7 +1275,7 @@ func_mode_compile ()
 
     # On Cygwin there's no "real" PIC flag so we must build both object types
     case $host_os in
-    cygwin* | mingw* | pw32* | os2* | cegcc*)
+    cygwin* | mingw* | pw32* | os2*)
       pic_mode=default
       ;;
     esac
@@ -2047,7 +2046,7 @@ func_mode_install ()
              'exit $?'
          tstripme="$stripme"
          case $host_os in
-         cygwin* | mingw* | pw32* | cegcc*)
+         cygwin* | mingw* | pw32*)
            case $realname in
            *.dll.a)
              tstripme=""
@@ -2153,7 +2152,7 @@ func_mode_install ()
 
        # Do a test to see if this is really a libtool program.
        case $host in
-       *cygwin* | *mingw*)
+       *cygwin*|*mingw*)
            if func_ltwrapper_executable_p "$file"; then
              func_ltwrapper_scriptname "$file"
              wrapper=$func_ltwrapper_scriptname_result
@@ -2359,7 +2358,7 @@ extern \"C\" {
              $RM $export_symbols
              eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
              case $host in
-             *cygwin* | *mingw* | *cegcc* )
+             *cygwin* | *mingw* )
                 eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
                 eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
                ;;
@@ -2371,7 +2370,7 @@ extern \"C\" {
              eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
              eval '$MV "$nlist"T "$nlist"'
              case $host in
-               *cygwin | *mingw* | *cegcc* )
+               *cygwin | *mingw* )
                  eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
                  eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
                  ;;
@@ -2427,7 +2426,7 @@ typedef struct {
 } lt_dlsymlist;
 "
          case $host in
-         *cygwin* | *mingw* | *cegcc* )
+         *cygwin* | *mingw* )
            $ECHO >> "$output_objdir/$my_dlsyms" "\
 /* DATA imports from DLLs on WIN32 con't be const, because
    runtime relocations are performed -- see ld's documentation
@@ -2513,7 +2512,7 @@ static const void *lt_preloaded_setup() {
        # Transform the symbol file into the correct name.
        symfileobj="$output_objdir/${my_outputname}S.$objext"
        case $host in
-       *cygwin* | *mingw* | *cegcc* )
+       *cygwin* | *mingw* )
          if test -f "$output_objdir/$my_outputname.def"; then
            compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
            finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
@@ -2692,16 +2691,25 @@ func_extract_archives ()
 
 
 
-# func_emit_wrapper_part1 [arg=no]
+# func_emit_wrapper arg
+#
+# emit a libtool wrapper script on stdout
+# don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable.  Must ONLY be called from within
+# func_mode_link because it depends on a number of variable
+# set therein.
 #
-# Emit the first part of a libtool wrapper script on stdout.
-# For more information, see the description associated with
-# func_emit_wrapper(), below.
-func_emit_wrapper_part1 ()
+# arg is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take.  If 'yes', then the emitted script
+# will assume that the directory in which it is stored is
+# the '.lib' directory.  This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
 {
-       func_emit_wrapper_part1_arg1=no
+       func_emit_wrapper_arg1=no
        if test -n "$1" ; then
-         func_emit_wrapper_part1_arg1=$1
+         func_emit_wrapper_arg1=$1
        fi
 
        $ECHO "\
@@ -2786,27 +2794,10 @@ else
     file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
     file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
   done
-"
-}
-# end: func_emit_wrapper_part1
-
-# func_emit_wrapper_part2 [arg=no]
-#
-# Emit the second part of a libtool wrapper script on stdout.
-# For more information, see the description associated with
-# func_emit_wrapper(), below.
-func_emit_wrapper_part2 ()
-{
-       func_emit_wrapper_part2_arg1=no
-       if test -n "$1" ; then
-         func_emit_wrapper_part2_arg1=$1
-       fi
-
-       $ECHO "\
 
   # Usually 'no', except on cygwin/mingw when embedded into
   # the cwrapper.
-  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
   if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
     # special case for '.'
     if test \"\$thisdir\" = \".\"; then
@@ -2897,7 +2888,7 @@ func_emit_wrapper_part2 ()
 "
        case $host in
        # Backslashes separate directories on plain windows
-       *-*-mingw | *-*-os2* | *-cegcc*)
+       *-*-mingw | *-*-os2*)
          $ECHO "\
       exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
 "
@@ -2923,207 +2914,7 @@ func_emit_wrapper_part2 ()
 fi\
 "
 }
-# end: func_emit_wrapper_part2
-
-
-# func_emit_wrapper [arg=no]
-#
-# Emit a libtool wrapper script on stdout.
-# Don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable.  Must ONLY be called from within
-# func_mode_link because it depends on a number of variables
-# set therein.
-#
-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-# variable will take.  If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
-# the $objdir directory.  This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
-{
-       func_emit_wrapper_arg1=no
-       if test -n "$1" ; then
-         func_emit_wrapper_arg1=$1
-       fi
-
-       # split this up so that func_emit_cwrapperexe_src
-       # can call each part independently.
-       func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
-       func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
-}
-
-
-# func_to_host_path arg
-#
-# Convert paths to host format when used with build tools.
-# Intended for use with "native" mingw (where libtool itself
-# is running under the msys shell), or in the following cross-
-# build environments:
-#    $build          $host
-#    mingw (msys)    mingw  [e.g. native]
-#    cygwin          mingw
-#    *nix + wine     mingw
-# where wine is equipped with the `winepath' executable.
-# In the native mingw case, the (msys) shell automatically
-# converts paths for any non-msys applications it launches,
-# but that facility isn't available from inside the cwrapper.
-# Similar accommodations are necessary for $host mingw and
-# $build cygwin.  Calling this function does no harm for other
-# $host/$build combinations not listed above.
-#
-# ARG is the path (on $build) that should be converted to
-# the proper representation for $host. The result is stored
-# in $func_to_host_path_result.
-func_to_host_path ()
-{
-  func_to_host_path_result="$1"
-  if test -n "$1" ; then
-    case $host in
-      *mingw* )
-        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-        case $build in
-          *mingw* ) # actually, msys
-            # awkward: cmd appends spaces to result
-            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
-            func_to_host_path_tmp1=`( cmd //c echo "$1" |\
-              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
-            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          *cygwin* )
-            func_to_host_path_tmp1=`cygpath -w "$1"`
-            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          * )
-            # Unfortunately, winepath does not exit with a non-zero
-            # error code, so we are forced to check the contents of
-            # stdout. On the other hand, if the command is not
-            # found, the shell will set an exit code of 127 and print
-            # *an error message* to stdout. So we must check for both
-            # error code of zero AND non-empty stdout, which explains
-            # the odd construction:
-            func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
-            if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
-              func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-                $SED -e "$lt_sed_naive_backslashify"`
-            else
-              # Allow warning below.
-              func_to_host_path_result=""
-            fi
-            ;;
-        esac
-        if test -z "$func_to_host_path_result" ; then
-          func_error "Could not determine host path corresponding to"
-          func_error "  '$1'"
-          func_error "Continuing, but uninstalled executables may not work."
-          # Fallback:
-          func_to_host_path_result="$1"
-        fi
-        ;;
-    esac
-  fi
-}
-# end: func_to_host_path
-
-# func_to_host_pathlist arg
-#
-# Convert pathlists to host format when used with build tools.
-# See func_to_host_path(), above. This function supports the
-# following $build/$host combinations (but does no harm for
-# combinations not listed here):
-#    $build          $host
-#    mingw (msys)    mingw  [e.g. native]
-#    cygwin          mingw
-#    *nix + wine     mingw
-#
-# Path separators are also converted from $build format to
-# $host format. If ARG begins or ends with a path separator
-# character, it is preserved (but converted to $host format)
-# on output.
-#
-# ARG is a pathlist (on $build) that should be converted to
-# the proper representation on $host. The result is stored
-# in $func_to_host_pathlist_result.
-func_to_host_pathlist ()
-{
-  func_to_host_pathlist_result="$1"
-  if test -n "$1" ; then
-    case $host in
-      *mingw* )
-        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-        # Remove leading and trailing path separator characters from
-        # ARG. msys behavior is inconsistent here, cygpath turns them
-        # into '.;' and ';.', and winepath ignores them completely.
-        func_to_host_pathlist_tmp2="$1"
-        # Once set for this call, this variable should not be
-        # reassigned. It is used in tha fallback case.
-        func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
-          $SED -e 's|^:*||' -e 's|:*$||'`
-        case $build in
-          *mingw* ) # Actually, msys.
-            # Awkward: cmd appends spaces to result.
-            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
-            func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
-              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
-            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          *cygwin* )
-            func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
-            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          * )
-            # unfortunately, winepath doesn't convert pathlists
-            func_to_host_pathlist_result=""
-            func_to_host_pathlist_oldIFS=$IFS
-            IFS=:
-            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
-              IFS=$func_to_host_pathlist_oldIFS
-              if test -n "$func_to_host_pathlist_f" ; then
-                func_to_host_path "$func_to_host_pathlist_f"
-                if test -n "$func_to_host_path_result" ; then
-                  if test -z "$func_to_host_pathlist_result" ; then
-                    func_to_host_pathlist_result="$func_to_host_path_result"
-                  else
-                    func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
-                  fi
-                fi
-              fi
-              IFS=:
-            done
-            IFS=$func_to_host_pathlist_oldIFS
-            ;;
-        esac
-        if test -z "$func_to_host_pathlist_result" ; then
-          func_error "Could not determine the host path(s) corresponding to"
-          func_error "  '$1'"
-          func_error "Continuing, but uninstalled executables may not work."
-          # Fallback. This may break if $1 contains DOS-style drive
-          # specifications. The fix is not to complicate the expression
-          # below, but for the user to provide a working wine installation
-          # with winepath so that path translation in the cross-to-mingw
-          # case works properly.
-          lt_replace_pathsep_nix_to_dos="s|:|;|g"
-          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
-            $SED -e "$lt_replace_pathsep_nix_to_dos"`
-        fi
-        # Now, add the leading and trailing path separators back
-        case "$1" in
-          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
-            ;;
-        esac
-        case "$1" in
-          *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
-            ;;
-        esac
-        ;;
-    esac
-  fi
-}
-# end: func_to_host_pathlist
+# end: func_emit_wrapper
 
 # func_emit_cwrapperexe_src
 # emit the source code for a wrapper executable on stdout
@@ -3160,12 +2951,6 @@ EOF
 # include <stdint.h>
 # ifdef __CYGWIN__
 #  include <io.h>
-#  define HAVE_SETENV
-#  ifdef __STRICT_ANSI__
-char *realpath (const char *, char *);
-int putenv (char *);
-int setenv (const char *, const char *, int);
-#  endif
 # endif
 #endif
 #include <malloc.h>
@@ -3272,105 +3057,29 @@ int make_executable (const char *path);
 int check_executable (const char *path);
 char *strendzap (char *str, const char *pat);
 void lt_fatal (const char *message, ...);
-void lt_setenv (const char *name, const char *value);
-char *lt_extend_str (const char *orig_value, const char *add, int to_end);
-void lt_opt_process_env_set (const char *arg);
-void lt_opt_process_env_prepend (const char *arg);
-void lt_opt_process_env_append (const char *arg);
-int lt_split_name_value (const char *arg, char** name, char** value);
-void lt_update_exe_path (const char *name, const char *value);
-void lt_update_lib_path (const char *name, const char *value);
-
-static const char *script_text_part1 =
-EOF
-
-           func_emit_wrapper_part1 yes |
-               $SED -e 's/\([\\"]\)/\\\1/g' \
-                    -e 's/^/  "/' -e 's/$/\\n"/'
-           echo ";"
-           cat <<EOF
 
-static const char *script_text_part2 =
+static const char *script_text =
 EOF
-           func_emit_wrapper_part2 yes |
+
+           func_emit_wrapper yes |
                $SED -e 's/\([\\"]\)/\\\1/g' \
                     -e 's/^/  "/' -e 's/$/\\n"/'
            echo ";"
 
            cat <<EOF
 const char * MAGIC_EXE = "$magic_exe";
-const char * LIB_PATH_VARNAME = "$shlibpath_var";
-EOF
-
-           if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-              func_to_host_pathlist "$temp_rpath"
-             cat <<EOF
-const char * LIB_PATH_VALUE   = "$func_to_host_pathlist_result";
-EOF
-           else
-             cat <<"EOF"
-const char * LIB_PATH_VALUE   = "";
-EOF
-           fi
-
-           if test -n "$dllsearchpath"; then
-              func_to_host_pathlist "$dllsearchpath:"
-             cat <<EOF
-const char * EXE_PATH_VARNAME = "PATH";
-const char * EXE_PATH_VALUE   = "$func_to_host_pathlist_result";
-EOF
-           else
-             cat <<"EOF"
-const char * EXE_PATH_VARNAME = "";
-const char * EXE_PATH_VALUE   = "";
-EOF
-           fi
-
-           if test "$fast_install" = yes; then
-             cat <<EOF
-const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
-EOF
-           else
-             cat <<EOF
-const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
-EOF
-           fi
-
-
-           cat <<"EOF"
-
-#define LTWRAPPER_OPTION_PREFIX         "--lt-"
-#define LTWRAPPER_OPTION_PREFIX_LENGTH  5
-
-static const size_t opt_prefix_len         = LTWRAPPER_OPTION_PREFIX_LENGTH;
-static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
-
-static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
-
-static const size_t env_set_opt_len     = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
-static const char *env_set_opt          = LTWRAPPER_OPTION_PREFIX "env-set";
-  /* argument is putenv-style "foo=bar", value of foo is set to bar */
-
-static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
-static const char *env_prepend_opt      = LTWRAPPER_OPTION_PREFIX "env-prepend";
-  /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
-
-static const size_t env_append_opt_len  = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
-static const char *env_append_opt       = LTWRAPPER_OPTION_PREFIX "env-append";
-  /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
 
 int
 main (int argc, char *argv[])
 {
   char **newargz;
-  int  newargc;
   char *tmp_pathspec;
   char *actual_cwrapper_path;
-  char *actual_cwrapper_name;
-  char *target_name;
-  char *lt_argv_zero;
+  char *shwrapper_name;
   intptr_t rval = 127;
+  FILE *shwrapper;
 
+  const char *dumpscript_opt = "--lt-dump-script";
   int i;
 
   program_name = (char *) xstrdup (base_name (argv[0]));
@@ -3390,14 +3099,38 @@ EOF
                ;;
              esac
 
-           cat <<"EOF"
-         printf ("%s", script_text_part1);
-         printf ("%s", script_text_part2);
+           cat <<EOF
+         printf ("%s", script_text);
          return 0;
        }
     }
 
-  newargz = XMALLOC (char *, argc + 1);
+  newargz = XMALLOC (char *, argc + 2);
+EOF
+
+           if test -n "$TARGETSHELL" ; then
+             # no path translation at all
+             lt_newargv0=$TARGETSHELL
+           else
+             case "$host" in
+               *mingw* )
+                 # awkward: cmd appends spaces to result
+                 lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+                 lt_newargv0=`( cmd //c echo $SHELL | $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo $SHELL`
+                 case $lt_newargv0 in
+                   *.exe | *.EXE) ;;
+                   *) lt_newargv0=$lt_newargv0.exe ;;
+                 esac
+                 ;;
+               * ) lt_newargv0=$SHELL ;;
+             esac
+           fi
+
+               cat <<EOF
+  newargz[0] = (char *) xstrdup ("$lt_newargv0");
+EOF
+
+           cat <<"EOF"
   tmp_pathspec = find_executable (argv[0]);
   if (tmp_pathspec == NULL)
     lt_fatal ("Couldn't find %s", argv[0]);
@@ -3409,60 +3142,39 @@ EOF
                          actual_cwrapper_path));
   XFREE (tmp_pathspec);
 
-  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
-  strendzap (actual_cwrapper_path, actual_cwrapper_name);
-
-  /* wrapper name transforms */
-  strendzap (actual_cwrapper_name, ".exe");
-  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
-  XFREE (actual_cwrapper_name);
-  actual_cwrapper_name = tmp_pathspec;
-  tmp_pathspec = 0;
-
-  /* target_name transforms -- use actual target program name; might have lt- prefix */
-  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
-  strendzap (target_name, ".exe");
-  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
-  XFREE (target_name);
-  target_name = tmp_pathspec;
+  shwrapper_name = (char *) xstrdup (base_name (actual_cwrapper_path));
+  strendzap (actual_cwrapper_path, shwrapper_name);
+
+  /* shwrapper_name transforms */
+  strendzap (shwrapper_name, ".exe");
+  tmp_pathspec = XMALLOC (char, (strlen (shwrapper_name) +
+                                strlen ("_ltshwrapperTMP") + 1));
+  strcpy (tmp_pathspec, shwrapper_name);
+  strcat (tmp_pathspec, "_ltshwrapperTMP");
+  XFREE (shwrapper_name);
+  shwrapper_name = tmp_pathspec;
   tmp_pathspec = 0;
-
-  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
-                         target_name));
+  LTWRAPPER_DEBUGPRINTF (("(main) libtool shell wrapper name: %s\n",
+                         shwrapper_name));
 EOF
 
            cat <<EOF
-  newargz[0] =
+  newargz[1] =
     XMALLOC (char, (strlen (actual_cwrapper_path) +
-                   strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
-  strcpy (newargz[0], actual_cwrapper_path);
-  strcat (newargz[0], "$objdir");
-  strcat (newargz[0], "/");
+                   strlen ("$objdir") + 1 + strlen (shwrapper_name) + 1));
+  strcpy (newargz[1], actual_cwrapper_path);
+  strcat (newargz[1], "$objdir");
+  strcat (newargz[1], "/");
+  strcat (newargz[1], shwrapper_name);
 EOF
 
-           cat <<"EOF"
-  /* stop here, and copy so we don't have to do this twice */
-  tmp_pathspec = xstrdup (newargz[0]);
-
-  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
-  strcat (newargz[0], actual_cwrapper_name);
-
-  /* DO want the lt- prefix here if it exists, so use target_name */
-  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
-  XFREE (tmp_pathspec);
-  tmp_pathspec = NULL;
-EOF
 
            case $host_os in
              mingw*)
            cat <<"EOF"
   {
     char* p;
-    while ((p = strchr (newargz[0], '\\')) != NULL)
-      {
-       *p = '/';
-      }
-    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
+    while ((p = strchr (newargz[1], '\\')) != NULL)
       {
        *p = '/';
       }
@@ -3472,114 +3184,55 @@ EOF
            esac
 
            cat <<"EOF"
-  XFREE (target_name);
+  XFREE (shwrapper_name);
   XFREE (actual_cwrapper_path);
-  XFREE (actual_cwrapper_name);
-
-  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
-  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
-  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
-  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
 
-  newargc=0;
-  for (i = 1; i < argc; i++)
+  /* always write in binary mode */
+  if ((shwrapper = fopen (newargz[1], FOPEN_WB)) == 0)
     {
-      if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
-        {
-          if (argv[i][env_set_opt_len] == '=')
-            {
-              const char *p = argv[i] + env_set_opt_len + 1;
-              lt_opt_process_env_set (p);
-            }
-          else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
-            {
-              lt_opt_process_env_set (argv[++i]); /* don't copy */
-            }
-          else
-            lt_fatal ("%s missing required argument", env_set_opt);
-          continue;
-        }
-      if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
-        {
-          if (argv[i][env_prepend_opt_len] == '=')
-            {
-              const char *p = argv[i] + env_prepend_opt_len + 1;
-              lt_opt_process_env_prepend (p);
-            }
-          else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
-            {
-              lt_opt_process_env_prepend (argv[++i]); /* don't copy */
-            }
-          else
-            lt_fatal ("%s missing required argument", env_prepend_opt);
-          continue;
-        }
-      if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
-        {
-          if (argv[i][env_append_opt_len] == '=')
-            {
-              const char *p = argv[i] + env_append_opt_len + 1;
-              lt_opt_process_env_append (p);
-            }
-          else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
-            {
-              lt_opt_process_env_append (argv[++i]); /* don't copy */
-            }
-          else
-            lt_fatal ("%s missing required argument", env_append_opt);
-          continue;
-        }
-      if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
-        {
-          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
-             namespace, but it is not one of the ones we know about and
-             have already dealt with, above (inluding dump-script), then
-             report an error. Otherwise, targets might begin to believe
-             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
-             namespace. The first time any user complains about this, we'll
-             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
-             or a configure.ac-settable value.
-           */
-          lt_fatal ("Unrecognized option in %s namespace: '%s'",
-                    ltwrapper_option_prefix, argv[i]);
-        }
-      /* otherwise ... */
-      newargz[++newargc] = xstrdup (argv[i]);
+      lt_fatal ("Could not open %s for writing", newargz[1]);
     }
-  newargz[++newargc] = NULL;
+  fprintf (shwrapper, "%s", script_text);
+  fclose (shwrapper);
 
-  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
-  for (i = 0; i < newargc; i++)
+  make_executable (newargz[1]);
+
+  for (i = 1; i < argc; i++)
+    newargz[i + 1] = xstrdup (argv[i]);
+  newargz[argc + 1] = NULL;
+
+  for (i = 0; i < argc + 1; i++)
     {
-      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
+      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, newargz[i]));
     }
 
 EOF
 
            case $host_os in
              mingw*)
-               cat <<"EOF"
+               cat <<EOF
   /* execv doesn't actually work on mingw as expected on unix */
-  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+  rval = _spawnv (_P_WAIT, "$lt_newargv0", (const char * const *) newargz);
   if (rval == -1)
     {
       /* failed to start process */
-      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
+      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"$lt_newargv0\": errno = %d\n", errno));
       return 127;
     }
   return rval;
+}
 EOF
                ;;
              *)
-               cat <<"EOF"
-  execv (lt_argv_zero, newargz);
+               cat <<EOF
+  execv ("$lt_newargv0", newargz);
   return rval; /* =127, but avoids unused variable warning */
+}
 EOF
                ;;
            esac
 
            cat <<"EOF"
-}
 
 void *
 xmalloc (size_t num)
@@ -3853,177 +3506,6 @@ lt_fatal (const char *message, ...)
   lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
   va_end (ap);
 }
-
-void
-lt_setenv (const char *name, const char *value)
-{
-  LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
-                          (name ? name : "<NULL>"),
-                          (value ? value : "<NULL>")));
-  {
-#ifdef HAVE_SETENV
-    /* always make a copy, for consistency with !HAVE_SETENV */
-    char *str = xstrdup (value);
-    setenv (name, str, 1);
-#else
-    int len = strlen (name) + 1 + strlen (value) + 1;
-    char *str = XMALLOC (char, len);
-    sprintf (str, "%s=%s", name, value);
-    if (putenv (str) != EXIT_SUCCESS)
-      {
-        XFREE (str);
-      }
-#endif
-  }
-}
-
-char *
-lt_extend_str (const char *orig_value, const char *add, int to_end)
-{
-  char *new_value;
-  if (orig_value && *orig_value)
-    {
-      int orig_value_len = strlen (orig_value);
-      int add_len = strlen (add);
-      new_value = XMALLOC (char, add_len + orig_value_len + 1);
-      if (to_end)
-        {
-          strcpy (new_value, orig_value);
-          strcpy (new_value + orig_value_len, add);
-        }
-      else
-        {
-          strcpy (new_value, add);
-          strcpy (new_value + add_len, orig_value);
-        }
-    }
-  else
-    {
-      new_value = xstrdup (add);
-    }
-  return new_value;
-}
-
-int
-lt_split_name_value (const char *arg, char** name, char** value)
-{
-  const char *p;
-  int len;
-  if (!arg || !*arg)
-    return 1;
-
-  p = strchr (arg, (int)'=');
-
-  if (!p)
-    return 1;
-
-  *value = xstrdup (++p);
-
-  len = strlen (arg) - strlen (*value);
-  *name = XMALLOC (char, len);
-  strncpy (*name, arg, len-1);
-  (*name)[len - 1] = '\0';
-
-  return 0;
-}
-
-void
-lt_opt_process_env_set (const char *arg)
-{
-  char *name = NULL;
-  char *value = NULL;
-
-  if (lt_split_name_value (arg, &name, &value) != 0)
-    {
-      XFREE (name);
-      XFREE (value);
-      lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
-    }
-
-  lt_setenv (name, value);
-  XFREE (name);
-  XFREE (value);
-}
-
-void
-lt_opt_process_env_prepend (const char *arg)
-{
-  char *name = NULL;
-  char *value = NULL;
-  char *new_value = NULL;
-
-  if (lt_split_name_value (arg, &name, &value) != 0)
-    {
-      XFREE (name);
-      XFREE (value);
-      lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
-    }
-
-  new_value = lt_extend_str (getenv (name), value, 0);
-  lt_setenv (name, new_value);
-  XFREE (new_value);
-  XFREE (name);
-  XFREE (value);
-}
-
-void
-lt_opt_process_env_append (const char *arg)
-{
-  char *name = NULL;
-  char *value = NULL;
-  char *new_value = NULL;
-
-  if (lt_split_name_value (arg, &name, &value) != 0)
-    {
-      XFREE (name);
-      XFREE (value);
-      lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
-    }
-
-  new_value = lt_extend_str (getenv (name), value, 1);
-  lt_setenv (name, new_value);
-  XFREE (new_value);
-  XFREE (name);
-  XFREE (value);
-}
-
-void
-lt_update_exe_path (const char *name, const char *value)
-{
-  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-                          (name ? name : "<NULL>"),
-                          (value ? value : "<NULL>")));
-
-  if (name && *name && value && *value)
-    {
-      char *new_value = lt_extend_str (getenv (name), value, 0);
-      /* some systems can't cope with a ':'-terminated path #' */
-      int len = strlen (new_value);
-      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
-        {
-          new_value[len-1] = '\0';
-        }
-      lt_setenv (name, new_value);
-      XFREE (new_value);
-    }
-}
-
-void
-lt_update_lib_path (const char *name, const char *value)
-{
-  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-                          (name ? name : "<NULL>"),
-                          (value ? value : "<NULL>")));
-
-  if (name && *name && value && *value)
-    {
-      char *new_value = lt_extend_str (getenv (name), value, 0);
-      lt_setenv (name, new_value);
-      XFREE (new_value);
-    }
-}
-
-
 EOF
 }
 # end: func_emit_cwrapperexe_src
@@ -4033,7 +3515,7 @@ func_mode_link ()
 {
     $opt_debug
     case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
       # It is impossible to link a dll without this setting, and
       # we shouldn't force the makefile maintainer to figure out
       # which system we are compiling for in order to pass an extra
@@ -4477,13 +3959,6 @@ func_mode_link ()
       -L*)
        func_stripname '-L' '' "$arg"
        dir=$func_stripname_result
-       if test -z "$dir"; then
-         if test "$#" -gt 0; then
-           func_fatal_error "require no space between \`-L' and \`$1'"
-         else
-           func_fatal_error "need path for \`-L' option"
-         fi
-       fi
        # We need an absolute path.
        case $dir in
        [\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -4502,16 +3977,14 @@ func_mode_link ()
          ;;
        esac
        case $host in
-       *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+       *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
          testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
          case :$dllsearchpath: in
          *":$dir:"*) ;;
-         ::) dllsearchpath=$dir;;
          *) dllsearchpath="$dllsearchpath:$dir";;
          esac
          case :$dllsearchpath: in
          *":$testbindir:"*) ;;
-         ::) dllsearchpath=$testbindir;;
          *) dllsearchpath="$dllsearchpath:$testbindir";;
          esac
          ;;
@@ -4522,7 +3995,7 @@ func_mode_link ()
       -l*)
        if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
          case $host in
-         *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
+         *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
            # These systems don't actually have a C or math library (as such)
            continue
            ;;
@@ -4599,7 +4072,7 @@ func_mode_link ()
 
       -no-install)
        case $host in
-       *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
+       *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
          # The PATH hackery in wrapper scripts is required on Windows
          # and Darwin in order for the loader to find any dlls it needs.
          func_warning "\`-no-install' is ignored for $host"
@@ -4716,6 +4189,16 @@ func_mode_link ()
        arg=$func_stripname_result
        ;;
 
+      -Wl,--as-needed)
+       deplibs="$deplibs $arg"
+       continue
+       ;;
+
+      -Wl,--as-needed)
+       deplibs="$deplibs $arg"
+       continue
+       ;;
+
       -Wl,*)
        func_stripname '-Wl,' '' "$arg"
        args=$func_stripname_result
@@ -5033,10 +4516,7 @@ func_mode_link ()
        case $pass in
        dlopen) libs="$dlfiles" ;;
        dlpreopen) libs="$dlprefiles" ;;
-       link)
-         libs="$deplibs %DEPLIBS%"
-         test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-         ;;
+       link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
        esac
       fi
       if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -5070,6 +4550,15 @@ func_mode_link ()
        lib=
        found=no
        case $deplib in
+       -Wl,--as-needed)
+         if test "$linkmode,$pass" = "prog,link"; then
+           compile_deplibs="$deplib $compile_deplibs"
+           finalize_deplibs="$deplib $finalize_deplibs"
+         else
+           deplibs="$deplib $deplibs"
+         fi
+         continue
+         ;;
        -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
          if test "$linkmode,$pass" = "prog,link"; then
            compile_deplibs="$deplib $compile_deplibs"
@@ -5347,19 +4836,19 @@ func_mode_link ()
            # 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
 
@@ -5559,7 +5048,7 @@ func_mode_link ()
        if test -n "$library_names" &&
           { test "$use_static_libs" = no || test -z "$old_library"; }; then
          case $host in
-         *cygwin* | *mingw* | *cegcc*)
+         *cygwin* | *mingw*)
              # No point in relinking DLLs because paths are not encoded
              notinst_deplibs="$notinst_deplibs $lib"
              need_relink=no
@@ -5629,7 +5118,7 @@ func_mode_link ()
            elif test -n "$soname_spec"; then
              # bleh windows
              case $host in
-             *cygwin* | mingw* | *cegcc*)
+             *cygwin* | mingw*)
                func_arith $current - $age
                major=$func_arith_result
                versuffix="-$major"
@@ -5896,7 +5385,6 @@ func_mode_link ()
          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)
@@ -6210,9 +5698,6 @@ func_mode_link ()
            revision="$number_minor"
            lt_irix_increment=no
            ;;
-         *)
-           func_fatal_configuration "$modename: unknown library version type \`$version_type'"
-           ;;
          esac
          ;;
        no)
@@ -6412,7 +5897,7 @@ func_mode_link ()
        tempremovelist=`$ECHO "$output_objdir/*"`
        for p in $tempremovelist; do
          case $p in
-           *.$objext | *.gcno)
+           *.$objext)
               ;;
            $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
               if test "X$precious_files_regex" != "X"; then
@@ -6483,7 +5968,7 @@ func_mode_link ()
       if test "$build_libtool_libs" = yes; then
        if test -n "$rpath"; then
          case $host in
-         *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
+         *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
            # these systems don't actually have a c library (as such)!
            ;;
          *-*-rhapsody* | *-*-darwin1.[012])
@@ -6982,7 +6467,7 @@ EOF
 
        orig_export_symbols=
        case $host_os in
-       cygwin* | mingw* | cegcc*)
+       cygwin* | mingw*)
          if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
            # exporting using user supplied symfile
            if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
@@ -7607,16 +7092,14 @@ EOF
          esac
        fi
        case $host in
-       *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+       *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
          testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
          case :$dllsearchpath: in
          *":$libdir:"*) ;;
-         ::) dllsearchpath=$libdir;;
          *) dllsearchpath="$dllsearchpath:$libdir";;
          esac
          case :$dllsearchpath: in
          *":$testbindir:"*) ;;
-         ::) dllsearchpath=$testbindir;;
          *) dllsearchpath="$dllsearchpath:$testbindir";;
          esac
          ;;
@@ -7686,10 +7169,6 @@ EOF
           wrappers_required=no
         fi
         ;;
-      *cegcc)
-        # Disable wrappers for cegcc, we are cross compiling anyway.
-        wrappers_required=no
-        ;;
       *)
         if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
           wrappers_required=no
@@ -7842,10 +7321,11 @@ EOF
 
            func_emit_cwrapperexe_src > $cwrappersource
 
-           # The wrapper executable is built using the $host compiler,
-           # because it contains $host paths and files. If cross-
-           # compiling, it, like the target executable, must be
-           # executed on the $host or under an emulation environment.
+           # we should really use a build-platform specific compiler
+           # here, but OTOH, the wrappers (shell script and this C one)
+           # are only useful if you want to execute the "real" binary.
+           # Since the "real" binary is built for $host, then this
+           # wrapper might as well be built for $host, too.
            $opt_dry_run || {
              $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
              $STRIP $cwrapper
@@ -8130,7 +7610,7 @@ EOF
          # place dlname in correct position for cygwin
          tdlname=$dlname
          case $host,$output,$installed,$module,$dlname in
-           *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+           *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
          esac
          $ECHO > $output "\
 # $outputname - a libtool library file
index 9000a05..0d258e0 100644 (file)
@@ -1,13 +1,13 @@
 # ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 #
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-# Written by Gary V. Vaughan, 2004
+#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+#   Written by Gary V. Vaughan, 2004
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 6 ltsugar.m4
+# serial 5 ltsugar.m4
 
 # This is to help aclocal find these macros, as it can't see m4_define.
 AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
@@ -63,14 +63,14 @@ m4_define([lt_append],
 # Produce a SEP delimited list of all paired combinations of elements of
 # PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
 # has the form PREFIXmINFIXSUFFIXn.
-# Needed until we can rely on m4_combine added in Autoconf 2.62.
 m4_define([lt_combine],
-[m4_if(m4_eval([$# > 3]), [1],
-       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
-[[m4_foreach([_Lt_prefix], [$2],
-            [m4_foreach([_Lt_suffix],
-               ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
-       [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
+[m4_if([$2], [], [],
+  [m4_if([$4], [], [],
+    [lt_join(m4_quote(m4_default([$1], [[, ]])),
+      lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_prefix, [$2],
+                  [m4_foreach(_Lt_suffix, lt_car([m4_shiftn(3, $@)]),
+                              [_Lt_prefix[]$3[]_Lt_suffix ])])))))])])dnl
+])
 
 
 # lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
index f3c5309..45cb155 100644 (file)
@@ -9,15 +9,15 @@
 
 # Generated from ltversion.in.
 
-# serial 3017 ltversion.m4
+# serial 2976 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-m4_define([LT_PACKAGE_REVISION], [1.3017])
+m4_define([LT_PACKAGE_VERSION], [2.2.4])
+m4_define([LT_PACKAGE_REVISION], [1.2976])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6b'
-macro_revision='1.3017'
+[macro_version='2.2.4'
+macro_revision='1.2976'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
index eda2985..7e63d75 100644 (file)
@@ -1,6 +1,6 @@
 Name:       alarm-manager
 Summary:    Alarm library
-Version:    0.4.46
+Version:    0.4.52
 Release:    1
 Group:      System/Libraries
 License:    Apache License, Version 2.0
@@ -54,6 +54,9 @@ Alarm server library (devel)
 %prep
 %setup -q
 
+# HACK_removed_dbus_glib_alarm_manager_object_info.diff
+#%patch0 -p1
+
 %build
 
 export LDFLAGS+=" -Wl,--rpath=%{_libdir} -Wl,--as-needed"
@@ -83,6 +86,9 @@ install -m 755 alarm-server_run %{buildroot}/etc/init.d
 
 %post -n alarm-server
 
+heynotitool set setting_time_changed -a
+vconftool set -t int db/system/timechange 0 -i
+
 chmod 755 /usr/bin/alarm-server
 chmod 755 /etc/init.d/alarm-server_run
 
@@ -92,11 +98,6 @@ ln -s /etc/init.d/alarm-server_run /etc/rc.d/rc3.d/S80alarm-server
 ln -s /etc/init.d/alarm-server_run /etc/rc.d/rc5.d/S80alarm-server
 
 %post -n libalarm
-if [ ${USER} == "root" ]
-then
-       chown root:root /usr/lib/libalarm.so.0.0.0
-fi
-
 chmod 644 /usr/lib/libalarm.so.0.0.0