Overview
Comment: | Added support for the pkgconfig tool to find package installation locations and added configure output messages |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | TEA |
Files: | files | file ages | folders |
SHA3-256: |
aaea8b2ab0efff659fc0235ef575aa6f |
User & Date: | bohagan on 2023-05-07 23:21:46 |
Other Links: | branch diff | manifest | tags |
Context
2023-05-08
| ||
01:01 | Moved custom functions from configure.ac to acinclude.m4 file check-in: 4729159cce user: bohagan tags: TEA | |
2023-05-07
| ||
23:21 | Added support for the pkgconfig tool to find package installation locations and added configure output messages check-in: aaea8b2ab0 user: bohagan tags: TEA | |
22:12 | Fixed find OpenSSL dependencies check-in: 075e855e95 user: bohagan tags: TEA | |
Changes
Modified Makefile.in
from [10fd16a9a6]
to [ae704a5caf].
︙ | |||
404 405 406 407 408 409 410 411 412 413 414 415 416 417 | 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 | + | -rm -f *.$(OBJEXT) core *.core -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean: clean -rm -f *.tab.c -rm -f $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log config.status -rm -R autom4te.cache #======================================================================== # Install binary object libraries. On Windows this includes both .dll and # .lib files. Because the .lib files are not explicitly listed anywhere, # we need to deduce their existence from the .dll file of the same name. # Library files go into the lib directory. # In addition, this will generate the pkgIndex.tcl |
︙ |
Modified acinclude.m4
from [a2e4c88b25]
to [2903eecbdf].
︙ | |||
81 82 83 84 85 86 87 88 89 90 91 92 93 94 | 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 | + + | AC_MSG_RESULT([cant]) $5 fi ]) AC_DEFUN([TCLTLS_SSL_OPENSSL], [ AC_CHECK_TOOL([PKGCONFIG], [pkg-config], [false]) openssldir='' opensslpkgconfigdir='' AC_ARG_WITH([openssl-dir], AS_HELP_STRING( [--with-openssl-dir=<dir>], [path to root directory of OpenSSL or LibreSSL installation] ), [ |
︙ | |||
111 112 113 114 115 116 117 118 | 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 | + + + + + - + | else TCLTLS_SSL_LIBS="-L$openssldir/lib -lssl -lcrypto" fi TCLTLS_SSL_CFLAGS="-I$openssldir/include" TCLTLS_SSL_CPPFLAGS="-I$openssldir/include" fi AC_MSG_CHECKING([for OpenSSL config]) AC_MSG_RESULT($openssldir) AC_MSG_CHECKING([for OpenSSL pkgconfig]) AC_MSG_RESULT($opensslpkgconfigdir) pkgConfigExtraArgs='' |
︙ |
Modified configure
from [afe35ddc02]
to [61d7490129].
︙ | |||
8968 8969 8970 8971 8972 8973 8974 8975 | 8968 8969 8970 8971 8972 8973 8974 8975 8976 8977 8978 8979 8980 8981 8982 8983 8984 8985 8986 8987 8988 8989 8990 8991 8992 | + + + + + + + + + - + | else TCLTLS_SSL_LIBS="-L$openssldir/lib -lssl -lcrypto" fi TCLTLS_SSL_CFLAGS="-I$openssldir/include" TCLTLS_SSL_CPPFLAGS="-I$openssldir/include" fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OpenSSL config" >&5 printf %s "checking for OpenSSL config... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $openssldir" >&5 printf "%s\n" "$openssldir" >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OpenSSL pkgconfig" >&5 printf %s "checking for OpenSSL pkgconfig... " >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $opensslpkgconfigdir" >&5 printf "%s\n" "$opensslpkgconfigdir" >&6; } pkgConfigExtraArgs='' |
︙ | |||
8997 8998 8999 9000 9001 9002 9003 | 9006 9007 9008 9009 9010 9011 9012 9013 9014 9015 9016 9017 9018 9019 9020 | - + | TCLTLS_SSL_CFLAGS="`"${PKGCONFIG}" openssl --cflags-only-other $pkgConfigExtraArgs`" || as_fn_error $? "Unable to get OpenSSL Configuration" "$LINENO" 5 fi if test -z "$TCLTLS_SSL_CPPFLAGS"; then TCLTLS_SSL_CPPFLAGS="`"${PKGCONFIG}" openssl --cflags-only-I $pkgConfigExtraArgs`" || as_fn_error $? "Unable to get OpenSSL Configuration" "$LINENO" 5 fi PKG_CONFIG_PATH="${PKG_CONFIG_PATH_SAVE}" |
︙ |