From 89bd5275f0089dcd68a6222f23da34e2e75f137c Mon Sep 17 00:00:00 2001 From: darthgandalf Date: Mon, 20 Dec 2010 04:30:24 +0000 Subject: [PATCH] ./configure checks now if modtcl can be built or not. Many people had errors about couldn't find tcl.h if tcl isn't installed. git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2188 726aef4b-f618-498e-8847-2d620e286838 --- aclocal.m4 | 4 ++-- configure | 13 +++++++++++++ configure.in | 7 +++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 00d434ee..7ab3588b 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -148,7 +148,7 @@ $$1_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT])[]dnl +_PKG_TEXT])dnl ]) elif test $pkg_failed = untried; then AC_MSG_RESULT([no]) @@ -159,7 +159,7 @@ path to pkg-config. _PKG_TEXT -To get pkg-config, see .])[]dnl +To get pkg-config, see .])dnl ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS diff --git a/configure b/configure index 7ba46b71..d1dbf5e7 100755 --- a/configure +++ b/configure @@ -3961,6 +3961,19 @@ $as_echo_n "checking modtcl flags... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCL_FLAGS" >&5 $as_echo "$TCL_FLAGS" >&6; } fi + my_saved_LDFLAGS="$LDFLAGS" + appendLD "$TCL_FLAGS" + ac_fn_cxx_check_func "$LINENO" "Tcl_CreateInterp" "ac_cv_func_Tcl_CreateInterp" +if test "x$ac_cv_func_Tcl_CreateInterp" = x""yes; then : + TCL_TEST=yes +else + TCL_TEST=no +fi + + if test x"$TCL_TEST" = "xno"; then + as_fn_error $? "tcl not found, try --disable-tcl, or install tcl properly." "$LINENO" 5 + fi + LDFLAGS="$my_saved_LDFLAGS" fi if test x"$EXTRA" = "xyes" diff --git a/configure.in b/configure.in index 457c42b8..fb11a02e 100644 --- a/configure.in +++ b/configure.in @@ -361,6 +361,13 @@ then TCL_FLAGS="$TCL_INCLUDE_SPEC $TCL_LIB_SPEC" AC_MSG_RESULT([$TCL_FLAGS]) fi + my_saved_LDFLAGS="$LDFLAGS" + appendLD "$TCL_FLAGS" + AC_CHECK_FUNC([Tcl_CreateInterp], [TCL_TEST=yes], [TCL_TEST=no]) + if test x"$TCL_TEST" = "xno"; then + AC_MSG_ERROR([tcl not found, try --disable-tcl, or install tcl properly.]) + fi + LDFLAGS="$my_saved_LDFLAGS" fi if test x"$EXTRA" = "xyes"