From 900e457fe3902a83fc6cd9722b8b30f8532c06fb Mon Sep 17 00:00:00 2001 From: Marti Maria Date: Mon, 4 Apr 2011 16:43:44 +0200 Subject: Moved AC_CANONICAL_SYSTEM to AC_CANONICAL_HOST --- Makefile.in | 5 ----- configure | 45 --------------------------------------------- configure.ac | 2 +- include/Makefile.in | 5 ----- src/Makefile.in | 5 ----- testbed/Makefile.in | 5 ----- utils/jpgicc/Makefile.in | 5 ----- utils/linkicc/Makefile.in | 5 ----- utils/psicc/Makefile.in | 5 ----- utils/tificc/Makefile.in | 5 ----- utils/transicc/Makefile.in | 5 ----- 11 files changed, 1 insertion(+), 91 deletions(-) diff --git a/Makefile.in b/Makefile.in index 85a9790..b23d4db 100644 --- a/Makefile.in +++ b/Makefile.in @@ -40,7 +40,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -target_triplet = @target@ LIBOBJDIR = DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/lcms2.pc.in \ @@ -218,11 +217,7 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ -target = @target@ target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ to_host_path_cmd = @to_host_path_cmd@ # Don't require all the GNU mandated files diff --git a/configure b/configure index a729d3e..d875378 100755 --- a/configure +++ b/configure @@ -686,10 +686,6 @@ CYGPATH_W INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM -target_os -target_vendor -target_cpu -target host_os host_vendor host_cpu @@ -1373,7 +1369,6 @@ Program names: System types: --build=BUILD configure for building on BUILD [guessed] --host=HOST cross-compile to build programs to run on HOST [BUILD] - --target=TARGET configure for building compilers for TARGET [HOST] _ACEOF fi @@ -2441,46 +2436,6 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 -$as_echo_n "checking target system type... " >&6; } -if test "${ac_cv_target+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "x$target_alias" = x; then - ac_cv_target=$ac_cv_host -else - ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 -$as_echo "$ac_cv_target" >&6; } -case $ac_cv_target in -*-*-*) ;; -*) as_fn_error "invalid value of canonical target" "$LINENO" 5;; -esac -target=$ac_cv_target -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_target -shift -target_cpu=$1 -target_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -target_os=$* -IFS=$ac_save_IFS -case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac - - -# The aliases save the names the user supplied, while $host etc. -# will get canonicalized. -test -n "$target_alias" && - test "$program_prefix$program_suffix$program_transform_name" = \ - NONENONEs,x,x, && - program_prefix=${target_alias}- - am__api_version="1.9" # Find a good install program. We prefer a C program (faster), diff --git a/configure.ac b/configure.ac index 129f94b..a239cc3 100644 --- a/configure.ac +++ b/configure.ac @@ -39,7 +39,7 @@ AC_SUBST(LIBRARY_REVISION)dnl AC_SUBST(LIBRARY_AGE)dnl # Obtain system type by running config.guess -AC_CANONICAL_SYSTEM +AC_CANONICAL_HOST AM_INIT_AUTOMAKE([foreign 1.7.2 no-define dist-zip]) diff --git a/include/Makefile.in b/include/Makefile.in index 96d99c4..7854e78 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -40,7 +40,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -target_triplet = @target@ LIBOBJDIR = subdir = include DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \ @@ -197,11 +196,7 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ -target = @target@ target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ to_host_path_cmd = @to_host_path_cmd@ include_HEADERS = lcms2.h lcms2_plugin.h EXTRA_DIST = lcms2.h lcms2_plugin.h diff --git a/src/Makefile.in b/src/Makefile.in index cf20196..bfa5ff6 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -40,7 +40,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -target_triplet = @target@ LIBOBJDIR = subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in @@ -217,11 +216,7 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ -target = @target@ target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ to_host_path_cmd = @to_host_path_cmd@ # Don't require all the GNU mandated files diff --git a/testbed/Makefile.in b/testbed/Makefile.in index 8eb1aac..b315179 100644 --- a/testbed/Makefile.in +++ b/testbed/Makefile.in @@ -39,7 +39,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -target_triplet = @target@ LIBOBJDIR = check_PROGRAMS = testcms$(EXEEXT) subdir = testbed @@ -201,11 +200,7 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ -target = @target@ target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ to_host_path_cmd = @to_host_path_cmd@ # Don't require all the GNU mandated files diff --git a/utils/jpgicc/Makefile.in b/utils/jpgicc/Makefile.in index 4c244b0..2d922bf 100644 --- a/utils/jpgicc/Makefile.in +++ b/utils/jpgicc/Makefile.in @@ -41,7 +41,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -target_triplet = @target@ LIBOBJDIR = @HasJPEG_TRUE@bin_PROGRAMS = jpgicc$(EXEEXT) subdir = utils/jpgicc @@ -210,11 +209,7 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ -target = @target@ target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ to_host_path_cmd = @to_host_path_cmd@ # Don't require all the GNU mandated files diff --git a/utils/linkicc/Makefile.in b/utils/linkicc/Makefile.in index 7a7aa78..0d6e525 100644 --- a/utils/linkicc/Makefile.in +++ b/utils/linkicc/Makefile.in @@ -41,7 +41,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -target_triplet = @target@ LIBOBJDIR = bin_PROGRAMS = linkicc$(EXEEXT) subdir = utils/linkicc @@ -207,11 +206,7 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ -target = @target@ target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ to_host_path_cmd = @to_host_path_cmd@ # Don't require all the GNU mandated files diff --git a/utils/psicc/Makefile.in b/utils/psicc/Makefile.in index 69c3212..22aeb6b 100644 --- a/utils/psicc/Makefile.in +++ b/utils/psicc/Makefile.in @@ -41,7 +41,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -target_triplet = @target@ LIBOBJDIR = bin_PROGRAMS = psicc$(EXEEXT) subdir = utils/psicc @@ -206,11 +205,7 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ -target = @target@ target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ to_host_path_cmd = @to_host_path_cmd@ # Don't require all the GNU mandated files diff --git a/utils/tificc/Makefile.in b/utils/tificc/Makefile.in index 93f55c1..f220a36 100644 --- a/utils/tificc/Makefile.in +++ b/utils/tificc/Makefile.in @@ -41,7 +41,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -target_triplet = @target@ LIBOBJDIR = @HasTIFF_TRUE@bin_PROGRAMS = tificc$(EXEEXT) subdir = utils/tificc @@ -209,11 +208,7 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ -target = @target@ target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ to_host_path_cmd = @to_host_path_cmd@ # Don't require all the GNU mandated files diff --git a/utils/transicc/Makefile.in b/utils/transicc/Makefile.in index d1a9fcb..61cb5d5 100644 --- a/utils/transicc/Makefile.in +++ b/utils/transicc/Makefile.in @@ -41,7 +41,6 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -target_triplet = @target@ LIBOBJDIR = bin_PROGRAMS = transicc$(EXEEXT) subdir = utils/transicc @@ -207,11 +206,7 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ -target = @target@ target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ to_host_path_cmd = @to_host_path_cmd@ # Don't require all the GNU mandated files -- cgit v1.2.1