diff options
| author | Simon Josefsson <simon@josefsson.org> | 2008-10-30 18:35:50 +0100 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2008-10-30 18:35:50 +0100 |
| commit | 261509eb3dbae24d2675833bf4fcfd3e6de036cc (patch) | |
| tree | b98740eb09ace8794ff01029a896443166663b5a | |
| parent | 6fb327d16a07bcfd92259b5f9d4ef3632324e40d (diff) | |
| download | gnutls-261509eb3dbae24d2675833bf4fcfd3e6de036cc.tar.gz | |
Build fixes.
| -rw-r--r-- | cfg.mk | 2 | ||||
| -rw-r--r-- | lib/m4/hooks.m4 | 48 |
2 files changed, 48 insertions, 2 deletions
@@ -32,9 +32,7 @@ autoreconf: for f in $(PODIR)/*.po.in; do \ cp $$f `echo $$f | sed 's/.in//'`; \ done - mv build-aux/config.rpath build-aux/config.rpath- test -f ./configure || autoreconf --install - mv build-aux/config.rpath- build-aux/config.rpath update-po: refresh-po for f in `ls $(PODIR)/*.po | grep -v quot.po`; do \ diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4 index 62531c39ac..637755b432 100644 --- a/lib/m4/hooks.m4 +++ b/lib/m4/hooks.m4 @@ -22,6 +22,21 @@ AC_DEFUN([LIBGNUTLS_HOOKS], [ + AC_PROG_CXX + + AC_ARG_ENABLE(cxx, + AS_HELP_STRING([--disable-cxx], + [unconditionally disable the C++ library]), + use_cxx=$enableval, use_cxx=yes) + if test "$use_cxx" != "no"; then + AC_LANG_PUSH(C++) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], use_cxx=yes, use_cxx=no) + AC_LANG_POP(C++) + fi + AM_CONDITIONAL(ENABLE_CXX, test "$use_cxx" != "no") + AC_MSG_CHECKING([whether to build C++ library]) + AC_MSG_RESULT($use_cxx) + AC_ARG_WITH(included-libtasn1, AS_HELP_STRING([--with-included-libtasn1], [use the included libtasn1]), included_libtasn1=$withval, @@ -146,4 +161,37 @@ AC_DEFUN([LIBGNUTLS_HOOKS], AC_MSG_RESULT(no) fi AM_CONDITIONAL(ENABLE_OPENPGP, test "$ac_enable_openpgp" = "yes") + + AC_MSG_CHECKING([if gcc/ld supports -Wl,--output-def]) + if test "$enable_shared" = no; then + output_def=no + AC_MSG_RESULT([no need, since shared libraries are disabled]) + else + _gcc_ldflags_save=$LDFLAGS + LDFLAGS="-Wl,--output-def,foo.def" + AC_LINK_IFELSE(AC_LANG_PROGRAM([]),output_def=yes,output_def=no) + rm -f foo.def + AC_MSG_RESULT($output_def) + LDFLAGS="$_gcc_ldflags_save" + fi + AM_CONDITIONAL(HAVE_LD_OUTPUT_DEF, test "$output_def" = "yes") + + # For some systems we know that we have ld_version scripts. + # Use it then as default. + have_ld_version_script=no + case "${host}" in + *-*-linux*) + have_ld_version_script=yes + ;; + *-*-gnu*) + have_ld_version_script=yes + ;; + esac + AC_ARG_ENABLE([ld-version-script], + AC_HELP_STRING([--enable-ld-version-script], + [enable/disable use of linker version script. + (default is system dependent)]), + [have_ld_version_script=$enableval], + [ : ] ) + AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes") ])
\ No newline at end of file |