Mailing List archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[linux-dvb] Re: Tuxzap: autogen.sh error
Hi!
On Wed, 26 Sep 2001, Rolf Siebrecht wrote:
> A partial solution.
> [...]
> But you still need gtk-devel - even to compile the console apps.
> Simply deleting the "AM_PATH_GTK(..." line from configure.in is _not_ a
> solution for the current draft of the tuxzap package (0.9-20010822).
I think I have a complete solution now. Console applications can be
compiled without gtk/gtk-devel. The needed changes in the source files
were just a shifting and swapping of the #include's.
-> Unpack driver package.
-> cd DVB
-> Apply patch 1:
#####[beginning of patch 1]#####
--- apps/tuxzap/configure.in.orig Tue Jun 19 15:11:25 2001
+++ apps/tuxzap/configure.in Thu Sep 27 08:12:28 2001
@@ -111,6 +111,14 @@
esac
fi
changequote([,])dnl
+
+dnl Compile&install only console apps if system has no X support
+if test "$no_x" = yes; then
+ X_APPS=
+else
+ X_APPS="tuxzap tuxview tuxplayer"
+fi
+AC_SUBST(X_APPS)
AC_SUBST(TUXZAP_MAJOR_VERSION)
AC_SUBST(TUXZAP_MINOR_VERSION)
--- apps/tuxzap/src/Makefile.am.orig Tue Jun 19 15:11:25 2001
+++ apps/tuxzap/src/Makefile.am Tue Sep 25 11:21:09 2001
@@ -47,7 +47,8 @@
-I/usr/local/include \
$(DVB_INCS)
-bin_PROGRAMS = tuxzap ntuxzap tuxview ntuxplayer tuxplayer rtuxzap
+bin_PROGRAMS = ntuxzap ntuxplayer rtuxzap $(X_APPS)
+EXTRA_PROGRAMS = tuxzap tuxview tuxplayer
tuxzap_SOURCES = \
tuxzap.cc \
--- apps/tuxzap/src/channel.hh.orig Tue Nov 28 14:22:18 2000
+++ apps/tuxzap/src/channel.hh Wed Sep 26 21:46:06 2001
@@ -28,7 +28,6 @@
#include <fstream.h>
#include <strstream.h>
#include <DVB.hh>
-#include <gtvscreen2.h>
#include "common.hh"
#define NOTSET -1
--- apps/tuxzap/src/common.hh.orig Tue Apr 3 00:58:55 2001
+++ apps/tuxzap/src/common.hh Wed Sep 26 22:26:27 2001
@@ -20,10 +20,10 @@
#ifndef _COMMON_HH_
#define _COMMON_HH_
-#include <gtk/gtk.h>
#include <DVB.hh>
#define STRSIZE 80
+#define NLIST 5
#ifdef HAVE_CONFIG_H
# include <config.h>
@@ -51,12 +51,6 @@
# define N_(String) (String)
#endif
-
-GtkWidget *CreateMenuItem(GtkWidget * menu, char *szName, char *szAccel,
- char *szTip, GtkSignalFunc func, gpointer data,
- GtkAccelGroup *accel_group);
-GtkWidget *CreateBarSubMenu(GtkWidget * menu, char *szName);
void status_message(char *buf);
-GtkWidget *CreateWidgetFromXpm(GtkWidget * window, gchar ** xpm_data);
int get_dvbrc(char *path,DVB &dv,int dev,int len);
#endif /*_COMMON_HH_ */
--- apps/tuxzap/src/gtk-common.hh.orig Wed Sep 26 21:47:53 2001
+++ apps/tuxzap/src/gtk-common.hh Wed Sep 26 21:50:48 2001
@@ -0,0 +1,12 @@
+
+#ifndef _GTK_COMMON_HH_
+#define _GTK_COMMON_HH_
+
+#include <gtk/gtk.h>
+
+GtkWidget *CreateMenuItem(GtkWidget * menu, char *szName, char *szAccel,
+ char *szTip, GtkSignalFunc func, gpointer data,
+ GtkAccelGroup *accel_group);
+GtkWidget *CreateBarSubMenu(GtkWidget * menu, char *szName);
+GtkWidget *CreateWidgetFromXpm(GtkWidget * window, gchar ** xpm_data);
+#endif /*_GTK_COMMON_HH_ */
--- apps/tuxzap/src/interface.hh.orig Mon May 28 12:03:44 2001
+++ apps/tuxzap/src/interface.hh Wed Sep 26 22:26:51 2001
@@ -29,12 +29,11 @@
#include <gtk/gtk.h>
#include "common.hh"
+#include "gtk-common.hh"
#include "tree.hh"
#include "channel.hh"
#include "audio.hh"
#include "pics.h"
-
-#define NLIST 5
void create_window (int dev);
void set_list(int nb);
--- apps/tuxzap/src/ntuxzap.cc.orig Tue Sep 25 11:58:25 2001
+++ apps/tuxzap/src/ntuxzap.cc Wed Sep 26 21:56:32 2001
@@ -21,7 +21,8 @@
#include <strstream.h>
#include "ntuxzap.hh"
-#include "interface.hh"
+#include "common.hh"
+#include "channel.hh"
#ifdef HAVE_XCURSES
char *XCursesProgramName="alphalist_ex";
--- apps/tuxzap/src/rtuxzap.cc.orig Tue Sep 25 11:45:27 2001
+++ apps/tuxzap/src/rtuxzap.cc Wed Sep 26 22:28:09 2001
@@ -29,7 +29,8 @@
#include <ost/video.h>
#include "rtuxzap.hh"
-#include "interface.hh"
+#include "common.hh"
+#include "channel.hh"
extern "C"{
#ifdef HAVE_LIBLIRC_CLIENT
#include <lirc/lirc_client.h>
--- apps/tuxzap/src/tree.cc.orig Thu Aug 2 17:33:10 2001
+++ apps/tuxzap/src/tree.cc Thu Sep 27 08:21:37 2001
@@ -18,7 +18,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-
+#include <gtvscreen2.h>
#include "tree.hh"
#include "audio.hh"
#include "channel.hh"
--- apps/tuxzap/src/tuxplayer.cc.orig Wed Jun 27 14:20:06 2001
+++ apps/tuxzap/src/tuxplayer.cc Wed Sep 26 22:01:01 2001
@@ -30,6 +30,7 @@
#include "tuxplayer_xpm.h"
#include "common.hh"
+#include "gtk-common.hh"
#include "dvb_formats.h"
extern GtkWidget *statusbar;
#####[end of patch 1]#####
Of course, the ###[...]### lines are only hints. Don't feed them to
/usr/bin/patch.
-> If you have not installed gtk/gtk-devel packages, apply patch 2:
#####[beginning of patch 2]#####
--- apps/tuxzap/configure.in.orig Tue Jun 19 15:11:25 2001
+++ apps/tuxzap/configure.in Wed Sep 26 22:16:56 2001
@@ -96,8 +96,10 @@
AC_CHECK_FILE(../../libdvb/libdvb.a, ,
echo "ATTENTION: you need to compile libdvb first")
-AM_PATH_GTK(1.2.7, ,
- AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?))
+GTK_CFLAGS=
+GTK_LIBS=
+AC_SUBST(GTK_CFLAGS)
+AC_SUBST(GTK_LIBS)
CPPFLAGS="$CPPFLAGS"
LDFLAGS="$LDFLAGS"
#####[end of patch 2]#####
-> cd apps/tuxzap
-> ./autogen.sh --without-x
If even X11 isn't installed a call
./autogen.sh
is sufficient.
-> make
-> su -c "make install"
That's it.
!! Patch 2 against apps/tuxzap/configure.in must not be permanent. !!
!! Apply it only if you are sure about not needing the X/gtk apps !!
!! from the tuxzap package and you don't have installed the !!
!! gtk/gtk-devel rpms. !!
!! If you intend to compile the whole package including X/gtk apps !!
!! keep configure.in in its state without patch 2. In this case, !!
!! patch 1 is actually not needed, but it cannot cause any damage. !!
Bye,
Rolf
--
Info:
To unsubscribe send a mail to listar@linuxtv.org with "unsubscribe linux-dvb" as subject.
Home |
Main Index |
Thread Index