--- motion-3.2.1/configure.in	Fri Apr 22 17:44:10 2005
+++ motion-3.2.1-FreeBSD/configure.in	Wed May 25 03:35:07 2005
@@ -10,7 +10,7 @@ AC_SUBST(VIDEO)
 dnl Checks for programs.
 AC_PROG_CC
 
-LIBS="$LIBS -lm"
+TEMP_LIBS="-lm"
 
 dnl
 dnl Check to Exclude V4L
@@ -24,12 +24,12 @@ V4L="$withval"
 )
 
 if test "${V4L}" = "no"; then
-	CFLAGS="${CFLAGS} -DWITHOUT_V4L"
+	TEMP_CFLAGS="${CFLAGS} -DWITHOUT_V4L"
 fi
 
 dnl Checks for Library pthread ( no cross platform )
 AC_CHECK_LIB(pthread,pthread_create,[
-		LIBS="$LIBS -lpthread"
+		TEMP_LIBS="$TEMP_LIBS -lpthread"
 		PTHREAD_SUPPORT="yes"
 	],[
 		echo
@@ -40,7 +40,7 @@ AC_CHECK_LIB(pthread,pthread_create,[
 
 dnl Checks for libraries
 AC_CHECK_LIB(jpeg, jpeg_set_defaults, [
-		LIBS="$LIBS -ljpeg"
+		TEMP_LIBS="$TEMP_LIBS -ljpeg"
 		JPEG_SUPPORT="yes"
 	], [
 		echo
@@ -134,13 +134,13 @@ fi
 
 if test "${FFMPEG_OK}" = "found"; then
 	if test -f ${FFMPEG}/include/avformat.h; then
-		CFLAGS="-I${FFMPEG}/include ${CFLAGS}"
+		TEMP_CFLAGS="-I${FFMPEG}/include ${TEMP_CFLAGS}"
 	elif test -f ${FFMPEG}/avformat.h; then
-		CFLAGS="-I${FFMPEG} ${CFLAGS}"
+		TEMP_CFLAGS="-I${FFMPEG} ${TEMP_CFLAGS}"
 	elif test -f `AS_DIRNAME([${FFMPEG}])`/include/avformat.h; then
-		CFLAGS="-I`AS_DIRNAME([${FFMPEG}])`/include ${CFLAGS}"
+		TEMP_CFLAGS="-I`AS_DIRNAME([${FFMPEG}])`/include ${TEMP_CFLAGS}"
 	elif test -f `AS_DIRNAME([${FFMPEG}])`/include/ffmpeg/avformat.h; then
-		CFLAGS="-I`AS_DIRNAME([${FFMPEG}])`/include/ffmpeg ${CFLAGS}"
+		TEMP_CFLAGS="-I`AS_DIRNAME([${FFMPEG}])`/include/ffmpeg ${TEMP_CFLAGS}"
 	else
 		AC_MSG_RESULT(not found)
 		echo "**********************************************"
@@ -155,12 +155,12 @@ if test "${FFMPEG_OK}" = "found"; then
 
 	
 	if test "${FFMPEG_LIBS_DEB}" != "" ; then
-		LIBS="$LIBS -L${FFMPEG} ${FFMPEG_LIBS_DEB}"	
+		TEMP_LIBS="$TEMP_LIBS -L${FFMPEG} ${FFMPEG_LIBS_DEB}"	
 	else
-		LIBS="$LIBS -L${FFMPEG} -lavformat -lavcodec -lm -lz"
-		LDFLAGS="-Wl,-rpath,${FFMPEG}"
+		TEMP_LIBS="$TEMP_LIBS -L${FFMPEG} -lavformat -lavcodec -lm -lz"
+		TEMP_LDFLAGS="-Wl,-rpath,${FFMPEG}"
 	fi	
-	CFLAGS="${CFLAGS} -DHAVE_FFMPEG"
+	TEMP_CFLAGS="${TEMP_CFLAGS} -DHAVE_FFMPEG"
 	FFMPEG_OBJ="ffmpeg.o"
 	AC_SUBST(FFMPEG_OBJ)
 fi	
@@ -247,10 +247,10 @@ else
 		AC_MSG_RESULT(no)
 		echo Invalid MySQL directory - unable to find mysql.h.
 	else
-		LIBS="$LIBS -L$MYSQL_LIBDIR -lmysqlclient"
+		TEMP_LIBS="$TEMP_LIBS -L$MYSQL_LIBDIR -lmysqlclient"
 		#Add -lz for some mysql installs....
-		LIBS="$LIBS -lz"
-		CFLAGS="$CFLAGS -DHAVE_MYSQL -I $MYSQL_INCDIR"
+		TEMP_LIBS="$TEMP_LIBS -lz"
+		TEMP_CFLAGS="$TEMP_CFLAGS -DHAVE_MYSQL -I $MYSQL_INCDIR"
 		AC_MSG_RESULT(yes)
 		MYSQL_SUPPORT="yes"
 	fi
@@ -288,20 +288,15 @@ if test "${PGSQL}" = "yes"; then
 		PGSQL_LIBDIR=$PGSQL_DIR/lib
 		AC_MSG_RESULT(yes)
 		test -d $PGSQL_DIR/lib/pgsql && PGSQL_LIBDIR=$PGSQL_DIR/lib/pgsql
-		old_LIBS="$LIBS"
-		old_LDFLAGS="$LDFLAGS"
-		LDFLAGS="$LDFLAGS -L$PGSQL_LIBDIR"
+		LDFLAGS="$TEMP_LDFLAGS -L$PGSQL_LIBDIR"
 		AC_CHECK_LIB(pq, PQcmdTuples,AC_DEFINE(HAVE_PQCMDTUPLES,1,[ ]))
 		AC_CHECK_LIB(pq, PQoidValue,AC_DEFINE(HAVE_PQOIDVALUE,1,[ ]))
 		AC_CHECK_LIB(pq, PQclientEncoding,AC_DEFINE(HAVE_PQCLIENTENCODING,1,[ ]))
 		AC_CHECK_LIB(pq, pg_encoding_to_char,AC_DEFINE(HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT,1,[ ]))
-		LIBS="$old_LIBS"
-		LDFLAGS="$old_LDFLAGS"
-
+	 	LDFLAGS=""	
 		AC_DEFINE(HAVE_PGSQL,1,[ ])
-
-		LIBS="$LIBS -L$PGSQL_LIBDIR -lpq"
-		CFLAGS="$CFLAGS -DHAVE_PGSQL $PGSQL_INCLUDE"
+		TEMP_LIBS="$TEMP_LIBS -L$PGSQL_LIBDIR -lpq"
+		TEMP_CFLAGS="$TEMP_CFLAGS -DHAVE_PGSQL $PGSQL_INCLUDE"
 		PostgreSQL_SUPPORT="yes"
 	fi
 fi
@@ -314,15 +309,15 @@ AC_CHECK_HEADERS(stdio.h stdlib.h unistd
 dnl Check sizes of integer types
 AC_CHECK_SIZEOF(short int)
 if test "$ac_cv_sizeof_short_int" = "4"; then
-	CFLAGS="${CFLAGS} -DTYPE_32BIT=\"short int\""
+	TEMP_CFLAGS="${TEMP_CFLAGS} -DTYPE_32BIT=\"short int\""
 else
 	AC_CHECK_SIZEOF(int)
 	if test "$ac_cv_sizeof_int" = "4"; then
-		CFLAGS="${CFLAGS} -DTYPE_32BIT=\"int\""
+		TEMP_CFLAGS="${TEMP_CFLAGS} -DTYPE_32BIT=\"int\""
 	else
 		AC_CHECK_SIZEOF(long int)
 		if test "$ac_cv_sizeof_long_int" = "4"; then
-			CFLAGS="${CFLAGS} -DTYPE_32BIT=\"long int\""
+			TEMP_CFLAGS="${TEMP_CFLAGS} -DTYPE_32BIT=\"long int\""
 		fi
 	fi
 fi
@@ -526,7 +521,6 @@ else
 	CPU_OPTIONS=""
 fi
 
-CFLAGS="${CFLAGS} $UNAME_DEFS  $CPU_OPTIONS"
 
 AC_MSG_CHECKING(for bswap instruction)
 AC_LINK_IFELSE([
@@ -536,12 +530,17 @@ AC_LINK_IFELSE([
 		__asm("bswap %0" : "=r" (__v) : "0" (__x));])
 	],
 	[
-		CFLAGS="${CFLAGS} -DHAVE_BSWAP"
+		TEMP_CFLAGS="${TEMP_CFLAGS} -DHAVE_BSWAP"
 		AC_MSG_RESULT(yes)
 	],
 	[ 
 		AC_MSG_RESULT(no)
 	])
+
+
+CFLAGS="${TEMP_CFLAGS} $UNAME_DEFS  $CPU_OPTIONS"
+LIBS="${TEMP_LIBS}"
+LDFLAGS="${TEMP_LDFLAGS}"
 
 dnl
 dnl Add the right exec path for rc scripts
--- motion-3.2.1/configure.in.freebsd	Mon Mar 28 02:08:52 2005
+++ motion-3.2.1-FreeBSD/configure.in.freebsd	Wed May 25 03:41:50 2005
@@ -21,15 +21,15 @@ AC_MSG_CHECKING(for FreeBSD)
 FreeBSD=`uname -a | grep "FreeBSD"`
 
 if test "${FreeBSD}" = ""; then
-       AC_MSG_RESULT(no)
-       VIDEO="video.o"	
+	AC_MSG_RESULT(no)
+	VIDEO="video.o"	
 else
-       FreeBSD="yes"
-       AC_MSG_RESULT($FreeBSD)
-       THREAD_CHECK="/usr/local/include/pthread/linuxthreads/pthread.h"
-       THREAD_LIB_CHECK="/usr/local/lib/liblthread.so"
-       CFLAGS="$CFLAGS -D__freebsd__"
-       VIDEO="video_freebsd.o"
+	FreeBSD="yes"
+	AC_MSG_RESULT($FreeBSD)
+	THREAD_CHECK="/usr/local/include/pthread/linuxthreads/pthread.h"
+	THREAD_LIB_CHECK="/usr/local/lib/liblthread.so"
+	CFLAGS="$CFLAGS -D__freebsd__"
+	VIDEO="video_freebsd.o"
 fi
 
 AC_SUBST(VIDEO)
@@ -47,7 +47,7 @@ V4L="$withval"
 )
                                                                                                                              
 if test "${V4L}" = "no"; then
-        CFLAGS="${CFLAGS} -DWITHOUT_V4L"
+	CFLAGS="${CFLAGS} -DWITHOUT_V4L"
 fi
 
 AC_MSG_CHECKING(for threads)
@@ -56,10 +56,10 @@ dnl
 dnl Check for thread header
 dnl
 if test -f "${THREAD_CHECK}"; then
-       HEADERS_THREAD_CFLAGS="-I/usr/local/include/pthread/linuxthreads"
-       THREADS="yes"
+	HEADERS_THREAD_CFLAGS="-I/usr/local/include/pthread/linuxthreads"
+	THREADS="yes"
 else
-       THREADS="no"
+	THREADS="no"
 fi
 
 dnl
@@ -67,10 +67,10 @@ dnl Check for thread lib
 dnl
 
 if test -f "${THREAD_LIB_CHECK}" ; then
-       THREADS="yes"
-       LIB_THREAD="-L/usr/local/lib -llthread -llgcc_r"
+	THREADS="yes"
+	LIB_THREAD="-L/usr/local/lib -llthread -llgcc_r"
 else
-       THREADS="no"
+	THREADS="no"
 fi
 
 if test "${FreeBSD}" = "yes";then
@@ -81,30 +81,32 @@ dnl /usr/local/include/pthreads/linuxthr
 dnl #include <linuxthreads/pthread.h>
 dnl /usr/local/lib/libpthread.so
 dnl
-        if test "${THREADS}" = "yes"; then
-               CFLAGS="${HEADERS_THREAD_CFLAGS} $CFLAGS -DWITH_LINUXTREADS"
-               LIBS="$LIBS ${LIB_THREAD}"
-               THREAD_CFLAGS="-D_THREAD_SAFE"
-               PTHREAD_SUPPORT="yes"
-        else
-               PTHREAD_SUPPORT="no"
-               echo
-               echo You do not have linuxthread installed
-               echo
-        fi
+	if test "${THREADS}" = "yes"; then
+		CFLAGS="${HEADERS_THREAD_CFLAGS} $CFLAGS -DWITH_LINUXTREADS"
+		LIBS="$LIBS ${LIB_THREAD}"
+		THREAD_CFLAGS="-D_THREAD_SAFE"
+		PTHREAD_SUPPORT="yes"
+		AC_MSG_RESULT($THREADS)
+	else
+		PTHREAD_SUPPORT="no"
+		AC_MSG_RESULT($THREADS)	
+		echo
+		echo You do not have linuxthread installed
+		echo
+	fi
 else
-       LIBS="$LIBS $SLIBS"
-       AC_SUBST(THREAD_CFLAGS)
+	LIBS="$LIBS $SLIBS"
+	AC_SUBST(THREAD_CFLAGS)
 fi
 
 dnl
 dnl check for jpeglib.h
 dnl
 if test -f /usr/include/jpeglib.h; then
-       HAVE_JPEG_HEADER="yes"
+	HAVE_JPEG_HEADER="yes"
 elif test -f /usr/local/include/jpeglib.h; then
-       HAVE_JPEG_HEADER="yes"
-       JPEG_HEADER_CFLAGS="I/usr/local/include"
+	HAVE_JPEG_HEADER="yes"
+	JPEG_HEADER_CFLAGS="-I/usr/local/include"
 fi
 
 
@@ -113,22 +115,22 @@ dnl check for jpeglib
 dnl
 
 if test -f /usr/lib/libjpeg.so; then
-       HAVE_JPEG="yes"
-       JPEG_LIB="-ljpeg"
+	HAVE_JPEG="yes"
+	JPEG_LIB="-ljpeg"
 elif test -f /usr/local/lib/libjpeg.so; then
-       HAVE_JPEG="yes"
-       JPEG_LIB="-L/usr/local/lib -ljpeg"
+	HAVE_JPEG="yes"
+	JPEG_LIB="-L/usr/local/lib -ljpeg"
 fi
 
 
 if test "${HAVE_JPEG}" = "yes"; then
-       LIBS="$LIBS ${JPEG_LIB}"
-       CGLAGS="$CFLAGS ${JPEG_HEADER_CFLAGS}"
-       JPEG_SUPPORT="yes"
+	LIBS="$LIBS ${JPEG_LIB}"
+	CFLAGS="$CFLAGS ${JPEG_HEADER_CFLAGS}"
+	JPEG_SUPPORT="yes"
 else
-       echo
-       echo You do not have libjpeg installed
-       echo
+	echo
+	echo You do not have libjpeg installed
+	echo
 fi
 
 dnl
--- motion-3.2.1/README.FreeBSD	Wed Nov 17 00:24:56 2004
+++ motion-3.2.1-FreeBSD/README.FreeBSD	Wed May 25 03:48:35 2005
@@ -24,7 +24,7 @@ Note : if you want auto-detect CPU/ARCH 
 
 ( ./configure --without-v4l , to work only with network cameras ).
 
-Tested in FreeBSD 4.9 and 4.10 not in 5.x .
+Tested in FreeBSD 4.9 and 4.1x not in 5.x .
 
 Packages needed :
 
@@ -35,8 +35,6 @@ Packages needed :
  - jpeg-6b_2  
  - gmake ( GNU Make )
  - ffmpeg-0.4.8_5 ( mpeg1/4 video encoders ).
- - curl-7.11.1 ( for network cameras ).
- - xmlrpc-c-0.9.10_1 ( for motion-control support ). 
  - mysql-server , mysql-client ( database backend support ).
  - postgresql-devel , postgresql ( database backend support ).