diff options
author | Theodore Ts'o <tytso@mit.edu> | 2009-09-07 17:02:35 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2009-09-07 17:02:35 -0400 |
commit | dc615a21c3c43cd9071926df2633d5b23e2e726b (patch) | |
tree | 2dec30720078a57ca347bc1214aabea4476f7107 /configure.in | |
parent | a9e55a1191cf08fd219466009613ed1a04bbaac0 (diff) | |
parent | 51e64594919c986f87267b895504322a38ec4fac (diff) | |
download | android_external_e2fsprogs-dc615a21c3c43cd9071926df2633d5b23e2e726b.tar.gz android_external_e2fsprogs-dc615a21c3c43cd9071926df2633d5b23e2e726b.tar.bz2 android_external_e2fsprogs-dc615a21c3c43cd9071926df2633d5b23e2e726b.zip |
Merge branch 'maint' into next
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 46 |
1 files changed, 10 insertions, 36 deletions
diff --git a/configure.in b/configure.in index 7ed3d4dd..4bb5b087 100644 --- a/configure.in +++ b/configure.in @@ -72,37 +72,20 @@ CC="diet cc -nostdinc" WITH_DIET_LIBC=yes AC_MSG_RESULT(CC=$CC))dnl dnl -dnl set $(CC) from --with-cc=value -dnl AC_ARG_WITH([cc], -[ --with-cc=COMPILER select compiler to use], -AC_MSG_RESULT(CC=$withval) -CC=$withval, -if test -z "$CC" ; then CC=cc; fi -[AC_MSG_RESULT(CC defaults to $CC)])dnl -export CC -AC_SUBST([CC]) -AC_PROG_CC -AC_PROG_CPP +AC_HELP_STRING([--with-cc],[no longer supported, use CC= instead]), +AC_MSG_ERROR([--with-cc no longer supported; use CC= instead])) dnl -dnl set $(LD) from --with-linker=value -dnl -AC_ARG_WITH([linker], -[ --with-linker=LINKER select linker to use], -AC_MSG_RESULT(LD=$withval) -LD=$withval, -if test -z "$LD" ; then LD=$CC; fi -[AC_MSG_RESULT(LD defaults to $LD)])dnl -export LD -AC_SUBST([LD]) +AC_ARG_WITH([ccopts], +AC_HELP_STRING([--with-ccopts],[no longer supported, use CFLAGS= instead]), +AC_MSG_ERROR([--with-ccopts no longer supported; use CFLAGS= instead])) dnl -dnl set $(CCOPTS) from --with-ccopts=value +AC_ARG_WITH([ldopts], +AC_HELP_STRING([--with-ldopts],[no longer supported, use LDFLAGS= instead]), +AC_MSG_ERROR([--with-ldopts no longer supported; use LDFLAGS= instead])) dnl -AC_ARG_WITH([ccopts], -[ --with-ccopts=CCOPTS select compiler command line options], -AC_MSG_RESULT(CCOPTS is $withval) -CFLAGS=$withval, -)dnl +AC_PROG_CC +AC_PROG_CPP dnl dnl On systems without linux header files, we add an extra include directory dnl that holds enough to fake it (hopefully). Note that the $(top_srcdir) here @@ -138,15 +121,6 @@ LIB_EXT=.a STATIC_LIB_EXT=.a PROFILED_LIB_EXT=.a dnl -dnl set $(LDFLAGS) from --with-ldopts=value -dnl -AC_ARG_WITH([ldopts], -[ --with-ldopts=LDOPTS select linker command line options], -AC_MSG_RESULT(LDFLAGS is $withval) -LDFLAGS=$withval, -)dnl -AC_SUBST(LDFLAGS) -dnl dnl Allow separate `root_prefix' to be specified dnl AC_ARG_WITH([root-prefix], |