~ubuntu-branches/ubuntu/wily/grub2/wily

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-01-11 17:11:44 UTC
  • mfrom: (1.15.12 upstream)
  • mto: This revision was merged to the branch mainline in revision 60.
  • Revision ID: james.westby@ubuntu.com-20110111171144-c4c3hc0jslqa1bxe
Tags: 1.99~20110111-1
* New Bazaar snapshot.
  - Don't check amount of low memory, as reportedly INT 12h can be broken
    and if low memory is too low we wouldn't have gotten into
    grub_machine_init anyway (closes: #588293, LP: #513528).
  - Submenu default support (LP: #691878).
  - Fix optimisation-dependent grub-mklayout crash (closes: #609584).
* branch_butter.patch: Don't free an uninitialised pointer if /proc is
  unmounted (LP: #697493).
* Add a po/LINGUAS file listing the translations we've synced from the TP
  (closes: #609671).

Show diffs side-by-side

added added

removed removed

Lines of Context:
103
103
  platform="$with_platform"
104
104
fi
105
105
 
106
 
# Adjust CPU unless target was explicitly specified.
107
 
if test -z "$target_alias"; then
108
 
  case "$target_cpu"-"$platform" in
109
 
    x86_64-efi) ;;
110
 
    x86_64-emu) ;;
111
 
    x86_64-*) target_cpu=i386 ;;
112
 
    powerpc64-ieee1275) target_cpu=powerpc ;;
113
 
  esac
114
 
fi
 
106
case "$target_cpu"-"$platform" in
 
107
  x86_64-efi) ;;
 
108
  x86_64-emu) ;;
 
109
  x86_64-*) target_cpu=i386 ;;
 
110
  powerpc64-ieee1275) target_cpu=powerpc ;;
 
111
esac
115
112
 
116
113
# Check if the platform is supported, make final adjustments.
117
114
case "$target_cpu"-"$platform" in
867
864
fi
868
865
 
869
866
if test x"$device_mapper_excuse" = x ; then
 
867
  # Check for device-mapper header.
 
868
  AC_CHECK_HEADER([libdevmapper.h], [],
 
869
               [device_mapper_excuse="need libdevmapper header"])
 
870
fi
 
871
 
 
872
if test x"$device_mapper_excuse" = x ; then
870
873
  # Check for device-mapper library.
871
874
  AC_CHECK_LIB([devmapper], [dm_task_create], [],
872
875
               [device_mapper_excuse="need devmapper library"])