[patch] --without-arts option revert

celestia-1.5.1-noarts.patch (text/plain), 3.71 KB, created by Aleksandr Yakimov on 2008-06-23 14:27:14 UTC

diff -urN celestia-1.5.1/acinclude.m4 celestia-1.5.1_arts/acinclude.m4
--- celestia-1.5.1/acinclude.m4	2008-04-24 01:18:48.000000000 +0400
+++ celestia-1.5.1_arts/acinclude.m4	2008-06-23 15:46:49.000000000 +0400
@@ -522,6 +522,15 @@
 
 AC_DEFUN(KDE_SUBST_PROGRAMS,
 [
+    AC_ARG_WITH(arts,
+        AC_HELP_STRING([--without-arts],[build without aRts [default=no]]),
+        [build_arts=$withval],
+        [build_arts=yes]
+    )
+    AM_CONDITIONAL(include_ARTS, test "$build_arts" '!=' "no")
+    if test "$build_arts" = "no"; then
+        AC_DEFINE(WITHOUT_ARTS, 1, [Defined if compiling without arts])
+    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"
@@ -536,8 +545,10 @@
         kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_default_bindirs"
         KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)])
         KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)])
-        KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
-        KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
+        if test "$build_arts" '!=' "no"; then
+           KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
+           KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
+        fi
         KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs])
         KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
       
diff -ur celestia-1.5.1/config.h.in celestia-1.5.1_arts/config.h.in
--- celestia-1.5.1/config.h.in	2008-04-24 01:27:35.000000000 +0400
+++ celestia-1.5.1_arts/config.h.in	2008-06-23 15:47:58.000000000 +0400
@@ -173,6 +173,9 @@
 /* Version number of package */
 #undef VERSION
 
+/* Defined if compiling without arts */
+#undef WITHOUT_ARTS
+
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
 #undef WORDS_BIGENDIAN
diff -urN celestia-1.5.1/configure celestia-1.5.1_arts/configure
--- celestia-1.5.1/configure	2008-04-24 01:27:35.000000000 +0400
+++ celestia-1.5.1_arts/configure	2008-06-23 16:16:06.000000000 +0400
@@ -1698,6 +1698,7 @@
   --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:
@@ -33214,7 +33215,29 @@
 
 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"
@@ -33359,7 +33382,7 @@
 
    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