X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fconfigure.ac;h=1d9d13ecece1318874abb24e32b84049c48571fa;hb=738928bee1b9d374e8d3db6508a3975867771734;hp=5f9276cbc748959cbf5dd1cd4d75d7ad42b328ed;hpb=6ac2286b4076d7c84f636589288459bf8f7590cc;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/configure.ac b/gcc/configure.ac index 5f9276cbc74..1d9d13ecece 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -24,7 +24,7 @@ # Initialization and sanity checks # -------------------------------- -AC_PREREQ(2.59) +AC_PREREQ(2.64) AC_INIT AC_CONFIG_SRCDIR(tree.c) AC_CONFIG_HEADER(auto-host.h:config.in) @@ -276,6 +276,7 @@ rm -f a.out a.exe b.out # Find the native compiler AC_PROG_CC AM_PROG_CC_C_O +AC_PROG_CXX ACX_PROG_GNAT([-I"$srcdir"/ada]) # autoconf is lame and doesn't give us any substitution variable for this. @@ -310,6 +311,7 @@ AC_CHECK_SIZEOF(int) AC_CHECK_SIZEOF(long) AC_CHECK_TYPES([long long], [AC_CHECK_SIZEOF(long long)]) AC_CHECK_TYPES([__int64], [AC_CHECK_SIZEOF(__int64)]) +GCC_STDINT_TYPES # --------------------- # Warnings and checking @@ -323,24 +325,30 @@ AC_CHECK_TYPES([__int64], [AC_CHECK_SIZEOF(__int64)]) # So, we only use -pedantic if we can disable those warnings. ACX_PROG_CC_WARNING_OPTS( - m4_quote(m4_do([-W -Wall -Wwrite-strings -Wstrict-prototypes ], - [-Wmissing-prototypes -Wcast-qual])), [loose_warn]) + m4_quote(m4_do([-W -Wall -Wwrite-strings -Wcast-qual])), [loose_warn]) ACX_PROG_CC_WARNING_OPTS( - m4_quote(m4_do([-Wold-style-definition -Wc++-compat ], - [-Wmissing-format-attribute])), [strict_warn]) + m4_quote(m4_do([-Wstrict-prototypes -Wmissing-prototypes])), + [c_loose_warn]) +ACX_PROG_CC_WARNING_OPTS( + m4_quote(m4_do([-Wmissing-format-attribute])), [strict_warn]) +ACX_PROG_CC_WARNING_OPTS( + m4_quote(m4_do([-Wold-style-definition -Wc++-compat])), [c_strict_warn]) ACX_PROG_CC_WARNING_ALMOST_PEDANTIC( m4_quote(m4_do([-Wno-long-long -Wno-variadic-macros ], [-Wno-overlength-strings])), [strict_warn]) ACX_PROG_CC_WARNINGS_ARE_ERRORS([manual], [strict_warn]) # The above macros do nothing if the compiler is not GCC. However, the -# Makefile has more goo to add other flags, so this variabl is used to -# enables warnings only for GCC. +# Makefile has more goo to add other flags, so these variables are used +# to enable warnings only for GCC. warn_cflags= +warn_cxxflags= if test "x$GCC" = "xyes"; then warn_cflags='$(GCC_WARN_CFLAGS)' + warn_cxxflags='$(GCC_WARN_CXXFLAGS)' fi AC_SUBST(warn_cflags) +AC_SUBST(warn_cxxflags) # Enable expensive internal checks is_release= @@ -573,6 +581,13 @@ fi # Miscenalleous configure options # ------------------------------- +# See if we are building gcc with C++. +AC_ARG_ENABLE(build-with-cxx, +[ --enable-build-with-cxx build with C++ compiler instead of C compiler], +ENABLE_BUILD_WITH_CXX=$enableval, +ENABLE_BUILD_WITH_CXX=no) +AC_SUBST(ENABLE_BUILD_WITH_CXX) + # With stabs AC_ARG_WITH(stabs, [ --with-stabs arrange to use stabs instead of host debug format], @@ -770,6 +785,14 @@ AC_SUBST(TARGET_SYSTEM_ROOT) AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) AC_SUBST(CROSS_SYSTEM_HEADER_DIR) +AC_ARG_WITH(specs, + [AS_HELP_STRING([--with-specs=SPECS], + [add SPECS to driver command-line processing])], + [CONFIGURE_SPECS=$withval], + [CONFIGURE_SPECS=] +) +AC_SUBST(CONFIGURE_SPECS) + # Build with intermodule optimisations AC_ARG_ENABLE(intermodule, [ --enable-intermodule build the compiler in one step], @@ -805,11 +828,6 @@ AC_ARG_ENABLE(languages, esac], [enable_languages=c]) -# Used by documentation targets -AC_SUBST(datarootdir) -AC_SUBST(docdir) -AC_SUBST(htmldir) - AC_ARG_WITH(multilib-list, [ --with-multilib-list Select multilibs (SH only)], :, @@ -1905,6 +1923,17 @@ else AC_PATH_PROG(gcc_cv_ld, $LD_FOR_TARGET) fi]) +ORIGINAL_PLUGIN_LD_FOR_TARGET=$gcc_cv_ld +PLUGIN_LD=`basename $gcc_cv_ld` +AC_ARG_WITH(plugin-ld, +[ --with-plugin-ld=[[ARG]] specify the plugin linker], +[if test x"$withval" != x; then + ORIGINAL_PLUGIN_LD_FOR_TARGET="$withval" + PLUGIN_LD="$withval" + fi]) +AC_SUBST(ORIGINAL_PLUGIN_LD_FOR_TARGET) +AC_DEFINE_UNQUOTED(PLUGIN_LD, "$PLUGIN_LD", [Specify plugin linker]) + ORIGINAL_LD_FOR_TARGET=$gcc_cv_ld AC_SUBST(ORIGINAL_LD_FOR_TARGET) case "$ORIGINAL_LD_FOR_TARGET" in @@ -2090,6 +2119,20 @@ gcc_GAS_CHECK_FEATURE([.hidden], gcc_cv_as_hidden, [ .hidden foobar foobar:]) +changequote(,)dnl +if test $in_tree_ld != yes ; then + ld_ver=`$gcc_cv_ld --version 2>/dev/null | sed 1q` + if echo "$ld_ver" | grep GNU > /dev/null; then + ld_vers=`echo $ld_ver | sed -n \ + -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*.*\)$,\1,p'` + ld_date=`echo $ld_ver | sed -n 's,^.*\([2-9][0-9][0-9][0-9]\)[-]*\([01][0-9]\)[-]*\([0-3][0-9]\).*$,\1\2\3,p'` + ld_vers_major=`expr "$ld_vers" : '\([0-9]*\)'` + ld_vers_minor=`expr "$ld_vers" : '[0-9]*\.\([0-9]*\)'` + ld_vers_patch=`expr "$ld_vers" : '[0-9]*\.[0-9]*\.\([0-9]*\)'` + fi +fi +changequote([,])dnl + AC_CACHE_CHECK(linker for .hidden support, gcc_cv_ld_hidden, [if test $in_tree_ld = yes ; then gcc_cv_ld_hidden=no @@ -2100,14 +2143,7 @@ AC_CACHE_CHECK(linker for .hidden support, gcc_cv_ld_hidden, else changequote(,)dnl gcc_cv_ld_hidden=yes - ld_ver=`$gcc_cv_ld --version 2>/dev/null | sed 1q` if echo "$ld_ver" | grep GNU > /dev/null; then - ld_vers=`echo $ld_ver | sed -n \ - -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*.*\)$,\1,p'` - ld_date=`echo $ld_ver | sed -n 's,^.*\([2-9][0-9][0-9][0-9]\)[-]*\([01][0-9]\)[-]*\([0-3][0-9]\).*$,\1\2\3,p'` - ld_vers_major=`expr "$ld_vers" : '\([0-9]*\)'` - ld_vers_minor=`expr "$ld_vers" : '[0-9]*\.\([0-9]*\)'` - ld_vers_patch=`expr "$ld_vers" : '[0-9]*\.[0-9]*\.\([0-9]*\)'` if test 0"$ld_date" -lt 20020404; then if test -n "$ld_date"; then # If there was date string, but was earlier than 2002-04-04, fail @@ -2291,6 +2327,17 @@ AC_DEFINE_UNQUOTED(HAVE_GAS_CFI_PERSONALITY_DIRECTIVE, then echo 1; else echo 0; fi`], [Define 0/1 if your assembler supports .cfi_personality.]) +gcc_GAS_CHECK_FEATURE([cfi sections directive], + gcc_cv_as_cfi_sections_directive, ,, +[ .text + .cfi_sections .debug_frame, .eh_frame + .cfi_startproc + .cfi_endproc]) +AC_DEFINE_UNQUOTED(HAVE_GAS_CFI_SECTIONS_DIRECTIVE, + [`if test $gcc_cv_as_cfi_sections_directive = yes; + then echo 1; else echo 0; fi`], + [Define 0/1 if your assembler supports .cfi_sections.]) + # GAS versions up to and including 2.11.0 may mis-optimize # .eh_frame data. gcc_GAS_CHECK_FEATURE(eh_frame optimization, gcc_cv_as_eh_frame, @@ -2384,7 +2431,13 @@ else [elf,2,16,0], [--fatal-warnings], [.section .text,"axG",%progbits,.foo,comdat]) fi -if test $in_tree_ld != yes && test x"$ld_vers" != x; then +if test $in_tree_ld = yes ; then + comdat_group=no + if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 16 -o "$gcc_cv_gld_major_version" -gt 2 \ + && test $in_tree_ld_is_elf = yes; then + comdat_group=yes + fi +elif test x"$ld_vers" != x; then comdat_group=yes if test 0"$ld_date" -lt 20050308; then if test -n "$ld_date"; then @@ -2408,6 +2461,15 @@ AC_DEFINE_UNQUOTED(HAVE_COMDAT_GROUP, [`if test $gcc_cv_as_comdat_group = yes || test $gcc_cv_as_comdat_group_percent = yes; then echo 1; else echo 0; fi`], [Define 0/1 if your assembler and linker support COMDAT groups.]) +gcc_GAS_CHECK_FEATURE([line table discriminator support], + gcc_cv_as_discriminator, + [2,19,51],, +[ .text + .file 1 "conf.c" + .loc 1 1 0 discriminator 1],, +[AC_DEFINE(HAVE_GAS_DISCRIMINATOR, 1, + [Define if your assembler supports the .loc discriminator sub-directive.])]) + # Thread-local storage - the check is heavily parameterized. conftest_s= tls_first_major= @@ -2570,6 +2632,22 @@ x: tls_first_minor=16 tls_as_opt='-32 --fatal-warnings' ;; + m68k-*-*) + conftest_s=' + .section .tdata,"awT",@progbits +x: + .word 2 + .text +foo: + move.l x@TLSGD(%a5),%a0 + move.l x@TLSLDM(%a5),%a0 + move.l x@TLSLDO(%a5),%a0 + move.l x@TLSIE(%a5),%a0 + move.l x@TLSLE(%a5),%a0' + tls_first_major=2 + tls_first_minor=19 + tls_as_opt='--fatal-warnings' + ;; powerpc-*-*) conftest_s=' .section ".tdata","awT",@progbits @@ -2937,7 +3015,35 @@ changequote(,)dnl i[34567]86-*-* | x86_64-*-*) changequote([,])dnl case $target_os in + cygwin*) + # Full C++ conformance when using a shared libstdc++-v3 requires some + # support from the Cygwin DLL, which in more recent versions exports + # wrappers to aid in interposing and redirecting operators new, delete, + # etc., as per n2800 #17.6.4.6 [replacement.functions]. Check if we + # are configuring for a version of Cygwin that exports the wrappers. + if test x$host = x$target; then + AC_CHECK_FUNC([__wrap__Znaj],[gcc_ac_cygwin_dll_wrappers=yes],[gcc_ac_cygwin_dll_wrappers=no]) + else + # Can't check presence of libc functions during cross-compile, so + # we just have to assume we're building for an up-to-date target. + gcc_ac_cygwin_dll_wrappers=yes + fi + AC_DEFINE_UNQUOTED(USE_CYGWIN_LIBSTDCXX_WRAPPERS, + [`if test $gcc_ac_cygwin_dll_wrappers = yes; then echo 1; else echo 0; fi`], + [Define if you want to generate code by default that assumes that the + Cygwin DLL exports wrappers to support libstdc++ function replacement.]) + esac + case $target_os in cygwin* | pe | mingw32*) + # Recent binutils allows the three-operand form of ".comm" on PE. This + # definition is used unconditionally to initialise the default state of + # the target option variable that governs usage of the feature. + gcc_GAS_CHECK_FEATURE([.comm with alignment], gcc_cv_as_comm_has_align, + [2,19,52],,[.comm foo,1,32]) + AC_DEFINE_UNQUOTED(HAVE_GAS_ALIGNED_COMM, + [`if test $gcc_cv_as_comm_has_align = yes; then echo 1; else echo 0; fi`], + [Define if your assembler supports specifying the alignment + of objects allocated using the GAS .comm command.]) # Used for DWARF 2 in PE gcc_GAS_CHECK_FEATURE([.secrel32 relocs], gcc_cv_as_ix86_pe_secrel32, @@ -2986,6 +3092,12 @@ foo: nop [AC_DEFINE(HAVE_AS_IX86_SAHF, 1, [Define if your assembler supports the sahf mnemonic.])]) + gcc_GAS_CHECK_FEATURE([swap suffix], + gcc_cv_as_ix86_swap,,, + [movl.s %esp, %ebp],, + [AC_DEFINE(HAVE_AS_IX86_SWAP, 1, + [Define if your assembler supports the swap suffix.])]) + gcc_GAS_CHECK_FEATURE([different section symbol subtraction], gcc_cv_as_ix86_diff_sect_delta,,, [.section .rodata @@ -3091,7 +3203,7 @@ foo: nop esac gcc_GAS_CHECK_FEATURE([move fp gpr support], - gcc_cv_as_powerpc_mfpgpr, [9,99,0],, + gcc_cv_as_powerpc_mfpgpr, [2,19,2],, [$conftest_s],, [AC_DEFINE(HAVE_AS_MFPGPR, 1, [Define if your assembler supports mffgpr and mftgpr.])]) @@ -3125,7 +3237,7 @@ LCF0: esac gcc_GAS_CHECK_FEATURE([compare bytes support], - gcc_cv_as_powerpc_cmpb, [9,99,0], -a32, + gcc_cv_as_powerpc_cmpb, [2,19,2], -a32, [$conftest_s],, [AC_DEFINE(HAVE_AS_CMPB, 1, [Define if your assembler supports cmpb.])]) @@ -3140,7 +3252,7 @@ LCF0: esac gcc_GAS_CHECK_FEATURE([decimal float support], - gcc_cv_as_powerpc_dfp, [9,99,0], -a32, + gcc_cv_as_powerpc_dfp, [2,19,2], -a32, [$conftest_s],, [AC_DEFINE(HAVE_AS_DFP, 1, [Define if your assembler supports DFP instructions.])]) @@ -3155,11 +3267,54 @@ LCF0: esac gcc_GAS_CHECK_FEATURE([vector-scalar support], - gcc_cv_as_powerpc_vsx, [9,99,0], -a32, + gcc_cv_as_powerpc_vsx, [2,19,2], -a32, [$conftest_s],, [AC_DEFINE(HAVE_AS_VSX, 1, [Define if your assembler supports VSX instructions.])]) + case $target in + *-*-aix*) conftest_s=' .machine "pwr7" + .csect .text[[PR]] + popcntd 3,3';; + *) conftest_s=' .machine power7 + .text + popcntd 3,3';; + esac + + gcc_GAS_CHECK_FEATURE([popcntd support], + gcc_cv_as_powerpc_popcntd, [2,19,2], -a32, + [$conftest_s],, + [AC_DEFINE(HAVE_AS_POPCNTD, 1, + [Define if your assembler supports POPCNTD instructions.])]) + + case $target in + *-*-aix*) conftest_s=' .csect .text[[PR]] + lwsync';; + *) conftest_s=' .text + lwsync';; + esac + + gcc_GAS_CHECK_FEATURE([lwsync support], + gcc_cv_as_powerpc_lwsync, [2,19,2], -a32, + [$conftest_s],, + [AC_DEFINE(HAVE_AS_LWSYNC, 1, + [Define if your assembler supports LWSYNC instructions.])]) + + case $target in + *-*-aix*) conftest_s=' .machine "476" + .csect .text[[PR]] + dci 0';; + *) conftest_s=' .machine "476" + .text + dci 0';; + esac + + gcc_GAS_CHECK_FEATURE([data cache invalidate support], + gcc_cv_as_powerpc_dci, [9,99,0], -a32, + [$conftest_s],, + [AC_DEFINE(HAVE_AS_DCI, 1, + [Define if your assembler supports the DCI/ICI instructions.])]) + gcc_GAS_CHECK_FEATURE([.gnu_attribute support], gcc_cv_as_powerpc_gnu_attribute, [2,18,0],, [.gnu_attribute 4,1],, @@ -3201,6 +3356,87 @@ x: .dtprelword x+0x8000],, [AC_DEFINE(HAVE_AS_DTPRELWORD, 1, [Define if your assembler supports .dtprelword.])]) + + AC_MSG_CHECKING(assembler and linker for explicit JALR relocation) + gcc_cv_as_ld_jalr_reloc=no + if test $gcc_cv_as_mips_explicit_relocs = yes; then + if test $in_tree_ld = yes ; then + if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 20 -o "$gcc_cv_gld_major_version" -gt 2 \ + && test $in_tree_ld_is_elf = yes; then + gcc_cv_as_ld_jalr_reloc=yes + fi + elif test x$gcc_cv_as != x -a x$gcc_cv_ld != x -a x$gcc_cv_objdump != x; then + echo ' .ent x' > conftest.s + echo 'x: ld $2,%got_disp(y)($3)' >> conftest.s + echo ' ld $25,%call16(y)($28)' >> conftest.s + echo ' .reloc 1f,R_MIPS_JALR,y' >> conftest.s + echo '1: jalr $25' >> conftest.s + echo ' .reloc 1f,R_MIPS_JALR,x' >> conftest.s + echo '1: jalr $25' >> conftest.s + echo ' .end x' >> conftest.s + if $gcc_cv_as -o conftest.o conftest.s >/dev/null 2>&AS_MESSAGE_LOG_FD \ + && $gcc_cv_ld -shared -o conftest.so conftest.o >/dev/null 2>&AS_MESSAGE_LOG_FD; then + if $gcc_cv_objdump -d conftest.so | grep -q jalr \ + && $gcc_cv_objdump -d conftest.so | grep -q "bal.*"; then + gcc_cv_as_ld_jalr_reloc=yes + fi + fi + rm -f conftest.* + fi + fi + if test $gcc_cv_as_ld_jalr_reloc = yes; then + if test x$target_cpu_default = x; then + target_cpu_default=MASK_RELAX_PIC_CALLS + else + target_cpu_default="($target_cpu_default)|MASK_RELAX_PIC_CALLS" + fi + fi + AC_MSG_RESULT($gcc_cv_as_ld_jalr_reloc) + + AC_CACHE_CHECK([linker for .eh_frame personality relaxation], + [gcc_cv_ld_mips_personality_relaxation], + [gcc_cv_ld_mips_personality_relaxation=no + if test $in_tree_ld = yes ; then + if test "$gcc_cv_gld_major_version" -eq 2 \ + -a "$gcc_cv_gld_minor_version" -ge 21 \ + -o "$gcc_cv_gld_major_version" -gt 2; then + gcc_cv_ld_mips_personality_relaxation=yes + fi + elif test x$gcc_cv_as != x \ + -a x$gcc_cv_ld != x \ + -a x$gcc_cv_readelf != x ; then + cat > conftest.s < /dev/null 2>&1 \ + && $gcc_cv_ld -o conftest conftest.o -shared > /dev/null 2>&1; then + if $gcc_cv_readelf -d conftest 2>&1 \ + | grep TEXTREL > /dev/null 2>&1; then + : + elif $gcc_cv_readelf --relocs conftest 2>&1 \ + | grep 'R_MIPS_REL32 *$' > /dev/null 2>&1; then + : + else + gcc_cv_ld_mips_personality_relaxation=yes + fi + fi + fi + rm -f conftest.s conftest.o conftest]) + if test x$gcc_cv_ld_mips_personality_relaxation = xyes; then + AC_DEFINE(HAVE_LD_PERSONALITY_RELAXATION, 1, + [Define if your linker can relax absolute .eh_frame personality +pointers into PC-relative form.]) + fi ;; esac @@ -3303,6 +3539,32 @@ gcc_GAS_CHECK_FEATURE([.lcomm with alignment], gcc_cv_as_lcomm_with_alignment, [AC_DEFINE(HAVE_GAS_LCOMM_WITH_ALIGNMENT, 1, [Define if your assembler supports .lcomm with an alignment field.])]) +AC_ARG_ENABLE(gnu-unique-object, + [ --enable-gnu-unique-object enable the use of the @gnu_unique_object ELF extension on + glibc systems], + [case $enable_gnu_unique_object in + yes | no) ;; + *) AC_MSG_ERROR(['$enable_gnu_unique_object' is an invalid value for --enable-gnu-unique-object. +Valid choices are 'yes' and 'no'.]) ;; + esac], + [gcc_GAS_CHECK_FEATURE([gnu_unique_object], gcc_cv_as_gnu_unique_object, + [elf,2,19,52],, + [.type foo, @gnu_unique_object],, +# Also check for ld.so support, i.e. glibc 2.11 or higher. + [if test x$host = x$build -a x$host = x$target && + glibcver=`ldd --version 2>/dev/null`; then + glibcmajor=`expr "$glibcver" : "ldd (GNU libc) \([[0-9]]*\)"` + glibcminor=`expr "$glibcver" : "ldd (GNU libc) [[0-9]]*\.\([[0-9]]*\)"` + glibcnum=`expr $glibcmajor \* 1000 + $glibcminor` + if test "$glibcnum" -ge 2011 ; then + enable_gnu_unique_object=yes + fi + fi])]) +if test x$enable_gnu_unique_object = xyes; then + AC_DEFINE(HAVE_GAS_GNU_UNIQUE_OBJECT, 1, + [Define if your assembler supports @gnu_unique_object.]) +fi + AC_CACHE_CHECK([assembler for tolerance to line number 0], [gcc_cv_as_line_zero], [gcc_cv_as_line_zero=no @@ -3616,7 +3878,7 @@ AC_CACHE_CHECK(__stack_chk_fail in target C library, # simply assert that glibc does provide this, which is true for all # realistically usable GNU/Hurd configurations. gcc_cv_libc_provides_ssp=yes;; - *-*-darwin*) + *-*-darwin* | *-*-freebsd*) AC_CHECK_FUNC(__stack_chk_fail,[gcc_cv_libc_provides_ssp=yes], [echo "no __stack_chk_fail on this target"]) ;; @@ -3687,6 +3949,13 @@ esac], AC_SUBST(GGC) echo "Using $GGC for garbage collection." +# Libraries to use on the host. This will normally be set by the top +# level Makefile. Here we simply capture the value for our Makefile. +if test -z "${HOST_LIBS+set}"; then + HOST_LIBS= +fi +AC_SUBST(HOST_LIBS) + # Use the system's zlib library. zlibdir=-L../zlib zlibinc="-I\$(srcdir)/../zlib" @@ -3838,6 +4107,14 @@ changequote([,])dnl all_compilers="$all_compilers $compilers" all_outputs="$all_outputs $outputs" all_gtfiles="$all_gtfiles [[$subdir]] $gtfiles" + case ",$enable_languages," in + *,lto,*) + AC_DEFINE(ENABLE_LTO, 1, [Define to enable LTO support.]) + enable_lto=yes + AC_SUBST(enable_lto) + ;; + *) ;; + esac done # Pick up gtfiles for c @@ -3857,9 +4134,9 @@ done rm -f Make-hooks touch Make-hooks target_list="all.cross start.encap rest.encap tags \ - install-common install-man install-info install-pdf dvi pdf \ - html uninstall info man srcextra srcman srcinfo \ - mostlyclean clean distclean maintainer-clean" + install-common install-man install-info install-pdf install-html dvi \ + pdf html uninstall info man srcextra srcman srcinfo \ + mostlyclean clean distclean maintainer-clean install-plugin" for t in $target_list do @@ -3914,24 +4191,6 @@ else fi) AC_SUBST(slibdir) -AC_ARG_WITH(datarootdir, -[ --with-datarootdir=DIR Use DIR as the data root [[PREFIX/share]]], -datarootdir="\${prefix}/$with_datarootdir", -datarootdir='$(prefix)/share') -AC_SUBST(datarootdir) - -AC_ARG_WITH(docdir, -[ --with-docdir=DIR Install documentation in DIR [[DATAROOTDIR]]], -docdir="\${prefix}/$with_docdir", -docdir='$(datarootdir)') -AC_SUBST(docdir) - -AC_ARG_WITH(htmldir, -[ --with-htmldir=DIR html documentation in in DIR [[DOCDIR]]], -htmldir="\${prefix}/$with_htmldir", -htmldir='$(docdir)') -AC_SUBST(htmldir) - # Substitute configuration variables AC_SUBST(subdirs) AC_SUBST(srcdir) @@ -4024,6 +4283,12 @@ if test "x${CLOOGLIBS}" != "x" ; then AC_DEFINE(HAVE_cloog, 1, [Define if cloog is in use.]) fi +AC_ARG_VAR(LIBELFLIBS,[How to link libelf]) +AC_ARG_VAR(LIBELFINC,[How to find libelf include files]) +if test "x${LIBELFLIBS}" != "x" ; then + AC_DEFINE(HAVE_libelf, 1, [Define if libelf is in use.]) +fi + # Check for plugin support AC_ARG_ENABLE(plugin, [ --enable-plugin enable plugin support], @@ -4050,14 +4315,8 @@ if test x"$enable_plugin" = x"yes"; then fi # Check -ldl - LDFLAGS="$LDFLAGS -ldl" - AC_MSG_CHECKING([for -ldl]) - AC_TRY_LINK( - [#include ], - [volatile int f = 0; if (f) dlopen ("dummy", 0);], - [AC_MSG_RESULT([yes]); have_dl=yes], - [AC_MSG_RESULT([no])]) - if test x"$have_dl" = x"yes"; then + AC_SEARCH_LIBS([dlopen], [dl]) + if test x"$ac_cv_search_dlopen" = x"-ldl"; then pluginlibs="$pluginlibs -ldl" fi @@ -4068,7 +4327,7 @@ if test x"$enable_plugin" = x"yes"; then [extern int X;],[return X == 0;], [AC_MSG_RESULT([yes]); have_pic_shared=yes], [AC_MSG_RESULT([no]); have_pic_shared=no]) - if test x"$have_pic_shared" != x"yes"; then + if test x"$have_pic_shared" != x"yes" -o x"$ac_cv_search_dlopen" = x"no"; then pluginlibs= enable_plugin=no fi