[patch] gyach-enhanced-1.0.7-autotools.patch

gyach-enhanced-1.0.7-autotools.patch (text/plain), 14.56 KB, created by Natanael Copa on 2005-06-01 03:49:54 UTC

diff -bruN 1.0.7.orig/gyach/Makefile.am 1.0.7/gyach/Makefile.am
--- 1.0.7.orig/gyach/Makefile.am	2005-04-08 15:51:37.742925569 +0200
+++ 1.0.7/gyach/Makefile.am	2005-05-18 01:34:20.931839558 +0200
@@ -2,10 +2,9 @@
 
 SUBDIRS = src
 
-EXTRA_DIST = gyach.glade sample.gyachrc sample.ignore.list \
-	sample.ignore.regex BUGS depcomp scripts/my-gtk-config \
-	README.FreeBSD README.NetBSD README.MacOSX README.Win32 \
-	src/interface.c.gtk2.patch
+EXTRA_DIST = sample.gyachrc sample.ignore.list sample.ignore.regex \
+	BUGS depcomp scripts/my-gtk-config \
+	gyache-help-short.txt PHROZEN_SMOKE_README.txt
 
 install-data-local:
 	@$(NORMAL_INSTALL)
diff -bruN 1.0.7.orig/gyach/configure.in 1.0.7/gyach/configure.in
--- 1.0.7.orig/gyach/configure.in	2005-04-08 15:51:37.743925416 +0200
+++ 1.0.7/gyach/configure.in	2005-05-18 01:34:20.954836041 +0200
@@ -1,7 +1,11 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(gyach, 0.9.2)
+dnl Is there actually anyone who understands how this autoconf animal works?
+dnl Feel free to clean it up if you do....
+
+AC_INIT
+AC_CONFIG_SRCDIR([configure.in])
+AM_INIT_AUTOMAKE(gyache, 1.0.7)
 AM_CONFIG_HEADER(config.h)
 
 AC_ISC_POSIX
@@ -9,83 +13,79 @@
 AM_PROG_CC_STDC
 AC_HEADER_STDC
 
-AC_ARG_ENABLE(gtk_v2,
-  [  --disable-gtk_v2        disable gtk v2.0.x support])
-AC_ARG_ENABLE(gdk-pixbuf,
-  [  --disable-gdk-pixbuf    disable use of gdk-pixbuf (with gtk v1.x)],
-    gdk_pixbuf=$enableval, gdk_pixbuf=yes)
-AC_ARG_ENABLE(pixmaps,
-  [  --disable-pixmaps       disable remote user status pixmaps])
+dnl configure libtool. this is for adding the -lltdl linker flag.
+AC_LIBLTDL_INSTALLABLE
+AC_PROG_LIBTOOL
+AC_SUBST(LIBLTDL)
+
+dnl stolen from gdm (who stole it from gconf..)
+# find the actual value for $prefix that we'll end up with
+REAL_PREFIX=
+if test "x$prefix" = "xNONE"; then
+  REAL_PREFIX=$ac_default_prefix
+else
+  REAL_PREFIX=$prefix
+fi
+old_prefix=$prefix
+prefix=$REAL_PREFIX
+
+REAL_EXEC_PREFIX=
+if test "x$exec_prefix" = "xNONE"; then
+  REAL_EXEC_PREFIX=$prefix
+else
+  REAL_EXEC_PREFIX=$exec_prefix
+fi
+old_exec_prefix=$exec_prefix
+exec_prefix=$REAL_EXEC_PREFIX
+
+
+dnl AC_ARG_ENABLE(gtk_v2,
+dnl   [  --disable-gtk_v2        disable gtk v2.0.x support])
+dnl AC_ARG_ENABLE(gdk-pixbuf,
+dnl   [  --disable-gdk-pixbuf    disable use of gdk-pixbuf (with gtk v1.x)],
+dnl    gdk_pixbuf=$enableval, gdk_pixbuf=yes)
+dnl AC_ARG_ENABLE(pixmaps,
+dnl   [  --disable-pixmaps       disable remote user status pixmaps])
 AC_ARG_ENABLE(threads,
   [  --disable-threads       disable use of pthread_create])
 AC_ARG_ENABLE(debug,
   [  --enable-debug=LEVEL    enable debug messages at specified level])
-dnl AC_ARG_ENABLE(interface,
-dnl   [  --enable-interface=type use "type" widget for main chat text [text/xtext/html]] )
 
+dnl GTK_CFLAGS=`pkg-config --cflags gtk+-2.0 gthread-2.0 libgtkhtml-2.0 2>/dev/null`
+dnl ESD_LIBS=`esd-config --cflags`
+dnl ESD_LIBS=`esd-config --libs`
+
+AC_SUBST(CFLAGS)
+AC_SUBST(LDFLAGS)
+
+AC_DEFINE(USE_GTK2,[],[use GTK+ v2.x])
+GTK_REQUIRED_VERSION=2.0
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION)
+AC_SUBST(GTK_CFLAGS)
+AC_SUBST(GTK_LIBS)
+
+GTHREAD_REQUIRED_VERSION=2.0
+PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= $GTHREAD_REQUIRED_VERSION)
+AC_SUBST(GHTREAD_CFLAGS)
+AC_SUBST(GTHREAD_LIBS)
+
+GTKHTML_REQUIRED_VERSION=2.0
+PKG_CHECK_MODULES(GTKHTML, libgtkhtml-2.0 >= $GTKHTML_REQUIRED_VERSION)
+AC_SUBST(GTKHTML_CFLAGS)
+AC_SUBST(GTKHTML_LIBS)
+
+dnl I honsestly dont know what version is requred of esd
+dnl or if it would be better to:
+dnl ESOUND_LIBS=`esd-config --libs`
+dnl AC_SUBST(ESOUND_LIBS)
+ESOUND_REQUIRED_VERSION=0.2
+PKG_CHECK_MODULES(ESOUND, esound >= $ESOUND_REQUIRED_VERSION)
+AC_SUBST(ESOUND_CFLAGS)
+AC_SUBST(ESOUND_LIBS)
 
-if test "x$enable_gtk_v2" != "xno"; then
-	printf "checking for GTK - version >= 2.0.0... "
-	GTK_CFLAGS=`pkg-config --cflags gtk+-2.0 gthread-2.0 2> /dev/null`
-else
-	GTK_CFLAGS=""
-fi
 
-if test "x${GTK_CFLAGS}" != "x"; then
-	if test "x$enable_gtk_v2" != "xno"; then
-		echo yes
-	fi
-	if test "$enable_threads" != "no"; then
-		GTK_LIBS=`pkg-config --libs gtk+-2.0 gthread-2.0 2> /dev/null`
-	else
-		GTK_LIBS=`pkg-config --libs gtk+-2.0 2> /dev/null`
-	fi
-	CFLAGS="${CFLAGS} ${GTK_CFLAGS}"
-	LIBS="${LIBS} ${GTK_LIBS}"
-	AC_DEFINE(USE_GTK2)
-else
-	if test "x$enable_gtk_v2" != "xno"; then
-		echo no
-	fi
-	AM_PATH_GTK(1.2.0, ,
-            AC_MSG_WARN(Cannot find GTK: Is gtk-config in path?),
-			gthread)
-dnl            AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?), gthread)
-
-	if test "x${GTK_CFLAGS}" = 'x'; then
-		echo "*** gtk-config not found, running scripts/my-gtk-config"
-		CFLAGS="${CFLAGS} `scripts/my-gtk-config --cflags`"
-		echo "***     CFLAGS now '${CFLAGS}'"
-		LIBS="${LIBS} `scripts/my-gtk-config --libs`"
-		echo "***     LIBS now '${LIBS}'"
-	fi
-
-	if test "$gdk_pixbuf" = yes; then
-	  AC_PATH_PROG(gdkpixbufpath, gdk-pixbuf-config)
-	  AC_MSG_CHECKING(for gdk-pixbuf >= 0.8)
-	  GDK_PIXBUF_CFLAGS=`$gdkpixbufpath --cflags 2>/dev/null`
-	  GDK_PIXBUF_LIBS=`$gdkpixbufpath --libs 2>/dev/null`
-	  if test "_$GDK_PIXBUF_CFLAGS" = _; then
-		AC_MSG_RESULT([not found, will attempt to use 'convert' for images])
-	  else
-		vers=`$gdkpixbufpath --version`
-		case $vers
-		in
-		  gdk-pixbuf-0.[[01234567]]) gdk_pixbuf_ok=false ;;
-		  *) gdk_pixbuf_ok=true ;;
-		esac
-		if $gdk_pixbuf_ok; then
-		  AC_MSG_RESULT(found)
-		  gdk_pixbuf=yes
-		  AC_DEFINE(USE_GDK_PIXBUF)
-		  LIBS="${LIBS} $GDK_PIXBUF_LIBS"
-		  CFLAGS="${CFLAGS} $GDK_PIXBUF_CFLAGS"
-		else
-		  gdk_pixbuf=no
-		  AC_MSG_RESULT([version too old, building without gdk-pixbuf])
-		fi
-	  fi
-	fi
+if test "$enable_threads" != "no"; then
+	GTK_LIBS=`pkg-config --libs gtk+-2.0 gthread-2.0 libgtkhtml-2.0  2>/dev/null`
 fi
 
 ac_system=`uname -s | cut -c1-6`
@@ -93,38 +93,67 @@
 	CFLAGS="${CFLAGS} -fnative-struct"
 fi
 
-
+dnl Not needed really?
 AC_CHECK_LIB( c_r, pthread_create, LIBS="$LIBS -lc_r", )
 
+dnl check for jasper here
+AC_CHECK_LIB(jasper, jas_init, [JASPER_LIBS="-ljasper"], [
+		     AC_MSG_ERROR(cannot find jasper library)])
+AC_SUBST(JASPER_LIBS)
+
+# check for libccvt
+# libccvt is a part of the camserv project but is not automatically 
+# installed. You will need to manually copy libccvt.a to /usr/lib and
+# ccvt.h to /usr/include or something similar. 
+AC_CHECK_HEADER(ccvt.h)
+AC_CHECK_LIB(ccvt, ccvt_420p_rgb24)
+
 dnl Set PACKAGE_DATA_DIR in config.h.
-if test "x${datadir}" = 'x${prefix}/share'; then
-  if test "x${prefix}" = "xNONE"; then
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}")
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}")
-  fi
-else
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}")
-fi
+dnl if test "x${datadir}" = 'x${prefix}/share'; then
+dnl   if test "x${prefix}" = "xNONE"; then
+dnl    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [])
+dnl  else
+dnl    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [])
+dnl  fi
+dnl else
+dnl   AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", [])
+dnl fi
+
+dnl set EXPANDED_DATADIR in config.h
+DATADIR_TMP="$datadir"
+EXPANDED_DATADIR=`eval echo $DATADIR_TMP`
+AC_SUBST(EXPANDED_DATADIR)
+AC_DEFINE_UNQUOTED([EXPANDED_DATADIR],"$EXPANDED_DATADIR", [Default data dir])
+
+dnl set EXPANDED_LIBEXECDIR in config.h
+LIBEXECDIR_TMP="$libexecdir"
+EXPANDED_LIBEXECDIR=`eval echo $LIBEXECDIR_TMP`
+AC_SUBST(EXPANDED_LIBEXECDIR)
+AC_DEFINE_UNQUOTED([EXPANDED_LIBEXECDIR],"$EXPANDED_LIBEXECDIR", [Location for the webcam binaries])
+
+PACKAGE_DATA_DIR_TMP="$datadir/${PACKAGE}"
+PACKAGE_DATA_DIR=`eval echo $PACKAGE_DATA_DIR_TMP`
+AC_SUBST(PACKAGE_DATA_DIR)
+AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,"$PACKAGE_DATA_DIR", [Location for package data])
 
 dnl Set PACKAGE_SOURCE_DIR in config.h.
 packagesrcdir=`cd $srcdir && pwd`
-AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")
+AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Location for sources])
 
 if test "$enable_pixmaps" != "no"; then
-	AC_DEFINE(SHOW_STATUS_PIXMAPS)
+	AC_DEFINE(SHOW_STATUS_PIXMAPS, [], [Enable status pixmaps])
 else
     echo "*** status pixmaps disabled"
 fi
 
 if test "$enable_threads" != "no"; then
-	AC_DEFINE(USE_PTHREAD_CREATE)
+	AC_DEFINE(USE_PTHREAD_CREATE, [], [Enable pthread_create])
 else
     echo "*** pthread_create disabled"
 fi
 
 if test "x$enable_debug" != "x"; then
-	AC_DEFINE_UNQUOTED(DBG_LEVEL, $enable_debug )
+	AC_DEFINE_UNQUOTED(DBG_LEVEL, $enable_debug, [Set debug level] )
 	echo "*** DBG_LEVEL set to ${enable_debug}"
 else
 	AC_DEFINE(DBG_LEVEL, 0 )
@@ -132,14 +161,17 @@
 
 if test "x$enable_interface" != "x"; then
 	if test "x$enable_interface" = "xxtext"; then
-		AC_DEFINE(GYACH_INT_XTEXT)
+		AC_DEFINE(GYACH_INT_XTEXT, [],
+		    [text interface set to gtk_xtext widget])
 		echo "*** gyach text interface set to gtk_xtext widget"
 	else
 		if test "x$enable_interface" = "xhtml"; then
-			AC_DEFINE(GYACH_INT_HTML)
+			AC_DEFINE(GYACH_INT_HTML, [],
+			    [text interface set to gtk_html widget])
 			echo "*** gyach text interface set to gtk_html widget"
 		else
-			AC_DEFINE(GYACH_INT_TEXT)
+			AC_DEFINE(GYACH_INT_TEXT, [], 
+			    [text interface set to gtk_text widget])
 			echo "*** gyach text interface set to gtk_text widget"
 		fi
 	fi
@@ -158,8 +190,13 @@
 fi
 changequote([,])dnl
 
-AC_OUTPUT([
+prefix=$old_prefix
+exec_prefix=$old_exec_prefix
+
+AC_CONFIG_FILES([
 Makefile
 src/Makefile
+src/webcam/Makefile
 ])
+AC_OUTPUT
 
diff -bruN 1.0.7.orig/gyach/src/Makefile.am 1.0.7/gyach/src/Makefile.am
--- 1.0.7.orig/gyach/src/Makefile.am	2005-04-08 15:51:37.701931834 +0200
+++ 1.0.7/gyach/src/Makefile.am	2005-05-18 01:34:20.955835888 +0200
@@ -1,11 +1,16 @@
 ## Process this file with automake to produce Makefile.in
 
+SUBDIRS = webcam
+
 INCLUDES = \
-	@GTK_CFLAGS@
+	@GTHREAD_CFLAGS@ \
+	@GTKHTML_CFLAGS@ \
+	@ESOUND_CFLAGS@ \
+	-DLOCALEDIR=\"$(localedir)\"
 
-bin_PROGRAMS = gyach
+bin_PROGRAMS = gyache
 
-gyach_SOURCES = \
+gyache_SOURCES = \
 	aliases.c aliases.h \
 	callbacks.c callbacks.h \
 	commands.c commands.h \
@@ -23,8 +28,34 @@
 	roomlist.c roomlist.h \
 	users.c users.h \
 	util.c util.h \
-	yahoochat.c yahoochat.h
-
+	bootprevent.c bootprevent.h \
+	yahoochat.c yahoochat.h \
+	ycht.c ycht.h \
+	profname.c profname.h \
+	packet_handler.c packet_handler.h \
+	animations.c animations.h \
+	conference.c conference.h \
+	sounds.c sounds.h \
+	fonts.c fonts.h \
+	plugin_api.h \
+	plugins.c plugins.h \
+	prflang.c prflang.h \
+	voice_chat.c \
+	gytreeview.c gytreeview.h \
+	webconnect.c webconnect.h \
+	spamcheck.c \
+	pmwindow.c \
+	setupwindow2.c \
+	fader.c \
+	htmlrender.c \
+	tuxvironments.c \
+	yab.c \
+	webcam.c webcam.h \
+	trayicon.c trayicon.h \
+	yahoo_sha.c yahoo_authenticate.h \
+	sha.c sha.h \
+	yahoo_fn.c yahoo_fn.h \
+	roomui.c
 
-gyach_LDADD = @GTK_LIBS@
+gyache_LDADD = @GTHREAD_LIBS@ @GTKHTML_LIBS@ @ESOUND_LIBS@ @LIBLTDL@
 
diff -bruN 1.0.7.orig/gyach/src/callbacks.c 1.0.7/gyach/src/callbacks.c
--- 1.0.7.orig/gyach/src/callbacks.c	2005-04-08 15:51:37.676935655 +0200
+++ 1.0.7/gyach/src/callbacks.c	2005-05-18 01:34:21.000829008 +0200
@@ -3931,7 +3931,7 @@
 
 
 void on_launch_py_voice(GtkMenuItem *widget, gpointer user_data) {
-	snprintf(callbackbuf,300, "%s/pyvoice/pyvoiceui.py &",PACKAGE_DATA_DIR);
+	snprintf(callbackbuf,300, EXPANDED_LIBEXECDIR "/pyvoiceui.py &");
 	my_system(callbackbuf);
 }
 
diff -bruN 1.0.7.orig/gyach/src/webcam/Makefile.am 1.0.7/gyach/src/webcam/Makefile.am
--- 1.0.7.orig/gyach/src/webcam/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ 1.0.7/gyach/src/webcam/Makefile.am	2005-05-18 01:34:21.002828702 +0200
@@ -0,0 +1,14 @@
+libexec_PROGRAMS = gyache-webcam gyache-upload
+libexec_SCRIPTS = pywebcam.py
+
+gyache_webcam_SOURCES = main.c gyachewebcam.c gyacheupload.h gyachewebcam.h
+gyache_upload_SOURCES = gyacheupload-main.c gyacheupload-v4l.c gyacheupload-ui.c ../gytreeview.c ../gytreeview.h gyachewebcam.h
+
+gyache_webcam_LDADD = @GTK_LIBS@ @JASPER_LIBS@
+gyache_upload_LDADD = @GTK_LIBS@ @JASPER_LIBS@
+
+EXTRA_SCRIPTS = pywebcam.py
+EXTRA_DIST = pywebcam.py
+
+INCLUDES = $(DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" @GTKHTML_CFLAGS@ -I../
+#LIBS = $(DEPS_LIBS)
diff -bruN 1.0.7.orig/gyach/src/webcam/gyacheupload-ui.c 1.0.7/gyach/src/webcam/gyacheupload-ui.c
--- 1.0.7.orig/gyach/src/webcam/gyacheupload-ui.c	2005-04-08 15:51:37.714929848 +0200
+++ 1.0.7/gyach/src/webcam/gyacheupload-ui.c	2005-05-18 01:34:21.025825185 +0200
@@ -48,7 +48,7 @@
 */
 
 # include "gyacheupload.h"
-#include "gytreeview.h"
+#include "../gytreeview.h"
 # include <jasper/jasper.h>
 
 #define yahoo_put32(buf, data) ( \
diff -bruN 1.0.7.orig/gyach/src/webcam.c 1.0.7/gyach/src/webcam.c
--- 1.0.7.orig/gyach/src/webcam.c	2005-04-08 15:51:37.697932446 +0200
+++ 1.0.7/gyach/src/webcam.c	2005-05-18 01:34:21.049821515 +0200
@@ -98,7 +98,7 @@
 			launcher=malloc(256);
 			if (!launcher) {return ;}
 
-			snprintf(launcher,254, "%s/webcam/gyache-upload", PACKAGE_DATA_DIR); 
+			snprintf(launcher,254,  EXPANDED_LIBEXECDIR "/gyache-upload"); 
 
 			if ( stat( launcher, &sbuf ))  {
 				char wmsg[304];
@@ -118,8 +118,8 @@
 			launcher=malloc(10642);
 			if (!launcher) { free(myfriends); return ;}
 
-			snprintf(launcher,10640, "%s/webcam/gyache-upload \"%s\" \"%s\" \"%s\"  \"%s\" &",
-			PACKAGE_DATA_DIR, get_default_profile_name(), key, webcam_device , myfriends
+			snprintf(launcher,10640, EXPANDED_LIBEXECDIR "/gyache-upload \"%s\" \"%s\" \"%s\"  \"%s\" &",
+			get_default_profile_name(), key, webcam_device , myfriends
 			); 
 
 			my_system(launcher);
@@ -143,9 +143,9 @@
 
 			/* C-based cam viewer */
 		if (! launchertype) { 
-		snprintf(launcher,250, "%s/webcam/gyache-webcam", PACKAGE_DATA_DIR); 
+		snprintf(launcher,250, EXPANDED_LIBEXECDIR "/gyache-webcam"); 
 									} else {   /* Python-based viewer */
-		snprintf(launcher,250, "%s/webcam/pywebcam.py", PACKAGE_DATA_DIR); 
+		snprintf(launcher,250, EXPANDED_LIBEXECDIR "/pywebcam.py"); 
 											  }
 
 		if ( stat( launcher, &sbuf ))  {
@@ -157,12 +157,12 @@
 
 
 		if (! launchertype) {  /* C-based viewer */
-		snprintf(launcher,382, "%s/webcam/gyache-webcam \"%s\" \"%s\" \"%s\" &",
-		PACKAGE_DATA_DIR, lastcamwho, get_default_profile_name(), key
+		snprintf(launcher,382, EXPANDED_LIBEXECDIR "/gyache-webcam \"%s\" \"%s\" \"%s\" &",
+		lastcamwho, get_default_profile_name(), key
 		); 
 									} else { /* Python-based viewer */
-		snprintf(launcher,382, "python %s/webcam/pywebcam.py \"%s\" \"%s\" \"%s\" &",
-		PACKAGE_DATA_DIR, lastcamwho, get_default_profile_name(), key
+		snprintf(launcher,382, "python " EXPANDED_LIBEXECDIR "/pywebcam.py \"%s\" \"%s\" \"%s\" &",
+		lastcamwho, get_default_profile_name(), key
 		); 
 											 }