Attachment #77043 for issue #118604

View | Details | Raw Unified | Return to issue 118604
Collapse All | Expand All




    # Clean up.  Note that this is skipped when one of the exits is executed above.
    rm -rf "$tmp_build_dir"

elif test "$IS_SYSTEM_DMAKE" = "YES"; then

    echo ""
    echo "dmake is located in search path"
    echo ""

elif test -n "$DMAKE_PATH" -a -x "$DMAKE_PATH" -a  ! -x "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT"; then

    cp -f "$DMAKE_PATH" "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT" || exit

    echo ""
    echo "dmake copied to $SOLARENV/$OUTPATH/bin/dmake$EXEEXT"
    echo ""

else

    if test -x "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT"; then




dnl ===================================================================
AC_MSG_CHECKING([for dmake])
AC_PATH_PROG(DMAKE, dmake, no)
IS_SYSTEM_DMAKE=NO
if test "$DMAKE" != "no"; then
   AC_MSG_RESULT([using system dmake])
   DMAKE_PATH="$DMAKE"
   IS_SYSTEM_DMAKE=YES
elif test -n "$with_dmake_path" ; then
   # Did not find pre-installed dmake.
   # Is it at a nonstandard location provided by --with-dmake-path ?
   AC_MSG_NOTICE([looking for dmake at $DMAKE_PATH])
   if test -x "$with_dmake_path" ; then
      AC_MSG_RESULT([using user provided dmake])
      DMAKE=$with_dmake_path
      fi
   fi
fi


       AC_MSG_RESULT([dmake will be downloaded and compiled in bootstrap])
       DMAKE=
    else
       AC_MSG_ERROR([no URL for dmake source code specified, either.])
       BUILD_DMAKE=YES
       AC_MSG_WARN([dmake will be built from internal sources but these will be removed in the future"])
    fi
else
    AC_MSG_CHECKING([whether the found dmake is the right dmake])

   AC_MSG_ERROR([please use --with-dmake-path or --with-dmake-url to specify dmake executable or source])
fi
AC_SUBST(DMAKE_URL)
AC_SUBST(DMAKE_PATH)
AC_SUBST(IS_SYSTEM_DMAKE)


dnl ===================================================================

Lines 1974-1979 ToFile( "ENABLE_AGG", "@ENABLE_AGG@", "e" ); Link Here

(-)a/main/set_soenv.in (+2 lines)
1974	ToFile( "SYSTEM_AGG", "@SYSTEM_AGG@", "e" );	1974	ToFile( "SYSTEM_AGG", "@SYSTEM_AGG@", "e" );
1975	ToFile( "AGG_VERSION", "@AGG_VERSION@", "e" );	1975	ToFile( "AGG_VERSION", "@AGG_VERSION@", "e" );
1976	ToFile( "DMAKE_URL", "@DMAKE_URL@", "e" );	1976	ToFile( "DMAKE_URL", "@DMAKE_URL@", "e" );
		1977	ToFile( "DMAKE_PATH", "@DMAKE_PATH@", "e" );
		1978	ToFile( "IS_SYSTEM_DMAKE", "@IS_SYSTEM_DMAKE@", "e" );
1977	ToFile( "BUILD_STAX", "@BUILD_STAX@", "e" );	1979	ToFile( "BUILD_STAX", "@BUILD_STAX@", "e" );
1978	ToFile( "BUILD_UNOWINREG", "@BUILD_UNOWINREG@", "e" );	1980	ToFile( "BUILD_UNOWINREG", "@BUILD_UNOWINREG@", "e" );
1979	ToFile( "USE_XINERAMA", "@USE_XINERAMA@", "e" );	1981	ToFile( "USE_XINERAMA", "@USE_XINERAMA@", "e" );

Return to issue 118604

Lines 116-121 if test -n "$DMAKE_URL" -a ! -x "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT"; then Link Here

(-)a/main/bootstrap.1 (+14 lines)
116	# Clean up. Note that this is skipped when one of the exits is executed above.	116	# Clean up. Note that this is skipped when one of the exits is executed above.
117	rm -rf "$tmp_build_dir"	117	rm -rf "$tmp_build_dir"
118		118
		119	elif test "$IS_SYSTEM_DMAKE" = "YES"; then
		120
		121	echo ""
		122	echo "dmake is located in search path"
		123	echo ""
		124
		125	elif test -n "$DMAKE_PATH" -a -x "$DMAKE_PATH" -a ! -x "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT"; then
		126
		127	cp -f "$DMAKE_PATH" "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT" \|\| exit
		128
		129	echo ""
		130	echo "dmake copied to $SOLARENV/$OUTPATH/bin/dmake$EXEEXT"
		131	echo ""
		132
119	else	133	else
120		134
121	if test -x "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT"; then	135	if test -x "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT"; then

Lines 1644-1659 dnl Search for a pre-installed dmake Link Here

(-)a/main/configure.in (-9 / +11 lines)
1644	dnl ===================================================================	1644	dnl ===================================================================
1645	AC_MSG_CHECKING([for dmake])	1645	AC_MSG_CHECKING([for dmake])
1646	AC_PATH_PROG(DMAKE, dmake, no)	1646	AC_PATH_PROG(DMAKE, dmake, no)
		1647	IS_SYSTEM_DMAKE=NO
1647	if test "$DMAKE" != "no"; then	1648	if test "$DMAKE" != "no"; then
1648	AC_MSG_RESULT([using system dmake])	1649	AC_MSG_RESULT([using system dmake])
1649	else	1650	DMAKE_PATH="$DMAKE"
		1651	IS_SYSTEM_DMAKE=YES
		1652	elif test -n "$with_dmake_path" ; then
1650	# Did not find pre-installed dmake.	1653	# Did not find pre-installed dmake.
1651	# Is it at a nonstandard location provided by --with-dmake-path ?	1654	# Is it at a nonstandard location provided by --with-dmake-path ?
1652	if test -n "$with_dmake_path" ; then	1655	AC_MSG_NOTICE([looking for dmake at $DMAKE_PATH])
1653	AC_PATH_PROG(DMAKE, dmake, no, "$with_dmake_path")	1656	if test -x "$with_dmake_path" ; then
1654	if test "$DMAKE" != "no"; then	1657	AC_MSG_RESULT([using user provided dmake])
1655	AC_MSG_RESULT([using user provided dmake])	1658	DMAKE=$with_dmake_path
1656	fi
1657	fi	1659	fi
1658	fi	1660	fi
1659		1661
Lines 1668-1676 if test "$DMAKE" = "no"; then Link Here
1668	AC_MSG_RESULT([dmake will be downloaded and compiled in bootstrap])	1670	AC_MSG_RESULT([dmake will be downloaded and compiled in bootstrap])
1669	DMAKE=	1671	DMAKE=
1670	else	1672	else
1671	AC_MSG_WARN([no URL for dmake source code specified, either.])	1673	AC_MSG_ERROR([no URL for dmake source code specified, either.])
1672	BUILD_DMAKE=YES	1674	BUILD_DMAKE=YES
1673	AC_MSG_WARN([dmake will be built from internal sources but these will be removed in the future"])
1674	fi	1675	fi
1675	else	1676	else
1676	AC_MSG_CHECKING([whether the found dmake is the right dmake])	1677	AC_MSG_CHECKING([whether the found dmake is the right dmake])
Lines 1703-1709 if test "$DMAKE" = "no"; then Link Here
1703	AC_MSG_ERROR([please use --with-dmake-path or --with-dmake-url to specify dmake executable or source])	1704	AC_MSG_ERROR([please use --with-dmake-path or --with-dmake-url to specify dmake executable or source])
1704	fi	1705	fi
1705	AC_SUBST(DMAKE_URL)	1706	AC_SUBST(DMAKE_URL)
1706	AC_SUBST(DMAKE)	1707	AC_SUBST(DMAKE_PATH)
		1708	AC_SUBST(IS_SYSTEM_DMAKE)
1707		1709
1708		1710
1709	dnl ===================================================================	1711	dnl ===================================================================