Attachment #158117 for bug #228865

Lines 522-527 Link Here

(-)celestia-1.5.1/acinclude.m4 (-2 / +13 lines)
522		522
523	AC_DEFUN(KDE_SUBST_PROGRAMS,	523	AC_DEFUN(KDE_SUBST_PROGRAMS,
524	[	524	[
		525	AC_ARG_WITH(arts,
		526	AC_HELP_STRING([--without-arts],[build without aRts [default=no]]),
		527	[build_arts=$withval],
		528	[build_arts=yes]
		529	)
		530	AM_CONDITIONAL(include_ARTS, test "$build_arts" '!=' "no")
		531	if test "$build_arts" = "no"; then
		532	AC_DEFINE(WITHOUT_ARTS, 1, [Defined if compiling without arts])
		533	fi
525		534
526	kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"	535	kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
527	test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"	536	test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
Lines 536-543 Link Here
536	kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_default_bindirs"	545	kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_default_bindirs"
537	KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)])	546	KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)])
538	KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)])	547	KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)])
539	KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])	548	if test "$build_arts" '!=' "no"; then
540	KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])	549	KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
		550	KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
		551	fi
541	KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs])	552	KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs])
542	KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])	553	KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
543		554

Lines 173-178 Link Here

(-)celestia-1.5.1/config.h.in (+3 lines)
173	/* Version number of package */	173	/* Version number of package */
174	#undef VERSION	174	#undef VERSION
175		175
		176	/* Defined if compiling without arts */
		177	#undef WITHOUT_ARTS
		178
176	/* Define to 1 if your processor stores words with the most significant byte	179	/* Define to 1 if your processor stores words with the most significant byte
177	first (like Motorola and SPARC, unlike Intel and VAX). */	180	first (like Motorola and SPARC, unlike Intel and VAX). */
178	#undef WORDS_BIGENDIAN	181	#undef WORDS_BIGENDIAN




  --with-qt-dir=DIR       where the root of Qt is installed
  --with-qt-includes=DIR  where the Qt includes are.
  --with-qt-libraries=DIR where the Qt library is installed.
  --without-arts          build without aRts default=no
  --with-lua              Use Lua for Celestia Extension Language support

Some influential environment variables:


bindir=$kde_bindir

# Check whether --with-arts was given.
if test "${with_arts+set}" = set; then
  withval=$with_arts; build_arts=$withval
else
  build_arts=yes

fi

     if test "$build_arts" '!=' "no"; then
  include_ARTS_TRUE=
  include_ARTS_FALSE='#'
else
  include_ARTS_TRUE='#'
  include_ARTS_FALSE=
fi

    if test "$build_arts" = "no"; then

cat >>confdefs.h <<\_ACEOF
#define WITHOUT_ARTS 1
_ACEOF

    fi

        kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
        test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"


   fi

   if test "$build_arts" '!=' "no"; then
   { echo "$as_me:$LINENO: checking for mcopidl" >&5
echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6; }
   if test -n "$MCOPIDL"; then

Return to bug 228865

Lines 1698-1703 Link Here

(-)celestia-1.5.1/configure (-1 / +24 lines)
1698	--with-qt-dir=DIR where the root of Qt is installed	1698	--with-qt-dir=DIR where the root of Qt is installed
1699	--with-qt-includes=DIR where the Qt includes are.	1699	--with-qt-includes=DIR where the Qt includes are.
1700	--with-qt-libraries=DIR where the Qt library is installed.	1700	--with-qt-libraries=DIR where the Qt library is installed.
		1701	--without-arts build without aRts default=no
1701	--with-lua Use Lua for Celestia Extension Language support	1702	--with-lua Use Lua for Celestia Extension Language support
1702		1703
1703	Some influential environment variables:	1704	Some influential environment variables:
Lines 33214-33220 Link Here
33214		33215
33215	bindir=$kde_bindir	33216	bindir=$kde_bindir
33216		33217
		33218	# Check whether --with-arts was given.
		33219	if test "${with_arts+set}" = set; then
		33220	withval=$with_arts; build_arts=$withval
		33221	else
		33222	build_arts=yes
		33223
		33224	fi
		33225
		33226	if test "$build_arts" '!=' "no"; then
		33227	include_ARTS_TRUE=
		33228	include_ARTS_FALSE='#'
		33229	else
		33230	include_ARTS_TRUE='#'
		33231	include_ARTS_FALSE=
		33232	fi
		33233
		33234	if test "$build_arts" = "no"; then
		33235
		33236	cat >>confdefs.h <<\_ACEOF
		33237	#define WITHOUT_ARTS 1
		33238	_ACEOF
33217		33239
		33240	fi
33218		33241
33219	kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"	33242	kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
33220	test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"	33243	test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
Lines 33359-33365 Link Here
33359		33382
33360	fi	33383	fi
33361		33384
33362		33385	if test "$build_arts" '!=' "no"; then
33363	{ echo "$as_me:$LINENO: checking for mcopidl" >&5	33386	{ echo "$as_me:$LINENO: checking for mcopidl" >&5
33364	echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6; }	33387	echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6; }
33365	if test -n "$MCOPIDL"; then	33388	if test -n "$MCOPIDL"; then