BSDBuild

Author: vedge Date: 2010-08-21 21:54:45 -0400 (Sat, 21 Aug 2010) New Revision: 881 Modified: trunk/BSDBuild/wgl.pm Log: append -lgdi32 to ${OPENGL_LIBS} if successful. Modified: trunk/BSDBuild/wgl.pm ... [More] =================================================================== --- trunk/BSDBuild/wgl.pm2010-08-21 12:47:53 UTC (rev 880) +++ trunk/BSDBuild/wgl.pm2010-08-22 01:54:45 UTC (rev 881) < at >< at > -35,6 +35,7 < at >< at > CW_USEDEFAULT, 0,0, NULL, NULL, GetModuleHandle(NULL), NULL); hdc = GetDC(hwnd); hglrc = wglCreateContext(hdc); +SwapBuffers(hdc); wglDeleteContext(hglrc); ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); < at >< at > -46,7 +47,15 < at >< at > { my ($ver) = < at >_; -MkCompileC('HAVE_WGL', '${OPENGL_CFLAGS}', '${OPENGL_LIBS}', $testCode); +MkCompileC('HAVE_WGL', + '${OPENGL_CFLAGS}', + '${OPENGL_LIBS} -lgdi32', + $testCode); +MkIfTrue('${HAVE_WGL}'); +MkDefine('OPENGL_LIBS', '${OPENGL_LIBS} -lgdi32'); +MkSave('OPENGL_LIBS'); +MkEndif; + return (0); } [Less]

Author: vedge Date: 2010-08-21 08:47:53 -0400 (Sat, 21 Aug 2010) New Revision: 880 Modified: trunk/BSDBuild/Core.pm Log: in MkSaveIfTrue(), clear the argument variables if false. Modified: trunk/BSDBuild/Core.pm ... [More] =================================================================== --- trunk/BSDBuild/Core.pm2010-08-20 15:31:32 UTC (rev 879) +++ trunk/BSDBuild/Core.pm2010-08-21 12:47:53 UTC (rev 880) < at >< at > -470,6 +470,7 < at >< at > MkElse; foreach my $var (< at >_) { MkSaveUndef($var); +MkDefine($var, ''); } MkEndif; } [Less]

Author: vedge Date: 2010-08-20 11:31:32 -0400 (Fri, 20 Aug 2010) New Revision: 879 Modified: trunk/BSDBuild/byte_order.pm Log: don't rely on the output formatting of od and use sed to strip spaces. Modified: trunk/BSDBuild/byte_order.pm ... [More] =================================================================== --- trunk/BSDBuild/byte_order.pm2010-08-20 15:19:54 UTC (rev 878) +++ trunk/BSDBuild/byte_order.pm2010-08-20 15:31:32 UTC (rev 879) < at >< at > -68,9 +68,9 < at >< at > rm -f conftest.c _MK_BYTE_ORDER="" -_MK_BYTE_ORDER_LESTRING="L i T T L e E n D" -_MK_BYTE_ORDER_BESTRING="B i G E n D i A N" -od -tc \$testdir/conftest\$EXECSUFFIX > \$testdir/conftest.dump +_MK_BYTE_ORDER_LESTRING="LiTTLeEnD" +_MK_BYTE_ORDER_BESTRING="BiGEnDiAN" +od -tc \$testdir/conftest\$EXECSUFFIX | sed 's/ //g' > \$testdir/conftest.dump if grep "\$_MK_BYTE_ORDER_LESTRING" \$testdir/conftest.dump >/dev/null; then _MK_BYTE_ORDER="LE" [Less]

Author: vedge Date: 2010-08-20 11:19:54 -0400 (Fri, 20 Aug 2010) New Revision: 878 Modified: trunk/BSDBuild/glu.pm Log: typo; fix autoincludedirs. Modified: trunk/BSDBuild/glu.pm ... [More] =================================================================== --- trunk/BSDBuild/glu.pm2010-08-20 14:52:46 UTC (rev 877) trunk/BSDBuild/glu.pm2010-08-20 15:19:54 UTC (rev 878) < at >< at > -23,15 23,17 < at >< at > # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE # USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.. -my < at >autoIncludeDirs = ( -'/usr/include/X11', -'/usr/include/X11R6', -'/usr/local/X11/include', -'/usr/local/X11R6/include', -'/usr/local/include/X11', -'/usr/local/include/X11R6', -'/usr/X11/include', -'/usr/X11R6/include', my %autoIncludeDirs = ( '/usr/include'=> '/usr/lib', '/usr/local/include'=> '/usr/local/lib', '/usr/include/X11'=> '/usr/lib/X11', '/usr/include/X11R6'=> '/usr/lib/X11R6', '/usr/local/X11/include'=> '/usr/local/X11/lib', '/usr/local/X11R6/include'=> '/usr/local/X11R6/lib', '/usr/local/include/X11'=> '/usr/local/lib/X11', '/usr/local/include/X11R6'=> '/usr/local/lib/X11R6', '/usr/X11/include'=> '/usr/X11/lib', '/usr/X11R6/include'=> '/usr/X11R6/lib', ); sub Test < at >< at > -62,10 64,11 < at >< at > MkDefine('GLU_LIBS', "-L$pfx/lib -lGLU"); MkEndif; MkElse; -foreach my $dir (< at >autoIncludeDirs) { foreach my $dir (keys %autoIncludeDirs) { my $libDir = $autoIncludeDirs{$dir}; MkIfExists("$dir/GL/glu.h"); MkDefine('GLU_CFLAGS', "-I$dir"); -MkDefine('GLU_LIBS', "-lGLU"); MkDefine('GLU_LIBS', "-L$libDir -lGLU"); MkBreak; MkEndif; } < at >< at > -88,10 91,7 < at >< at > return (0); } EOF -MkSaveIfTrue('${HAVE_GLU}', 'GLU_CFLAGS', 'GLU_LIBS'); -MkElse; -MkSaveUndef('GLU_CFLAGS', 'GLU_LIBS'); -MkEndif; MkSaveIfTrue('${HAVE_GLU}', 'GLU_CFLAGS', 'GLU_LIBS'); return (0); } [Less]

Author: vedge Date: 2010-08-20 10:52:46 -0400 (Fri, 20 Aug 2010) New Revision: 877 Modified: trunk/BSDBuild/byte_order.pm trunk/mkconfigure.pl Log: test for byte order by searching the compiled executable for a string; fixes byte order ... [More] detection with cross-compilers. Modified: trunk/BSDBuild/byte_order.pm =================================================================== --- trunk/BSDBuild/byte_order.pm2010-08-20 07:45:43 UTC (rev 876) +++ trunk/BSDBuild/byte_order.pm2010-08-20 14:52:46 UTC (rev 877) < at >< at > -1,6 +1,6 < at >< at > # vim:ts=4 # -# Copyright (c) 2007 Hypertriton, Inc. <http://hypertriton.com/> +# Copyright (c) 2007-2010 Hypertriton, Inc. <http://hypertriton.com/> # All rights reserved. # # Redistribution and use in source and binary forms, with or without < at >< at > -23,69 +23,91 < at >< at > # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE # USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.. -sub Test -{ -# XXX XXX TODO cross-compiling - -MkPrint(''); -MkPrintN('checking for BIG_ENDIAN...'); -MkCompileAndRunC('_MK_BIG_ENDIAN', '', '', << 'EOF'); +my $testCode = << 'EOF'; #include <sys/types.h> #include <sys/param.h> int main(int argc, char *argv[]) { #if BYTE_ORDER == BIG_ENDIAN -return (0); +static volatile char *bo = "BiGEnDiANBiGEnDiANBiGEnDiANBiGEnDiANBiGEnDiANBiGEnDiANBiGEnDiANBiGEnDiANBiGEnDiANBiGEnDiANBiGEnDiANBiGEnDiANBiGEnDiANBiGEnDiANBiGEnDiANBiGEnDiANBiGEnDiANBiGEnDiANBiGEnDiANBiGEnDiAN"; #else -return (1); +static volatile char *bo = "LiTTLeEnDiANLiTTLeEnDiANLiTTLeEnDiANLiTTLeEnDiANLiTTLeEnDiANLiTTLeEnDiANLiTTLeEnDiANLiTTLeEnDiANLiTTLeEnDiANLiTTLeEnDiANLiTTLeEnDiANLiTTLeEnDiANLiTTLeEnDiANLiTTLeEnDiANLiTTLeEnDiAN"; #endif +int c = 0; +volatile char *p = bo; +while (*p != '\0') { c *= (int)*p; } +return (c>123?c:456); } EOF -MkIfTrue('${_MK_BIG_ENDIAN}'); -MkDefine('_MK_LITTLE_ENDIAN', 'no'); -MkSaveUndef('_MK_LITTLE_ENDIAN'); -MkElse; -MkPrintN('checking for LITTLE_ENDIAN...'); -MkCompileAndRunC('_MK_LITTLE_ENDIAN', '', '', << 'EOF'); -#include <sys/types.h> -#include <sys/param.h> -int -main(int argc, char *argv[]) + +sub Test { -#if BYTE_ORDER == LITTLE_ENDIAN -return (0); -#else -return (1); -#endif -} -EOF -MkIfTrue('${_MK_LITTLE_ENDIAN}'); -MkDefine('_MK_BIG_ENDIAN', 'no'); -MkSaveUndef('_MK_BIG_ENDIAN'); +MkIfNE('${byte_order}', ''); +MkIfEQ('${byte_order}', 'LE'); +MkDefine('_MK_BYTE_ORDER', 'LE'); MkElse; -MkPrintN('checking for little endian byte order...'); -MkCompileAndRunC('_MK_LITTLE_ENDIAN', '', '', << 'EOF'); -int -main(int argc, char *argv[]) -{ -union { -long l; -char c[sizeof (long)]; -} u; -u.l = 1; -return (u.c[sizeof (long) - 1] == 1); -} -EOF -MkIfNE('${MK_COMPILE_STATUS}', 'OK'); -MkFail('Unable to determine byte order'); +MkIfEQ('${byte_order}', 'BE'); +MkDefine('_MK_BYTE_ORDER', 'BE'); +MkElse; +MkFail('Usage: --byte-order=[LE|BE]'); MkEndif; -MkIfFalse('${_MK_LITTLE_ENDIAN}'); -MkDefine('_MK_BIG_ENDIAN', 'yes'); -MkSaveDefine('_MK_BIG_ENDIAN'); -MkEndif; MkEndif; +MkElse; +print << "EOF"; +cat << EOT > conftest.c +$testCode +EOT +echo "\$CC \$CFLAGS $cflags -o \$testdir/conftest conftest.c" >>config.log +\$CC \$CFLAGS $cflags -o \$testdir/conftest conftest.c 2>>config.log +if [ \$? != 0 ]; then +echo "Failed to compile test program for byte order (\$?)" +echo "Failed to compile test program for byte order (\$?)" >> config.log +exit 1 +fi +rm -f conftest.c + +_MK_BYTE_ORDER="" +_MK_BYTE_ORDER_LESTRING="L i T T L e E n D" +_MK_BYTE_ORDER_BESTRING="B i G E n D i A N" +od -tc \$testdir/conftest\$EXECSUFFIX > \$testdir/conftest.dump + +if grep "\$_MK_BYTE_ORDER_LESTRING" \$testdir/conftest.dump >/dev/null; then +_MK_BYTE_ORDER="LE" +if grep "\$_MK_BYTE_ORDER_BESTRING" \$testdir/conftest.dump >/dev/null; then +echo "*" +echo "* Unable to auto-determine host byte order. Please re-run ./configure" +echo "* with --byte-order=LE or --byte-order=BE." +echo "*" +exit 1 +fi +else +if grep "\$_MK_BYTE_ORDER_BESTRING" \$testdir/conftest.dump >/dev/null; then +_MK_BYTE_ORDER="BE" +if grep "\$_MK_BYTE_ORDER_LESTRING" \$testdir/conftest.dump >/dev/null; then +echo "*" +echo "* Unable to auto-determine host byte order. Please re-run ./configure" +echo "* with --byte-order=LE or --byte-order=BE." +echo "*" +exit 1 +fi +fi +fi +rm -f conftest.c \$testdir/conftest$EXECSUFFIX \$testdir/conftest.dump +EOF MkEndif; + +MkIfEQ('$_MK_BYTE_ORDER', 'LE'); +MkPrint('little-endian'); +MkDefine('_MK_LITTLE_ENDIAN', 'yes'); +MkSaveDefine('_MK_LITTLE_ENDIAN'); +MkSaveUndef('_MK_BIG_ENDIAN'); +MkElse; +MkPrint('big-endian'); +MkDefine('_MK_BIG_ENDIAN', 'yes'); +MkSaveDefine('_MK_BIG_ENDIAN'); +MkSaveUndef('_MK_LITTLE_ENDIAN'); +MkEndif; } sub Emul Modified: trunk/mkconfigure.pl =================================================================== --- trunk/mkconfigure.pl2010-08-20 07:45:43 UTC (rev 876) +++ trunk/mkconfigure.pl2010-08-20 14:52:46 UTC (rev 877) < at >< at > -616,6 +616,7 < at >< at > '--srcdir=p' =>'Source directory for concurrent build', '--build=s' =>'Host environment for build', '--host=s' =>'Cross-compile for target environment', +#'--byte-order=s' =>'Byte order for target environment (LE|BE)', '--prefix=p' =>'Installation base (MI files)', '--exec-prefix=p' =>'Installation base (MD files)', '--sysconfdir=p' =>'System configuration files', < at >< at > -644,6 +645,7 < at >< at > '--srcdir=p' =>'.', '--build=s' =>'auto-detect', '--host=s' =>'BUILD', +#'--byte-order=s' =>'auto-detect', '--prefix=p' =>'/usr/local', '--exec-prefix=p' =>'PREFIX', '--sysconfdir=p' =>'PREFIX/etc', < at >< at > -804,6 +806,9 < at >< at > --target=*) target=$optarg ;; +--byte-order=*) + byte_order=$optarg + ;; --prefix=*) prefix=$optarg ;; [Less]

Author: vedge Date: 2010-08-20 03:45:43 -0400 (Fri, 20 Aug 2010) New Revision: 876 Modified: trunk/BSDBuild/shl_load.pm Log: only append -ldld to DSO_LIBS if test actually succeeds. Modified: trunk/BSDBuild/shl_load.pm ... [More] =================================================================== --- trunk/BSDBuild/shl_load.pm2010-08-20 07:36:26 UTC (rev 875) +++ trunk/BSDBuild/shl_load.pm2010-08-20 07:45:43 UTC (rev 876) < at >< at > -23,23 +23,7 < at >< at > # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE # USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.. -sub Test -{ -my ($ver, $pfx) = < at >_; - -MkDefine('DSO_CFLAGS', ''); -MkDefine('DSO_LIBS', ''); - -BeginTestHeaders(); -DetectHeaderC('HAVE_DL_H', '<dl.h>'); - -MkIfNE($pfx, ''); -MkDefine('DSO_LIBS', "-L$pfx -ldld"); -MkElse; -MkDefine('DSO_LIBS', '-ldld'); -MkEndif; - -TryCompileFlagsC 'HAVE_SHL_LOAD', '${DSO_LIBS}', << 'EOF'; +my $testCode = << 'EOF'; #ifdef HAVE_DL_H #include <dl.h> #endif < at >< at > -57,7 +41,29 < at >< at > return (0); } EOF -MkSaveIfTrue('${HAVE_SHL_LOAD}', 'DSO_CFLAGS', 'DSO_LIBS'); + +sub Test +{ +my ($ver, $pfx) = < at >_; + +BeginTestHeaders(); +DetectHeaderC('HAVE_DL_H', '<dl.h>'); + +MkIfNE($pfx, ''); +MkDefine('SHL_LOAD_LIBS', "-L$pfx -ldld"); +MkElse; +MkDefine('SHL_LOAD_LIBS', '-ldld'); +MkEndif; + +TryCompileFlagsC('HAVE_SHL_LOAD', + '${SHL_LOAD_LIBS}', + $testCode); +MkIfTrue('${HAVE_SHL_LOAD}'); +MkSave('HAVE_SHL_LOAD'); +MkDefine('DSO_LIBS', '$DSO_LIBS $SHL_LOAD_LIBS'); +MkElse; +MkSaveUndef('HAVE_SHL_LOAD'); +MkEndif; EndTestHeaders(); } [Less]

Author: vedge Date: 2010-08-15 04:11:17 -0400 (Sun, 15 Aug 2010) New Revision: 873 Modified: trunk/build.www.mk Log: - set BASEDIR, XSLDIR relative to ${TOP}. - define __TEMPLATE Modified: trunk/build.www.mk ... [More] =================================================================== --- trunk/build.www.mk2010-08-12 01:44:45 UTC (rev 872) +++ trunk/build.www.mk2010-08-15 08:11:17 UTC (rev 873) < at >< at > -31,8 +31,8 < at >< at > XSLTPROC?=xsltproc PERL?=perl ICONV?=iconv -BASEDIR?=m4 -XSLDIR?=xsl +BASEDIR?=${TOP}/m4 +XSLDIR?=${TOP}/xsl TEMPLATE?=csoft LANGUAGES?=en fr DEF_LANGUAGE?=en < at >< at > -61,7 +61,7 < at >< at > < at >echo > $< at >.var < at >for LANG in ${LANGUAGES}; do \ echo -n " $$LANG"; \ - ${M4} ${M4FLAGS} -D__BASE_DIR=${BASEDIR} -D__FILE=$< at > \ + ${M4} ${M4FLAGS} -D__BASE_DIR=${BASEDIR} -D__FILE=$< at > -D__TEMPLATE=${TEMPLATE} \ -D__LANG=$$LANG \ ${BASEDIR}/${TEMPLATE}.m4 \ | ${PERL} ${TOP}/mk/hstrip.pl > $< at >.$$LANG.prep; \ [Less]

Author: vedge Date: 2010-08-09 22:30:29 -0300 (Mon, 09 Aug 2010) New Revision: 871 Added: trunk/BSDBuild/execvp.pm Modified: trunk/BSDBuild/Makefile Log: test for execvp() Modified: trunk/BSDBuild/Makefile ... [More] =================================================================== --- trunk/BSDBuild/Makefile2010-08-08 05:10:16 UTC (rev 870) +++ trunk/BSDBuild/Makefile2010-08-10 01:30:29 UTC (rev 871) < at >< at > -90,7 +90,8 < at >< at > wgl.pm \ mgid.pm \ select.pm \ -sndfile.pm +sndfile.pm \ +execvp.pm all: Added: trunk/BSDBuild/execvp.pm =================================================================== --- trunk/BSDBuild/execvp.pm (rev 0) +++ trunk/BSDBuild/execvp.pm2010-08-10 01:30:29 UTC (rev 871) < at >< at > -0,0 +1,68 < at >< at > +# $Csoft: gethostname.pm,v 1.2 2004/01/03 04:13:29 vedge Exp $ +# vim:ts=4 +# +# Copyright (c) 2010 Hypertriton, Inc. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution.. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR +# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +# USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.. + +sub Test +{ +TryCompile 'HAVE_EXECVP', << 'EOF'; +#include <unistd.h> + +int +main(int argc, char *argv[]) +{ +char *args[3]; +int rv; + +args[0] = "foo"; +args[2] = NULL; + +rv = execvp(args[0], args); +return (rv); +} +EOF +} + +sub Emul +{ +my ($os, $osrel, $machine) = < at >_; + +if ($os eq 'linux' || $os eq 'darwin' || $os =~ /^(open|net|free)bsd$/) { +MkDefine('HAVE_EXECVP', 'yes'); +MkSaveDefine('HAVE_EXECVP'); +} else { +MkSaveUndef('HAVE_EXECVP'); +} +return (1); +} + +BEGIN +{ +$DESCR{'execvp'} = 'the execvp() function'; +$TESTS{'execvp'} = \&Test; +$EMUL{'execvp'} = \&Emul; +$DEPS{'execvp'} = 'cc'; +} + +;1 [Less]

Author: vedge Date: 2010-08-08 02:10:16 -0300 (Sun, 08 Aug 2010) New Revision: 870 Modified: trunk/ChangeLogs/Release-2.8.txt trunk/build.lib.mk Log: Make ${SHOBJS} depend on ${LIBTOOL_COOKIE} in build.lib.mk. Fixes concurrent make problems; ... [More] thanks Bill Randle! Modified: trunk/ChangeLogs/Release-2.8.txt =================================================================== --- trunk/ChangeLogs/Release-2.8.txt2010-07-28 09:24:49 UTC (rev 869) +++ trunk/ChangeLogs/Release-2.8.txt2010-08-08 05:10:16 UTC (rev 870) < at >< at > -16,4 +16,6 < at >< at > - Added standard directives CHECK_HEADER(), CHECK_HEADER_OPTS(), CHECK_FUNC() and CHECK_FUNC_OPTS(); thanks rhaamo! - Added HDEFINE_UNQUOTED() variant; thanks rhaamo! +- Make ${SHOBJS} depend on ${LIBTOOL_COOKIE} in build.lib.mk. Fixes + concurrent make problems; thanks Bill Randle! Modified: trunk/build.lib.mk =================================================================== --- trunk/build.lib.mk2010-07-28 09:24:49 UTC (rev 869) +++ trunk/build.lib.mk2010-08-08 05:10:16 UTC (rev 870) < at >< at > -216,7 +216,9 < at >< at > fi # Build a Libtool version of the library. -lib${LIB}.la: ${LIBTOOL_COOKIE} _lib_shobjs ${SHOBJS} +_lib_shobjs ${SHOBJS}: ${LIBTOOL_COOKIE} + +lib${LIB}.la: _lib_shobjs ${SHOBJS} < at >if [ "${LIB}" != "" -a "${USE_LIBTOOL}" = "Yes" \ -a "${SRCS}" != "none" ]; then \ if [ "${SHOBJS}" = "none" ]; then \ [Less]

Author: vedge Date: 2010-07-28 06:24:49 -0300 (Wed, 28 Jul 2010) New Revision: 869 Modified: trunk/BSDBuild/cc.pm trunk/BSDBuild/cxx.pm trunk/mkconfigure.pl Log: don't set -mno-cygwin under cygwin environment; remove --with-cygwin. ... [More] Modified: trunk/BSDBuild/cc.pm =================================================================== --- trunk/BSDBuild/cc.pm2010-07-27 06:59:30 UTC (rev 868) +++ trunk/BSDBuild/cc.pm2010-07-28 09:24:49 UTC (rev 869) < at >< at > -295,22 +295,6 < at >< at > return (0); } EOF -print << 'EOF'; -if [ "${MK_COMPILE_STATUS}" = "OK" ]; then -if [ "${with_cygwin}" != "yes" ]; then -echo "*" -echo "* NOTE: Disabling Cygwin compatibility layer." -echo "* (Resulting binaries will not depend on Cygwin)" -echo "*" -CFLAGS="$CFLAGS -mno-cygwin" -else -echo "*" -echo "* NOTE: Enabling Cygwin compatibility layer." -echo "* (Resulting binaries will depend on Cygwin)" -echo "*" -fi -fi -EOF # Preserve ${CC} and ${CFLAGS} MkSaveMK('CC', 'CFLAGS'); Modified: trunk/BSDBuild/cxx.pm =================================================================== --- trunk/BSDBuild/cxx.pm2010-07-27 06:59:30 UTC (rev 868) +++ trunk/BSDBuild/cxx.pm2010-07-28 09:24:49 UTC (rev 869) < at >< at > -280,22 +280,6 < at >< at > return (0); } EOF -print << 'EOF'; -if [ "${MK_COMPILE_STATUS}" = "OK" ]; then -if [ "${with_cygwin}" != "yes" ]; then -echo "*" -echo "* NOTE: Disabling Cygwin compatibility layer." -echo "* (Resulting binaries will not depend on Cygwin)" -echo "*" -CXXFLAGS="$CXXFLAGS -mno-cygwin" -else -echo "*" -echo "* NOTE: Enabling Cygwin compatibility layer." -echo "* (Resulting binaries will depend on Cygwin)" -echo "*" -fi -fi -EOF # Preserve ${CXX} and ${CXXFLAGS} MkSaveMK('CXX', 'CXXFLAGS'); Modified: trunk/mkconfigure.pl =================================================================== --- trunk/mkconfigure.pl2010-07-27 06:59:30 UTC (rev 868) +++ trunk/mkconfigure.pl2010-07-28 09:24:49 UTC (rev 869) < at >< at > -634,7 +634,6 < at >< at > '--enable-nls' =>'Multi-language support', '--with-gettext' =>'Use gettext for multi-language', '--with-libtool' =>'Specify path to libtool', -'--with-cygwin' =>'Use Cygwin compatibility layer', '--with-manpages' =>'Generate Unix manual pages', '--with-catman' =>'Install cat files for manual pages', '--with-manlinks' =>'Add manual entries for every function', < at >< at > -663,7 +662,6 < at >< at > '--enable-nls' =>'no', '--with-gettext' =>'auto-detect', '--with-libtool' =>'auto-detect', -'--with-cygwin' =>'no', '--with-manpages' =>'yes', '--with-catman' =>'auto-detect', '--with-manlinks' =>'no', [Less]