Attachment #7597 for issue #14472

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




                          (enables -g compiler flag and dmake debug=true)
],,)
AC_ARG_ENABLE(crashdump,
[  --enable-crashdump:     Enable the crashdump feature code. This option
                          implicitly activates --enable-symbols.
],,)
AC_ARG_ENABLE(static-gtk,
[  --enable-static-gtk:    Modules that are linked against gtk libraries use

AC_MSG_RESULT([checked ($_os)])

dnl ===================================================================
dnl Set the ENABLE_CRASHDUMP variable. (Activate --enable-symbols)
dnl ===================================================================
if test "$enable_symbols" = "yes"; then
   ENVCFLAGSCXX="-g"
   ENVCFLAGS="-g"
else
   ENVCFLAGSCXX=""
   ENVCFLAGS=""
fi

dnl ===================================================================
dnl Set the ENABLE_CRASHDUMP variable.
dnl ===================================================================
if test "$enable_crashdump" = "yes" -o "$enable_crashdump" = "TRUE"; then
   ENABLE_CRASHDUMP="TRUE"
   enable_symbols="yes"
else
   if test "$enable_crashdump" = "STATIC"; then
      ENABLE_CRASHDUMP="STATIC"
      enable_symbols="yes"
   else
      if test "$enable_crashdump" = "" -o "$enable_crashdump" = "no"; then
         ENABLE_CRASHDUMP=""

fi

dnl ===================================================================
dnl Set the ENABLE_DEBUG variable. (Activate --enable-symbols)
dnl ===================================================================
if test -n "$enable_debug"; then
   ENABLE_DEBUG="TRUE"
   enable_symbols="yes"
else
   ENABLE_DEBUG="FALSE"
fi

dnl ===================================================================
dnl First setting is whether to include symbols into final build.
dnl ===================================================================
if test "$enable_symbols" = "yes"; then
   ENABLE_SYMBOLS="TRUE"
else
   ENABLE_SYMBOLS=""
fi

dnl ===================================================================
dnl WINNT uses either 4nt or tcsh, all other O/S use tcsh.
dnl The following sets the with_use_shell variable.
dnl ===================================================================

   with_dict=","$with_dict","
fi

if test -n "$enable_debug"; then
   ENABLE_DEBUG="TRUE"
else
   ENABLE_DEBUG="FALSE"
fi

if test -n "$enable_static_gtk"; then
   ENABLE_STATIC_GTK="TRUE"
else

AC_SUBST(PTHREAD_LIBS)
AC_SUBST(ENABLE_DEBUG)
AC_SUBST(ENABLE_STATIC_GTK)
AC_SUBST(ENVCFLAGSCXX)
AC_SUBST(ENABLE_CRASHDUMP)
AC_SUBST(ENABLE_SYMBOLS)
AC_SUBST(WITH_GPC)

AC_OUTPUT([set_soenv])

Lines 1653-1659 Link Here

(-)config_office/set_soenv.in (-1 / +1 lines)
1653	if ( $COM ne "MSC" ) {	1653	if ( $COM ne "MSC" ) {
1654	ToFile( "LINK", $CC, "e" );	1654	ToFile( "LINK", $CC, "e" );
1655	}	1655	}
1656	ToFile( "ENVCFLAGSCXX", "@ENVCFLAGSCXX@", "e" );	1656	ToFile( "ENABLE_SYMBOLS", "@ENABLE_SYMBOLS@", "e" );
1657	ToFile( "ENABLE_CRASHDUMP", "@ENABLE_CRASHDUMP@","e" );	1657	ToFile( "ENABLE_CRASHDUMP", "@ENABLE_CRASHDUMP@","e" );
1658	ToFile( "WITH_GPC", "@WITH_GPC@", "e" );	1658	ToFile( "WITH_GPC", "@WITH_GPC@", "e" );
1659	ToFile( "GXX_INCLUDE_PATH", "@GXX_INCLUDE_PATH@","e" );	1659	ToFile( "GXX_INCLUDE_PATH", "@GXX_INCLUDE_PATH@","e" );

Return to issue 14472

Lines 38-44 Link Here

(-)config_office/configure.in (-20 / +25 lines)
38	(enables -g compiler flag and dmake debug=true)	38	(enables -g compiler flag and dmake debug=true)
39	],,)	39	],,)
40	AC_ARG_ENABLE(crashdump,	40	AC_ARG_ENABLE(crashdump,
41	[ --enable-crashdump: Enable the crashdump feature code.	41	[ --enable-crashdump: Enable the crashdump feature code. This option
		42	implicitly activates --enable-symbols.
42	],,)	43	],,)
43	AC_ARG_ENABLE(static-gtk,	44	AC_ARG_ENABLE(static-gtk,
44	[ --enable-static-gtk: Modules that are linked against gtk libraries use	45	[ --enable-static-gtk: Modules that are linked against gtk libraries use
Lines 285-308 Link Here
285	AC_MSG_RESULT([checked ($_os)])	286	AC_MSG_RESULT([checked ($_os)])
286		287
287	dnl ===================================================================	288	dnl ===================================================================
288	dnl First setting is whether to include symbols into final build.	289	dnl Set the ENABLE_CRASHDUMP variable. (Activate --enable-symbols)
289	dnl ===================================================================
290	if test "$enable_symbols" = "yes"; then
291	ENVCFLAGSCXX="-g"
292	ENVCFLAGS="-g"
293	else
294	ENVCFLAGSCXX=""
295	ENVCFLAGS=""
296	fi
297
298	dnl ===================================================================
299	dnl Set the ENABLE_CRASHDUMP variable.
300	dnl ===================================================================	290	dnl ===================================================================
301	if test "$enable_crashdump" = "yes" -o "$enable_crashdump" = "TRUE"; then	291	if test "$enable_crashdump" = "yes" -o "$enable_crashdump" = "TRUE"; then
302	ENABLE_CRASHDUMP="TRUE"	292	ENABLE_CRASHDUMP="TRUE"
		293	enable_symbols="yes"
303	else	294	else
304	if test "$enable_crashdump" = "STATIC"; then	295	if test "$enable_crashdump" = "STATIC"; then
305	ENABLE_CRASHDUMP="STATIC"	296	ENABLE_CRASHDUMP="STATIC"
		297	enable_symbols="yes"
306	else	298	else
307	if test "$enable_crashdump" = "" -o "$enable_crashdump" = "no"; then	299	if test "$enable_crashdump" = "" -o "$enable_crashdump" = "no"; then
308	ENABLE_CRASHDUMP=""	300	ENABLE_CRASHDUMP=""
Lines 313-318 Link Here
313	fi	305	fi
314		306
315	dnl ===================================================================	307	dnl ===================================================================
		308	dnl Set the ENABLE_DEBUG variable. (Activate --enable-symbols)
		309	dnl ===================================================================
		310	if test -n "$enable_debug"; then
		311	ENABLE_DEBUG="TRUE"
		312	enable_symbols="yes"
		313	else
		314	ENABLE_DEBUG="FALSE"
		315	fi
		316
		317	dnl ===================================================================
		318	dnl First setting is whether to include symbols into final build.
		319	dnl ===================================================================
		320	if test "$enable_symbols" = "yes"; then
		321	ENABLE_SYMBOLS="TRUE"
		322	else
		323	ENABLE_SYMBOLS=""
		324	fi
		325
		326	dnl ===================================================================
316	dnl WINNT uses either 4nt or tcsh, all other O/S use tcsh.	327	dnl WINNT uses either 4nt or tcsh, all other O/S use tcsh.
317	dnl The following sets the with_use_shell variable.	328	dnl The following sets the with_use_shell variable.
318	dnl ===================================================================	329	dnl ===================================================================
Lines 1364-1375 Link Here
1364	with_dict=","$with_dict","	1375	with_dict=","$with_dict","
1365	fi	1376	fi
1366		1377
1367	if test -n "$enable_debug"; then
1368	ENABLE_DEBUG="TRUE"
1369	else
1370	ENABLE_DEBUG="FALSE"
1371	fi
1372
1373	if test -n "$enable_static_gtk"; then	1378	if test -n "$enable_static_gtk"; then
1374	ENABLE_STATIC_GTK="TRUE"	1379	ENABLE_STATIC_GTK="TRUE"
1375	else	1380	else
Lines 1421-1428 Link Here
1421	AC_SUBST(PTHREAD_LIBS)	1426	AC_SUBST(PTHREAD_LIBS)
1422	AC_SUBST(ENABLE_DEBUG)	1427	AC_SUBST(ENABLE_DEBUG)
1423	AC_SUBST(ENABLE_STATIC_GTK)	1428	AC_SUBST(ENABLE_STATIC_GTK)
1424	AC_SUBST(ENVCFLAGSCXX)
1425	AC_SUBST(ENABLE_CRASHDUMP)	1429	AC_SUBST(ENABLE_CRASHDUMP)
		1430	AC_SUBST(ENABLE_SYMBOLS)
1426	AC_SUBST(WITH_GPC)	1431	AC_SUBST(WITH_GPC)
1427		1432
1428	AC_OUTPUT([set_soenv])	1433	AC_OUTPUT([set_soenv])