Репозиторий Sisyphus
Последнее обновление: 1 октября 2023 | Пакетов: 18631 | Посещений: 37847448
en ru br
Репозитории ALT
S:4.5.1-alt1
5.1: 3.2.11-alt1.svn20090216.1
4.1: 3.2.10-alt1.svn20080126.1
4.0: 3.2.10-alt0.svn20080126.M40.1
3.0: 3.1.19-alt1
www.altlinux.org/Changes

Группа :: Видео
Пакет: motion

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: motion-3.2.10-configure.patch
Скачать


diff -uNr motion-3.2.10/configure.in motion-3.2.10-new2/configure.in
--- motion-3.2.10/configure.in	2008-01-26 10:08:34 +0300
+++ motion-3.2.10-new2/configure.in	2008-01-26 11:02:42 +0300
@@ -9,7 +9,7 @@
 Darwin=""
 FreeBSD=""
 
-LINUXTHREADS="no"
+LINUXTHREADS="yes"
 AC_ARG_WITH(linuxthreads,
 [  --with-linuxthreads     Use linuxthreads in BSD instead of native phtreads
 				]
@@ -59,7 +59,7 @@
 dnl Checks for programs.
 AC_PROG_CC
 
-TEMP_LIBS="-lm ${TEMP_LIBS}"
+TEMP_LIBS="${TEMP_LIBS}"
 TEMP_CFLAGS="${TEMP_CFLAGS} ${CFLAGS}"
 TEMP_LDFLAGS="${TEMP_LDFLAGS} ${LDFLAGS}"
 
@@ -163,18 +163,6 @@
                 echo
         fi
 
-else
-
-dnl Checks for Library pthread ( no cross platform )
-AC_CHECK_LIB(pthread,pthread_create,[
-		TEMP_LIBS="$TEMP_LIBS -lpthread"
-		PTHREAD_SUPPORT="yes"
-	],[
-		echo
-		echo You do not have pthread installed
-		echo
-	]	
-)
 
 fi
 
@@ -226,63 +214,6 @@
 	fi
 fi
 
-if test "${JPEG_MMX_OK}" = "found"; then
-	OLD_CFLAGS="$CFLAGS"
-	OLD_LIBS="$LIBS"
-	CFLAGS="$CFLAGS -I${JPEG_MMX}"
-	LIBS="$LIBS -L${JPEG_MMX}"
-	AC_CHECK_LIB(jpeg-mmx, jpeg_start_compress,
-		[ TEMP_LIBS="$TEMP_LIBS -ljpeg-mmx"
-		TEMP_CFLAGS="${TEMP_CFLAGS} -I${JPEG_MMX}"
-		JPEG_SUPPORT="yes"],,)
-	LIBS="$OLD_LIBS"
-	CFLAGS="$OLD_CFLAGS"
-	JPEG_SUPPORT_MMX="yes"
-fi
-
-dnl
-dnl Look for _a_ jpeg lib that will work.
-dnl
-if test x$JPEG_SUPPORT != xyes ; then
-  dnl Checks for libraries
-  LDFLAGS=$TEMP_LDFLAGS
-
-  AC_CHECK_LIB(jpeg, jpeg_set_defaults, [
-		TEMP_LIBS="$TEMP_LIBS -ljpeg"
-		JPEG_SUPPORT="yes"
-	], [
-		echo
-		echo You do not have libjpeg installed
-		echo
-	]
-  )
-fi
-
-
-#
-# Check mjpegtools -lmjpegutils -llavjpeg
-#
-
-MJPEG_SUPPORT="no"
-MJPEG_HEADER1_SUPPORT="no"
-MJPEG_HEADER2_SUPPORT="no"
-
-AC_CHECK_HEADER(mjpegtools/jpegutils.h, ,MJPEG_HEADER1_SUPPORT="yes")
-AC_CHECK_HEADER(mjpegtools/mjpeg_types.h, ,MJPEG_HEADER2_SUPPORT="yes")
-
-if test x$MJPEG_HEADER1_SUPPORT != xyes && test x$MJPEG_HEADER2_SUPPORT != xyes; then
-
-   LDFLAGS=$TEMP_LDFLAGS  
-	
-   AC_CHECK_LIB(lavjpeg, decode_jpeg_raw,[ 
-		TEMP_LDFLAGS="$TEMP_LDFLAGS -lmjpegutils -llavjpeg"
-		MJPEG_SUPPORT="yes"
-		TEMP_CFLAGS="$TEMP_CFLAGS -DMJPEGT"
-                 ], , -lmjpegutils)
-fi
-
-AC_MSG_CHECKING(mjpegtools)
-AC_MSG_RESULT($MJPEG_SUPPORT)
 
 
 dnl
@@ -415,7 +346,7 @@
 			TEMP_LIBS="$TEMP_LIBS ${FFMPEG_LIBS_DEB}"
 #			TEMP_LDFLAGS="${TEMP_LDFLAGS} ${FFMPEG_LIBS_DEB}"
 		else
-			TEMP_LIBS="$TEMP_LIBS -L${FFMPEG} -lavformat -lavcodec -lm -lz"
+			TEMP_LIBS="$TEMP_LIBS -lavformat -lavcodec"
 			TEMP_LDFLAGS="${TEMP_LDFLAGS} -L${FFMPEG}"
 		fi
 
@@ -574,9 +505,9 @@
 		AC_MSG_RESULT(not found)
 		echo Invalid MySQL directory - unable to find libmysqlclient.a or libmysqlclient.so.
 	else
-		TEMP_LIBS="$TEMP_LIBS -L$MYSQL_LIBDIR -lmysqlclient"
+		TEMP_LIBS="$TEMP_LIBS -lmysqlclient"
 		#Add -lz for some mysql installs....
-		TEMP_LIBS="$TEMP_LIBS -lz"
+		TEMP_LIBS="$TEMP_LIBS"
 		TEMP_CFLAGS="$TEMP_CFLAGS -DHAVE_MYSQL -I$MYSQL_INCDIR"
 		AC_MSG_RESULT(found)
 		MYSQL_SUPPORT="yes"
@@ -628,7 +559,7 @@
 		AC_CHECK_LIB(pq, pg_encoding_to_char,AC_DEFINE(HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT,1,[ ]))
 	 	LDFLAGS=""	
 		AC_DEFINE(HAVE_PGSQL,1,[ ])
-		TEMP_LIBS="$TEMP_LIBS -L$PGSQL_LIBDIR -lpq"
+		TEMP_LIBS="$TEMP_LIBS -lpq"
 		TEMP_CFLAGS="$TEMP_CFLAGS -DHAVE_PGSQL $PGSQL_INCLUDE"
 		PostgreSQL_SUPPORT="yes"
 	fi
@@ -956,9 +887,80 @@
 	TEMP_CFLAGS="${TEMP_CFLAGS} -W -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wredundant-decls -Wno-long-long"
 fi
 
+if test "${JPEG_MMX_OK}" = "found"; then
+	OLD_CFLAGS="$CFLAGS"
+	OLD_LIBS="$LIBS"
+	CFLAGS="$CFLAGS -I${JPEG_MMX}"
+	LIBS="$LIBS"
+	AC_CHECK_LIB(jpeg-mmx, jpeg_start_compress,
+		[ TEMP_LIBS="$TEMP_LIBS -ljpeg-mmx"
+		TEMP_CFLAGS="${TEMP_CFLAGS} -I${JPEG_MMX}"
+		JPEG_SUPPORT="yes"],,)
+	LIBS="$OLD_LIBS"
+	CFLAGS="$OLD_CFLAGS"
+	JPEG_SUPPORT_MMX="yes"
+fi
+
+dnl
+dnl Look for _a_ jpeg lib that will work.
+dnl
+if test x$JPEG_SUPPORT != xyes ; then
+  dnl Checks for libraries
+  LDFLAGS=$TEMP_LDFLAGS
+
+  AC_CHECK_LIB(jpeg, jpeg_set_defaults, [
+		TEMP_LIBS="$TEMP_LIBS -ljpeg"
+		JPEG_SUPPORT="yes"
+	], [
+		echo
+		echo You do not have libjpeg installed
+		echo
+	]
+  )
+fi
+
+#
+# Check mjpegtools -lmjpegutils -llavjpeg
+#
+
+MJPEG_SUPPORT="no"
+MJPEG_HEADER1_SUPPORT="no"
+MJPEG_HEADER2_SUPPORT="no"
+
+AC_CHECK_HEADER(mjpegtools/jpegutils.h, ,MJPEG_HEADER1_SUPPORT="yes")
+AC_CHECK_HEADER(mjpegtools/mjpeg_types.h, ,MJPEG_HEADER2_SUPPORT="yes")
+
+if test x$MJPEG_HEADER1_SUPPORT != xyes && test x$MJPEG_HEADER2_SUPPORT != xyes; then
+
+	
+   AC_CHECK_LIB(lavjpeg, decode_jpeg_raw,[ 
+		TEMP_LIBS="$TEMP_LIBS -lmjpegutils -llavjpeg"
+		MJPEG_SUPPORT="yes"
+		TEMP_CFLAGS="$TEMP_CFLAGS -DMJPEGT"
+                 ], , -lmjpegutils)
+fi
+
+AC_MSG_CHECKING(mjpegtools)
+AC_MSG_RESULT($MJPEG_SUPPORT)
+
+
+
 CFLAGS="${TEMP_CFLAGS} $UNAME_DEFS  $CPU_OPTIONS"
 
-LIBS="${TEMP_LIBS}"
+LIBS="${TEMP_LIBS} -lz -lm -lpthread"
+
+dnl Checks for Library pthread ( no cross platform )
+dnl AC_CHECK_LIB(pthread,pthread_create,[
+dnl		TEMP_LIBS="$TEMP_LIBS -lpthread"
+dnl		PTHREAD_SUPPORT="yes"
+dnl	],[
+dnl		echo
+dnl		echo You do not have pthread installed
+dnl		echo
+dnl	]	
+dnl)
+
+
 LDFLAGS="${TEMP_LDFLAGS}"
 
 dnl
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin