mirror of
https://github.com/znc/znc.git
synced 2026-07-04 08:51:14 +02:00
./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
This commit is contained in:
Vendored
+2
-2
@@ -148,7 +148,7 @@ $$1_PKG_ERRORS
|
|||||||
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
||||||
installed software in a non-standard prefix.
|
installed software in a non-standard prefix.
|
||||||
|
|
||||||
_PKG_TEXT])[]dnl
|
_PKG_TEXT])dnl
|
||||||
])
|
])
|
||||||
elif test $pkg_failed = untried; then
|
elif test $pkg_failed = untried; then
|
||||||
AC_MSG_RESULT([no])
|
AC_MSG_RESULT([no])
|
||||||
@@ -159,7 +159,7 @@ path to pkg-config.
|
|||||||
|
|
||||||
_PKG_TEXT
|
_PKG_TEXT
|
||||||
|
|
||||||
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
|
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
|
||||||
])
|
])
|
||||||
else
|
else
|
||||||
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
|
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
|
||||||
|
|||||||
@@ -3961,6 +3961,19 @@ $as_echo_n "checking modtcl flags... " >&6; }
|
|||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCL_FLAGS" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCL_FLAGS" >&5
|
||||||
$as_echo "$TCL_FLAGS" >&6; }
|
$as_echo "$TCL_FLAGS" >&6; }
|
||||||
fi
|
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
|
fi
|
||||||
|
|
||||||
if test x"$EXTRA" = "xyes"
|
if test x"$EXTRA" = "xyes"
|
||||||
|
|||||||
@@ -361,6 +361,13 @@ then
|
|||||||
TCL_FLAGS="$TCL_INCLUDE_SPEC $TCL_LIB_SPEC"
|
TCL_FLAGS="$TCL_INCLUDE_SPEC $TCL_LIB_SPEC"
|
||||||
AC_MSG_RESULT([$TCL_FLAGS])
|
AC_MSG_RESULT([$TCL_FLAGS])
|
||||||
fi
|
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
|
fi
|
||||||
|
|
||||||
if test x"$EXTRA" = "xyes"
|
if test x"$EXTRA" = "xyes"
|
||||||
|
|||||||
Reference in New Issue
Block a user