diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2019-03-24 12:18:48 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2019-03-24 12:18:48 +0000 |
| commit | 640a330749c3a4531b511964a045468d76fffd25 (patch) | |
| tree | 68f3b5b6983126aee016962413654079be6c2762 | |
| parent | 1fd19f7fa79e2daa5f2918dffa62a088fa0999cc (diff) | |
| parent | c0ccabfa594801eb441abbb4d4b24cae17cef691 (diff) | |
| download | gnutls-640a330749c3a4531b511964a045468d76fffd25.tar.gz | |
Merge branch 'guile' into 'master'
configure.ac: remove --with-guile-site-dir
See merge request gnutls/gnutls!957
| -rw-r--r-- | configure.ac | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac index e6305b4606..b142d8c397 100644 --- a/configure.ac +++ b/configure.ac @@ -825,10 +825,6 @@ AC_ARG_ENABLE(guile, opt_guile_bindings=$enableval) AC_MSG_RESULT($opt_guile_bindings) -AC_ARG_WITH([guile-site-dir], - [AS_HELP_STRING([--with-guile-site-dir], - [use the given directory as the Guile site (use with care)])]) - if test "$opt_guile_bindings" = "yes"; then AC_MSG_RESULT([*** *** Detecting GNU Guile... @@ -846,6 +842,7 @@ if test "$opt_guile_bindings" = "yes"; then GUILE_PKG GUILE_PROGS + GUILE_SITE_DIR GUILE_FLAGS save_CFLAGS="$CFLAGS" @@ -864,24 +861,6 @@ if test "$opt_guile_bindings" = "yes"; then if test "$opt_guile_bindings" = "yes"; then AC_MSG_RESULT([yes]) - case "x$with_guile_site_dir" in - xno) - # Use the default $(GUILE_SITE). - GUILE_SITE_DIR - ;; - x|xyes) - # Automatically derive $(GUILE_SITE) from $(pkgdatadir). This - # hack is used to allow `distcheck' to work (see - # `DISTCHECK_CONFIGURE_FLAGS' in the top-level `Makefile.am'). - GUILE_SITE="\$(datadir)/guile/site/$guile_effective_version" - AC_SUBST(GUILE_SITE) - ;; - *) - # Use the user-specified directory as $(GUILE_SITE). - GUILE_SITE="$with_guile_site_dir" - AC_SUBST(GUILE_SITE) - ;; - esac AC_MSG_CHECKING([whether gcc supports -fgnu89-inline]) _gcc_cflags_save="$CFLAGS" CFLAGS="${CFLAGS} -fgnu89-inline" |