From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bernhard.Bialas@t-online.de (Bernhard Bialas) Subject: Re: Compilation problems on SuSE Linux 8.2 Date: Mon, 2 Jun 2003 23:10:41 +0200 Sender: linux-msdos-owner@vger.kernel.org Message-ID: <200306022310.41441.bernhard.bialas@t-online.de> References: Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_R172+caCKqExnPa" Return-path: In-Reply-To: List-Id: To: Bart Oldeman Cc: linux-msdos@vger.kernel.org --Boundary-00=_R172+caCKqExnPa Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline > > ------------------------------------------------------------------------- > >------------------ Sorry, a.out system detected, but we do no longer > > support it. > > ------------------------------------------------------------------------- > please try this patch -- there are a few other changes (related to > be able to build outside the source tree), but that shouldn't hurt. > > Bart Hello Bart, many thanks for the patch. Unfortunately it does not work for me. I did the following: - on a fresh dosemu 1.1.4.0 applied the 1.1.4.15 patchset - copied your patch (dosemu_configure.diff) into the dosemu directory (of course with the corrected path of my dosemu i.e.dosemu-1.1.4 instead of dosemu-1.1.4.15) - with patch -p1 < dosemu_configure.diff applied the patch Some hunks was rejected (please refer to the attached files.) The following "make" aborts during te build of the Makefile with the message: config.status: creating /include/kbd_unicode_config.h Makefile.conf:80: *** missing separator. Stop Maybe there is something wrong with the patch or I have something overseen? Thanks in advance for your help. Best regards Bernhard --Boundary-00=_R172+caCKqExnPa Content-Type: text/x-diff; charset="iso-8859-1"; name="configure.ac.rej" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="configure.ac.rej" *************** *** 132,160 **** dnl Do ELF if possible - if ! $CC -v 2>&1|grep specs >/dev/null 2>&1; then - AC_MSG_WARN(Your GCC installation is incomplete: specs file is missing.) - AC_MSG_WARN(We assume your GCC compiles for ELF.) - AC_MSG_WARN( ) - ELF="ELF=1" - else - if grep __ELF__ `$CC -v 2>&1|head -n1|cut -d' ' -f4` /dev/null 1>/dev/null 2>&1; then - ELF="ELF=1" - else - if test "$CONFIG_HOST" = "linux"; then - echo "------------------------------------------------------------" - echo "Sorry, a.out system detected, but we do no longer support it" - echo "------------------------------------------------------------" - exit 1 - else - # DON'T CHANGE THIS: this makes libdosemu start high enough to be safe. - # should be okay at...0x20000000 for .5 GB mark. - LIBSTART="LIBSTART = 0x20000000" - fi - fi - fi - AC_SUBST(LIBSTART) - AC_SUBST(ELF) dnl Check for static and then also use it for tests --- 133,147 ---- dnl Do ELF if possible + if ! echo -e '#ifdef __ELF__\n#define foo bar\n#endif\nfoo' \ + | gcc -E - | grep bar > /dev/null; then + if test "$CONFIG_HOST" = "linux"; then + echo "------------------------------------------------------------" + echo "Sorry, a.out system detected, but we do no longer support it" + echo "------------------------------------------------------------" + exit 1 + fi + fi dnl Check for static and then also use it for tests *************** *** 235,245 **** AC_CHECK_LIB(slang, SLsmg_write_nwchars, AC_MSG_WARN([Rejecting system S-Lang with UTF-8 support. It is incompatible with DOSEMU. Using supplied S-Lang.]) buggy_slang=yes - ./mkpluginhooks enable slang yes, AC_CHECK_LIB(slang, SLtt_get_terminfo, LIBS="$LIBS -lslang -lm -ldl";LDFLAGS="$LDFLAGS $SLANGLIB", [AC_MSG_WARN([No S-Lang library found. Using supplied S-Lang.])] - ./mkpluginhooks enable slang yes, -lm -ldl), -lm -ldl) ) --- 222,232 ---- AC_CHECK_LIB(slang, SLsmg_write_nwchars, AC_MSG_WARN([Rejecting system S-Lang with UTF-8 support. It is incompatible with DOSEMU. Using supplied S-Lang.]) buggy_slang=yes + $srcdir/mkpluginhooks enable slang yes, AC_CHECK_LIB(slang, SLtt_get_terminfo, LIBS="$LIBS -lslang -lm -ldl";LDFLAGS="$LDFLAGS $SLANGLIB", [AC_MSG_WARN([No S-Lang library found. Using supplied S-Lang.])] + $srcdir/mkpluginhooks enable slang yes, -lm -ldl), -lm -ldl) ) *************** *** 354,369 **** AC_SUBST(DEBUGGER) dnl try to hook in available plug-ins - if test -x ./mkpluginhooks; then - ./mkpluginhooks - if test -f ./plugin_libdirs; then - PLUGINSUBDIRS=`cat ./plugin_libdirs` AC_MSG_NOTICE(Including plugins: $PLUGINSUBDIRS...); - if test -f ./plugin_incdirs; then cd src for i in `cat ../plugin_incdirs`; do - for j in $i/*; do - ln -sf ../../$j plugin/include/`basename $j` done done cd .. --- 341,356 ---- AC_SUBST(DEBUGGER) dnl try to hook in available plug-ins + if test -x $srcdir/mkpluginhooks; then + TOP=$srcdir $srcdir/mkpluginhooks + if test -f plugin_libdirs; then + PLUGINSUBDIRS=`cat plugin_libdirs` AC_MSG_NOTICE(Including plugins: $PLUGINSUBDIRS...); + if test -f plugin_incdirs; then cd src for i in `cat ../plugin_incdirs`; do + for j in $srcdir/src/$i/*; do + ln -sf $j plugin/include/`basename $j` done done cd .. --Boundary-00=_R172+caCKqExnPa Content-Type: text/x-diff; charset="iso-8859-1"; name="configure.rej" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="configure.rej" *************** *** 6591,6597 **** else { echo "$as_me:$LINENO: WARNING: No S-Lang library found. Using supplied S-Lang." >&5 echo "$as_me: WARNING: No S-Lang library found. Using supplied S-Lang." >&2;} - ./mkpluginhooks enable slang yes fi fi --- 6561,6567 ---- else { echo "$as_me:$LINENO: WARNING: No S-Lang library found. Using supplied S-Lang." >&5 echo "$as_me: WARNING: No S-Lang library found. Using supplied S-Lang." >&2;} + $srcdir/mkpluginhooks enable slang yes fi fi --Boundary-00=_R172+caCKqExnPa--