diff options
| author | Mike Stump <mikestump@comcast.net> | 2010-05-29 20:54:18 +0000 |
|---|---|---|
| committer | Mike Stump <mrs@gcc.gnu.org> | 2010-05-29 20:54:18 +0000 |
| commit | 8df9a5db771b92d45f20665e38279a18f1ebff00 (patch) | |
| tree | 70790d49358106a4377828eb126b5f95dc79c7a5 /libjava/classpath/configure.ac | |
| parent | 24e47c76ba526c0f90045ea5fe0d26cc41fdf2d3 (diff) | |
| download | gcc-8df9a5db771b92d45f20665e38279a18f1ebff00.zip gcc-8df9a5db771b92d45f20665e38279a18f1ebff00.tar.gz gcc-8df9a5db771b92d45f20665e38279a18f1ebff00.tar.bz2 | |
configure.ac: Add multilib support for gmp.
* configure.ac: Add multilib support for gmp. Proper -I and -L
flags for gmp are added.
* configure: Regenerate.
From-SVN: r160037
Diffstat (limited to 'libjava/classpath/configure.ac')
| -rw-r--r-- | libjava/classpath/configure.ac | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/libjava/classpath/configure.ac b/libjava/classpath/configure.ac index 98a17f8..d2d149f 100644 --- a/libjava/classpath/configure.ac +++ b/libjava/classpath/configure.ac @@ -812,10 +812,32 @@ if test "x${COMPILE_JNI}" = xyes; then dnl __gmpz_mul_si for earlier versions (>= 3.1). dnl IMPORTANT: if you decide to look for __gmpz_combit, don't forget to dnl change the name of the corresponding ac_ variable on lines 860... + AC_ARG_WITH(gmp, [ --with-gmp=PATH specify prefix directory for the installed GMP package. + Equivalent to --with-gmp-include=PATH/include + plus --with-gmp-lib=PATH/lib]) + AC_ARG_WITH(gmp_include, [ --with-gmp-include=PATH specify directory for installed GMP include files]) + AC_ARG_WITH(gmp_lib, [ --with-gmp-lib=PATH specify directory for the installed GMP library]) + + if test "x$with_gmp" != x; then + gmplibs=-lgmp + gmpinc= + gmplibs="-L$with_gmp/lib $gmplibs" + gmpinc="-I$with_gmp/include $gmpinc" + if test "x$with_gmp_include" != x; then + gmpinc="-I$with_gmp_include $gmpinc" + fi + if test "x$with_gmp_lib" != x; then + gmplibs="-L$with_gmp_lib $gmplibs" + fi + else + gmplibs="-lgmp" + gmpinc="-I/usr/include" + fi + if test "x${COMPILE_GMP}" = xyes; then AC_CHECK_LIB(gmp, __gmpz_mul_si, - [GMP_CFLAGS=-I/usr/include - GMP_LIBS=-lgmp ], + [GMP_CFLAGS="$gmpinc" + GMP_LIBS="$gmplibs" ], [GMP_CFLAGS= GMP_LIBS= ]) AC_SUBST(GMP_CFLAGS) |