[patch] autoconfigure_all_1.0.6.patch

autoconfigure_all_1.0.6.patch (text/plain), 8.68 KB, created by Natanael Copa on 2005-03-12 03:57:46 UTC

--- gyach.orig/src/Makefile.am	2005-03-08 22:17:43.667695916 +0100
+++ gyach/src/Makefile.am	2005-03-08 23:17:50.630606082 +0100
@@ -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,33 @@
 	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 \
+	plugins.c plugins.h \
+	prflang.c prflang.h \
+	voice_chat.c \
+	gytreeview.c gytreeview.h \
+	webconnect.c webconnect.h \
+	spamcheck.c spamchech.h \
+	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 roomui.h
 
-gyach_LDADD = @GTK_LIBS@
+gyache_LDADD = @GTHREAD_LIBS@ @GTKHTML_LIBS@ @ESOUND_LIBS@ @LIBLTDL@
 
--- gyach.orig/src/webcam/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ gyach/src/webcam/Makefile.am	2005-03-08 23:06:01.819128304 +0100
@@ -0,0 +1,9 @@
+bin_PROGRAMS = gyachewebcam gyacheupload
+gyachewebcam_SOURCES = main.c gyachewebcam.c gyacheupload.h
+gyacheupload_SOURCES = gyacheupload-main.c gyacheupload-v4l.c  gyacheupload-ui.c ../gytreeview.c ../gytreeview.h 
+
+gyachewebcam_LDADD = @GTK_LIBS@ @JASPER_LIBS@
+gyacheupload_LDADD = @GTK_LIBS@ @JASPER_LIBS@
+
+INCLUDES = $(DEPS_CFLAGS) -DLOCALEDIR=\"$(localedir)\" -I../ @GTKHTML_CFLAGS@
+LIBS = $(DEPS_LIBS)
--- gyach.orig/src/webcam.c	2005-03-08 22:17:43.609704795 +0100
+++ gyach/src/webcam.c	2005-03-08 17:37:55.247795056 +0100
@@ -98,8 +98,8 @@
 			launcher=malloc(256);
 			if (!launcher) {return ;}
 
-			snprintf(launcher,254, "%s/webcam/gyache-upload", PACKAGE_DATA_DIR); 
-
+			snprintf(launcher,254, "%s", "/usr/bin/gyacheupload"); 
+/*
 			if ( stat( launcher, &sbuf ))  {
 				char wmsg[304];
 				snprintf(wmsg, 302, "%s:\n\n%s", _("The Gyach Enhanced external webcam broadcaster could not be found"), 	launcher);
@@ -109,7 +109,7 @@
 				free(launcher); launcher=NULL;
 				return; 
 														}
-		
+*/		
 			/* TODO: add friends list as last argument */
 			if (!webcam_device) {webcam_device=strdup("/dev/video0");}
 
@@ -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, "gyacheupload \"%s\" \"%s\" \"%s\"  \"%s\" &",
+			get_default_profile_name(), key, webcam_device , myfriends
 			); 
 
 			my_system(launcher);
@@ -143,22 +143,22 @@
 
 			/* C-based cam viewer */
 		if (! launchertype) { 
-		snprintf(launcher,250, "%s/webcam/gyache-webcam", PACKAGE_DATA_DIR); 
+		snprintf(launcher,250, "%s", "gyachewebcam"); 
 									} else {   /* Python-based viewer */
 		snprintf(launcher,250, "%s/webcam/pywebcam.py", PACKAGE_DATA_DIR); 
 											  }
-
+/*
 		if ( stat( launcher, &sbuf ))  {
 			char wmsg[304];
 			snprintf(wmsg, 302, "%s:\n\n%s", _("The Gyach Enhanced external webcam viewer could not be found"), 	launcher);
 			show_ok_dialog(wmsg);
 			return; 
 													}
-
+*/
 
 		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, "gyachewebcam \"%s\" \"%s\" \"%s\" &",
+		lastcamwho, get_default_profile_name(), key
 		); 
 									} else { /* Python-based viewer */
 		snprintf(launcher,382, "python %s/webcam/pywebcam.py \"%s\" \"%s\" \"%s\" &",
--- gyach.orig/configure.in	2005-03-08 22:17:43.956651673 +0100
+++ gyach/configure.in	2005-03-08 23:46:05.709897489 +0100
@@ -1,7 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(gyach, 0.9.2)
+AC_INIT
+AC_CONFIG_SRCDIR([configure.in])
+AM_INIT_AUTOMAKE(gyache, 1.0.6)
 AM_CONFIG_HEADER(config.h)
 
 AC_ISC_POSIX
@@ -9,83 +10,61 @@
 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 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)
+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)
+
+dnl check for jasper here
+JASPER_LIBS=-ljasper
+AC_SUBST(JASPER_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`
@@ -158,8 +137,10 @@
 fi
 changequote([,])dnl
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 src/Makefile
+src/webcam/Makefile
 ])
+AC_OUTPUT