diff options
| author | David Sommerseth <dazo@users.sourceforge.net> | 2009-03-30 21:32:58 +0200 |
|---|---|---|
| committer | David Sommerseth <dazo@users.sourceforge.net> | 2009-03-30 21:32:58 +0200 |
| commit | da80d77425893015518eb2339f87b65d199c1eb8 (patch) | |
| tree | e10a6c2c32f7cdab9759723a1a7652ce35b330ca /configure | |
| parent | 0b1dfb82709f3a77af120d7dd4b6510658a40a21 (diff) | |
| download | eurephia-da80d77425893015518eb2339f87b65d199c1eb8.tar.gz eurephia-da80d77425893015518eb2339f87b65d199c1eb8.tar.xz eurephia-da80d77425893015518eb2339f87b65d199c1eb8.zip | |
Added logging of configure runs
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 90 |
1 files changed, 51 insertions, 39 deletions
@@ -55,8 +55,9 @@ DB="" FW="" ADMIN=""; OPENVPN_SRC_DIR="" - PLUGIN="" +CONFIGUREPARAMS="$*" + while [ ! -z "$1" ]; do case $1 in -h|--help) @@ -165,46 +166,56 @@ if [ ${DB} = "SQLite3" ]; then fi rm -f CMakeCache.txt -cmake . ${PARAMS} -DPREFIX:STRING=${PREFIX} -DCMAKE_INSTALL_PREFIX:STRING=${PREFIX} \ +{ + cat <<EOF +# +# Configure run at `date` +# `uname -a` +# +# ./configure ${CONFIGUREPARAMS} + +EOF + cmake . ${PARAMS} -DPREFIX:STRING=${PREFIX} -DCMAKE_INSTALL_PREFIX:STRING=${PREFIX} \ -DPLUGINDIR:STRING=${PLUGINDIR} -DBINDIR:STRING=${BINDIR} \ -DEUREPHIADM_XSLT_PATH:STRING=${EUREPHIADM_XSLT} -DXSLTROOT:STRING=${XSLTPATH} -ec=$? -if [ $ec = 0 ]; then - echo - echo - echo "eurephia will be built with support for: " - echo - echo " Database: ${DB}" - echo " Firewall: ${FW:-"None"}" - echo " OpenVPN plug-in: ${PLUGIN:-"No plug-ins requested"}" - echo " Admin tools: ${ADMIN:-"None"}" - echo - echo " Install prefix: ${PREFIX}" - echo " Binaries dir: ${BINDIR}" - echo " Plug-in path: ${PLUGINDIR}" - if [ ! -z "${ADMIN}" ]; then - echo " XSLT base path: ${XSLTPATH}" - echo " eurephiadm XSLT path: ${EUREPHIADM_XSLT}" - fi - if [ ${DB} = "SQLite3" ]; then - echo " SQLite3 database path: ${SQLITE3PREFIX}" - fi + export ec=$? + + if [ "$ec" = "0" ]; then + echo + echo + echo "eurephia will be built with support for: " + echo + echo " Database: ${DB}" + echo " Firewall: ${FW:-"None"}" + echo " OpenVPN plug-in: ${PLUGIN:-"No plug-ins requested"}" + echo " Admin tools: ${ADMIN:-"None"}" + echo + echo " Install prefix: ${PREFIX}" + echo " Binaries dir: ${BINDIR}" + echo " Plug-in path: ${PLUGINDIR}" + if [ ! -z "${ADMIN}" ]; then + echo " XSLT base path: ${XSLTPATH}" + echo " eurephiadm XSLT path: ${EUREPHIADM_XSLT}" + fi + if [ ${DB} = "SQLite3" ]; then + echo " SQLite3 database path: ${SQLITE3PREFIX}" + fi - echo - echo - if [ "$DEBUG_WARN" = 1 ]; then echo - echo " ******* DEBUG is enabled. This might be a security issue *******" echo - if [ "$SECRETS_WARN" = 1 ]; then + if [ "$DEBUG_WARN" = 1 ]; then echo - echo " ******* SHOW_SECRETS is enabled. THIS WILL LOG PASSWORDS IN CLEAR TEXT IN LOG FILES *******" + echo " ******* DEBUG is enabled. This might be a security issue *******" echo + if [ "$SECRETS_WARN" = 1 ]; then + echo + echo " ******* SHOW_SECRETS is enabled. THIS WILL LOG PASSWORDS IN CLEAR TEXT IN LOG FILES *******" + echo + fi fi - fi - # Update Makefile with distclean and uninstall rules - cat >> Makefile <<EOF + # Update Makefile with distclean and uninstall rules + cat >> Makefile <<EOF distclean : clean find -type d -name "CMakeFiles" | xargs rm -rf find -type f -name "cmake_install.cmake" | xargs rm -rf @@ -218,16 +229,17 @@ uninstall : @echo "Uninstalling eurephia: " cat install_manifest.txt | xargs rm -vf EOF - if [ ! -z ${DB} ]; then - if [ ${SQLITE3PREFIX} != ${PREFIX} ]; then - cat >> Makefile <<EOF + if [ ! -z ${DB} ]; then + if [ ${SQLITE3PREFIX} != ${PREFIX} ]; then + cat >> Makefile <<EOF rmdir -v ${SQLITE3PREFIX} EOF + fi fi - fi - cat >> Makefile <<EOF + cat >> Makefile <<EOF rmdir -v ${PREFIX} EOF -fi -exit $? + fi + exit $ec +} 2>&1 | tee ./configure.log |