--- motion-3.1.20/configure.in	Sat Apr 16 09:17:07 2005
+++ motion-3.1.20-FreeBSD/configure.in	Wed May 25 02:52:17 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
@@ -79,12 +79,11 @@ else if test "${FFMPEG}" = "yes"; then
 
 # weird hack to fix debian problem TO BE REMOVED
 
-	FFMPEG_LIBS_DEB="`ffmpeg-config --libs avformat`"
-
-	if test "${FFMPEG_LIBS_DEB}" != ""; then
+	if test -f /usr/bin/ffmpeg-config; then
+		FFMPEG_LIBS_DEB="`ffmpeg-config --libs avformat`"
 		FFMPEG_DEB="`ffmpeg-config --cflags`"
 		FFMPEG_OK="found"
-	fi
+        fi
 	
 	if test -f /usr/lib/libavcodec.a -o -f /usr/lib/libavcodec.so && test -f /usr/lib/libavformat.a -o -f /usr/lib/libavformat.so ; then
 		AC_MSG_RESULT(found)
@@ -135,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 +154,12 @@ if test "${FFMPEG_OK}" = "found"; then
 	fi
 	
 	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)
 
@@ -194,8 +193,8 @@ CONTROL_OBJ=""
 AC_MSG_CHECKING(for xmlrpc-c)
 for w in /usr/bin /usr/local/bin ; do
 	if test -x $w/xmlrpc-c-config; then
-		CFLAGS="${CFLAGS} -DHAVE_XMLRPC "`$w/xmlrpc-c-config --cflags`
-		LIBS="${LIBS} "`$w/xmlrpc-c-config --libs`
+		TEMP_CFLAGS="${TEMP_CFLAGS} -DHAVE_XMLRPC "`$w/xmlrpc-c-config --cflags`
+		TEMP_LIBS="${TEMP_LIBS} "`$w/xmlrpc-c-config --libs`
 		CONTROL_LIBS=`$w/xmlrpc-c-config libwww-client --libs`
 		MOTION_CONTROL="motion-control"
 		XML_HTTP_OBJ="xmlrpc-httpd.o control.o"
@@ -303,10 +302,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
@@ -344,20 +343,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
@@ -370,15 +364,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
@@ -583,7 +577,6 @@ else
 	CPU_OPTIONS=""
 fi
 
-CFLAGS="${CFLAGS} $UNAME_DEFS  $CPU_OPTIONS"
 
 AC_MSG_CHECKING(for bswap instruction)
 AC_LINK_IFELSE([
@@ -593,7 +586,7 @@ AC_LINK_IFELSE([
 		__asm("bswap %0" : "=r" (__v) : "0" (__x));])
 	],
 	[
-		CFLAGS="${CFLAGS} -DHAVE_BSWAP"
+		TEMP_CFLAGS="${TEMP_CFLAGS} -DHAVE_BSWAP"
 		AC_MSG_RESULT(yes)
 	],
 	[ 
@@ -617,6 +610,11 @@ else
 		BIN_PATH="$prefix/$bindir"
 	fi
 fi
+
+
+CFLAGS="${TEMP_CFLAGS} $UNAME_DEFS  $CPU_OPTIONS"
+LIBS="${TEMP_LIBS}"
+LDFLAGS="${TEMP_LDFLAGS}"
 
 AC_SUBST(BIN_PATH)
 
--- motion-3.1.20/configure.in.freebsd	Mon Mar 28 02:47:23 2005
+++ motion-3.1.20-FreeBSD/configure.in.freebsd	Wed May 25 02:51:05 2005
@@ -104,7 +104,7 @@ if test -f /usr/include/jpeglib.h; then
        HAVE_JPEG_HEADER="yes"
 elif test -f /usr/local/include/jpeglib.h; then
        HAVE_JPEG_HEADER="yes"
-       JPEG_HEADER_CFLAGS="I/usr/local/include"
+       JPEG_HEADER_CFLAGS="-I/usr/local/include"
 fi
 
 
@@ -123,7 +123,7 @@ fi
 
 if test "${HAVE_JPEG}" = "yes"; then
        LIBS="$LIBS ${JPEG_LIB}"
-       CGLAGS="$CFLAGS ${JPEG_HEADER_CFLAGS}"
+       CFLAGS="$CFLAGS ${JPEG_HEADER_CFLAGS}"
        JPEG_SUPPORT="yes"
 else
        echo