Attachment #141527 for bug #188149

Lines 20-27 Link Here

(-)camserv-0.5.1.orig/camserv/filter.c (-1 / +1 lines)
20	#include <stdio.h>	20	#include <stdio.h>
21	#include <stdlib.h>	21	#include <stdlib.h>
22	#include <string.h>	22	#include <string.h>
		23	#include <ltdl.h>
23		24
24	#include "ltdl.h"
25	#include "log.h"	25	#include "log.h"
26	#include "camconfig.h"	26	#include "camconfig.h"
27	#include "filter.h"	27	#include "filter.h"

Lines 5-12 Link Here

(-)camserv-0.5.1.orig/camserv/Makefile.am (-2 / +1 lines)
5	LDFLAGS = @LDFLAGS@ -export-dynamic	5	LDFLAGS = @LDFLAGS@ -export-dynamic
6		6
7	bin_PROGRAMS = camserv	7	bin_PROGRAMS = camserv
8	camserv_LDADD = $(LIBLTDL) $(top_srcdir)/common/libcommon.a	8	camserv_LDADD = -lltdl $(top_srcdir)/common/libcommon.a
9	camserv_DEPENDENCIES = $(LIBLTDL)
10	camserv_SOURCES= \	9	camserv_SOURCES= \
11	camconfig.c \	10	camconfig.c \
12	camserv.c \	11	camserv.c \

Lines 20-27 Link Here

(-)camserv-0.5.1.orig/camserv/video.c (-1 / +1 lines)
20	#include <stdio.h>	20	#include <stdio.h>
21	#include <stdlib.h>	21	#include <stdlib.h>
22	#include <string.h>	22	#include <string.h>
		23	#include <ltdl.h>
23		24
24	#include "ltdl.h"
25	#include "log.h"	25	#include "log.h"
26	#include "video.h"	26	#include "video.h"
27		27

Lines 1-4 Link Here

(-)camserv-0.5.1.orig/common/Makefile.am (-1 / +1 lines)
1	INCLUDES = -I$(srcdir)/include -I${top_srcdir}/libltdl	1	INCLUDES = -I$(srcdir)/include
2	CFLAGS = @CFLAGS@ -g -DNDEBUG	2	CFLAGS = @CFLAGS@ -g -DNDEBUG
3		3
4	common_sources = \	4	common_sources = \

Lines 20-28 Link Here

(-)camserv-0.5.1.orig/common/modinfo.c (-1 / +1 lines)
20	#include <stdio.h>	20	#include <stdio.h>
21	#include <stdlib.h>	21	#include <stdlib.h>
22	#include <string.h>	22	#include <string.h>
		23	#include <ltdl.h>
23		24
24	#include "log.h"	25	#include "log.h"
25	#include "ltdl.h"
26	#include "modinfo.h"	26	#include "modinfo.h"
27		27
28	#define MODNAME "modinfo"	28	#define MODNAME "modinfo"




AM_ACLOCAL_INCLUDE(macros)

AC_PROG_CC
AC_LIBLTDL_CONVENIENCE
AC_LIBTOOL_DLOPEN
AM_PROG_LIBTOOL
AC_SUBST(LIBLTDL)

AC_PROG_LIBTOOL

AC_CHECK_LIB(m,sqrt)
AC_CHECK_LIB(jpeg,jpeg_start_compress)

Lines 4-11 Link Here

(-)camserv-0.5.1.orig/Makefile.am (-2 / +1 lines)
4		4
5	datadir = @datadir@/camserv	5	datadir = @datadir@/camserv
6		6
7	SUBDIRS = libltdl \	7	SUBDIRS = common \
8	common \
9	${camserv_subdir} \	8	${camserv_subdir} \
10	include \	9	include \
11	macros \	10	macros \

Return to bug 188149

Lines 12-23 Link Here

(-)camserv-0.5.1.orig/configure.in (-5 / +1 lines)
12	AM_ACLOCAL_INCLUDE(macros)	12	AM_ACLOCAL_INCLUDE(macros)
13		13
14	AC_PROG_CC	14	AC_PROG_CC
15	AC_LIBLTDL_CONVENIENCE
16	AC_LIBTOOL_DLOPEN
17	AM_PROG_LIBTOOL
18	AC_SUBST(LIBLTDL)
19		15
20	AC_CONFIG_SUBDIRS(libltdl)	16	AC_PROG_LIBTOOL
21		17
22	AC_CHECK_LIB(m,sqrt)	18	AC_CHECK_LIB(m,sqrt)
23	AC_CHECK_LIB(jpeg,jpeg_start_compress)	19	AC_CHECK_LIB(jpeg,jpeg_start_compress)