cline: comparison configure

-:b383b1b61cbf
+:ed9a5ffd1f13
 fi
 touch "$TEMP_DIR/options"
 touch "$TEMP_DIR/features"
 # define standard variables
-PREFIX=/usr
+# also define standard prefix (this is where we will search for config.site)
-EPREFIX=
+prefix=/usr
-BINDIR=
+exec_prefix=
-SBINDIR=
+bindir=
-LIBDIR=
+sbindir=
-LIBEXECDIR=
+libdir=
-DATADIR=
+libexecdir=
-SYSCONFDIR=
+datarootdir=
-SHAREDSTATEDIR=
+datadir=
-LOCALSTATEDIR=
+sysconfdir=
-INCLUDEDIR=
+sharedstatedir=
-INFODIR=
+localstatedir=
-MANDIR=
+runstatedir=
+includedir=
+infodir=
+localedir=
+mandir=
 # custom variables
 # features
 --sbindir=DIR           system admin executables [EPREFIX/sbin]
 --libexecdir=DIR        program executables [EPREFIX/libexec]
 --sysconfdir=DIR        system configuration files [PREFIX/etc]
 --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
 --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+--runstatedir=DIR       run-time variable data [LOCALSTATEDIR/run]
 --libdir=DIR            object code libraries [EPREFIX/lib]
 --includedir=DIR        C header files [PREFIX/include]
 --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
 --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
 --infodir=DIR           info documentation [DATAROOTDIR/info]
 --mandir=DIR            man documentation [DATAROOTDIR/man]
+--localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
 __EOF__
 }
 #
 #
 BUILD_TYPE="default"
 for ARG in "$@"
 do
 case "$ARG" in
-"--prefix="*)         PREFIX=${ARG#--prefix=} ;;
+"--prefix="*)         prefix=${ARG#--prefix=} ;;
-"--exec-prefix="*)    EPREFIX=${ARG#--exec-prefix=} ;;
+"--exec-prefix="*)    exec_prefix=${ARG#--exec-prefix=} ;;
-"--bindir="*)         BINDIR=${ARG#----bindir=} ;;
+"--bindir="*)         bindir=${ARG#----bindir=} ;;
-"--sbindir="*)        SBINDIR=${ARG#--sbindir=} ;;
+"--sbindir="*)        sbindir=${ARG#--sbindir=} ;;
-"--libdir="*)         LIBDIR=${ARG#--libdir=} ;;
+"--libdir="*)         libdir=${ARG#--libdir=} ;;
-"--libexecdir="*)     LIBEXECDIR=${ARG#--libexecdir=} ;;
+"--libexecdir="*)     libexecdir=${ARG#--libexecdir=} ;;
-"--datadir="*)        DATADIR=${ARG#--datadir=} ;;
+"--datarootdir="*)    datarootdir=${ARG#--datarootdir=} ;;
-"--sysconfdir="*)     SYSCONFDIR=${ARG#--sysconfdir=} ;;
+"--datadir="*)        datadir=${ARG#--datadir=} ;;
-"--sharedstatedir="*) SHAREDSTATEDIR=${ARG#--sharedstatedir=} ;;
+"--sysconfdir="*)     sysconfdir=${ARG#--sysconfdir=} ;;
-"--localstatedir="*)  LOCALSTATEDIR=${ARG#--localstatedir=} ;;
+"--sharedstatedir="*) sharedstatedir=${ARG#--sharedstatedir=} ;;
-"--includedir="*)     INCLUDEDIR=${ARG#--includedir=} ;;
+"--localstatedir="*)  localstatedir=${ARG#--localstatedir=} ;;
-"--infodir="*)        INFODIR=${ARG#--infodir=} ;;
+"--includedir="*)     includedir=${ARG#--includedir=} ;;
-"--mandir"*)          MANDIR=${ARG#--mandir} ;;
+"--infodir="*)        infodir=${ARG#--infodir=} ;;
+"--mandir"*)          mandir=${ARG#--mandir} ;;
+"--localedir"*)       localedir=${ARG#--localedir} ;;
 "--help"*) printhelp; abort_configure ;;
 "--debug")           BUILD_TYPE="debug" ;;
 "--release")         BUILD_TYPE="release" ;;
 "-"*) echo "unknown option: $ARG"; abort_configure ;;
 esac
 done
-# set dir variables
-: ${EPREFIX:="$PREFIX"}
+# set defaults for dir variables
-: ${BINDIR:="$EPREFIX/bin"}
+: ${exec_prefix:="$prefix"}
-: ${SBINDIR:="$EPREFIX/sbin"}
+: ${bindir:='${exec_prefix}/bin'}
-: ${LIBDIR:="$EPREFIX/lib"}
+: ${sbindir:='${exec_prefix}/sbin'}
-: ${LIBEXECDIR:="$EPREFIX/libexec"}
+: ${libdir:='${exec_prefix}/lib'}
-: ${DATADIR:="$PREFIX/share"}
+: ${libexecdir:='${exec_prefix}/libexec'}
-: ${SYSCONFDIR:="$PREFIX/etc"}
+: ${datarootdir:='${prefix}/share'}
-: ${SHAREDSTATEDIR:="$PREFIX/com"}
+: ${datadir:='${datarootdir}'}
-: ${LOCALSTATEDIR:="$PREFIX/var"}
+: ${sysconfdir:='${prefix}/etc'}
-: ${INCLUDEDIR:="$PREFIX/include"}
+: ${sharedstatedir:='${prefix}/com'}
-: ${INFODIR:="$PREFIX/info"}
+: ${localstatedir:='${prefix}/var'}
-: ${MANDIR:="$PREFIX/man"}
+: ${runstatedir:='${localstatedir}/run'}
+: ${includedir:='${prefix}/include'}
+: ${infodir:='${datarootdir}/info'}
+: ${mandir:='${datarootdir}/man'}
+: ${localedir:='${datarootdir}/locale'}
+# check if a config.site exists and load it
+if [ -n "$CONFIG_SITE" ]; then
+# CONFIG_SITE may contain space separated file names
+for cs in $CONFIG_SITE; do
+printf "loading defaults from $cs... "
+. "$cs"
+echo ok
+done
+elif [ -f "$prefix/share/config.site" ]; then
+printf "loading site defaults... "
+. "$prefix/share/config.site"
+echo ok
+elif [ -f "$prefix/etc/config.site" ]; then
+printf "loading site defaults... "
+. "$prefix/etc/config.site"
+echo ok
+fi
 # Test for availability of pkg-config
 PKG_CONFIG=`command -v pkg-config`
 : ${PKG_CONFIG:="false"}
 }
 # generate vars.mk
 cat > "$TEMP_DIR/vars.mk" << __EOF__
-PREFIX=$PREFIX
+prefix="$prefix"
-EPREFIX=$EPREFIX
+exec_prefix="$exec_prefix"
-BINDIR=$BINDIR
+bindir="$bindir"
-SBINDIR=$SBINDIR
+sbindir="$sbindir"
-LIBDIR=$LIBDIR
+libdir="$libdir"
-LIBEXECDIR=$LIBEXECDIR
+libexecdir="$libexecdir"
-DATADIR=$DATADIR
+datarootdir="$datarootdir"
-SYSCONFDIR=$SYSCONFDIR
+datadir="$datadir"
-SHAREDSTATEDIR=$SHAREDSTATEDIR
+sysconfdir="$sysconfdir"
-LOCALSTATEDIR=$LOCALSTATEDIR
+sharedstatedir="$sharedstatedir"
-INCLUDEDIR=$INCLUDEDIR
+localstatedir="$localstatedir"
-INFODIR=$INFODIR
+runstatedir="$runstatedir"
-MANDIR=$MANDIR
+includedir="$includedir"
+infodir="$infodir"
+mandir="$mandir"
+localedir="$localedir"
 __EOF__
-sort -u -o "$TEMP_DIR/vars.mk" "$TEMP_DIR/vars.mk"
 # toolchain detection utilities
 . make/toolchain.sh
 #
 break
 done
 # add general dependency flags to flags.mk
 echo "# general flags" >> "$TEMP_DIR/flags.mk"
-if [ -n "${TEMP_CFLAGS}" ]; then
+if [ -n "${TEMP_CFLAGS}" -a -n "$lang_c" ]; then
 echo "CFLAGS += $TEMP_CFLAGS" >> "$TEMP_DIR/flags.mk"
 fi
-if [ -n "${TEMP_CXXFLAGS}" ]; then
+if [ -n "${TEMP_CXXFLAGS}" -a -n "$lang_cpp" ]; then
 echo "CXXFLAGS += $TEMP_CXXFLAGS" >> "$TEMP_DIR/flags.mk"
 fi
 if [ -n "${TEMP_LDFLAGS}" ]; then
 echo "LDFLAGS += $TEMP_LDFLAGS" >> "$TEMP_DIR/flags.mk"
 fi
 #
 # TARGETS
 #
 echo >> "$TEMP_DIR/flags.mk"
-# Target: default
+echo "configuring target: default"
 echo "# flags for target default" >> "$TEMP_DIR/flags.mk"
 TEMP_CFLAGS=
 TEMP_CXXFLAGS=
 TEMP_LDFLAGS=
 # Features
-if [ -n "${TEMP_CFLAGS}" ]; then
+if [ -n "${TEMP_CFLAGS}" -a -n "$lang_c" ]; then
 echo "CFLAGS  += $TEMP_CFLAGS" >> "$TEMP_DIR/flags.mk"
 fi
-if [ -n "${TEMP_CXXFLAGS}" ]; then
+if [ -n "${TEMP_CXXFLAGS}" -a -n "$lang_cpp" ]; then
 echo "CXXFLAGS  += $TEMP_CXXFLAGS" >> "$TEMP_DIR/flags.mk"
 fi
 if [ "$BUILD_TYPE" = "debug" ]; then
-echo 'CFLAGS += ${DEBUG_CC_FLAGS}' >> "$TEMP_DIR/flags.mk"
+if [ -n "$lang_c" ]; then
-echo 'CXXFLAGS += ${DEBUG_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk"
+echo 'CFLAGS += ${DEBUG_CC_FLAGS}' >> "$TEMP_DIR/flags.mk"
+fi
+if [ -n "$lang_cpp" ]; then
+echo 'CXXFLAGS += ${DEBUG_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk"
+fi
 fi
 if [ "$BUILD_TYPE" = "release" ]; then
-echo 'CFLAGS += ${RELEASE_CC_FLAGS}' >> "$TEMP_DIR/flags.mk"
+if [ -n "$lang_c" ]; then
-echo 'CXXFLAGS += ${RELEASE_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk"
+echo 'CFLAGS += ${RELEASE_CC_FLAGS}' >> "$TEMP_DIR/flags.mk"
+fi
+if [ -n "$lang_cpp" ]; then
+echo 'CXXFLAGS += ${RELEASE_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk"
+fi
 fi
 if [ -n "${TEMP_LDFLAGS}" ]; then
 echo "LDFLAGS += $TEMP_LDFLAGS" >> "$TEMP_DIR/flags.mk"
 fi
 fi
 echo "configure finished"
 echo
 echo "Build Config:"
-echo "  PREFIX:    $PREFIX"
+echo "  PREFIX:      $prefix"
-echo "  TOOLCHAIN: $TOOLCHAIN_NAME"
+echo "  TOOLCHAIN:   $TOOLCHAIN_NAME"
 echo
 # generate the config.mk file
 cat > "$TEMP_DIR/config.mk" << __EOF__
 #

Mercurial > hg > cline / file comparison

comparison: configure

configure