[Ffmpeg-cvslog] CVS: ffmpeg configure,1.246,1.247

Diego Biurrun CVS diego
Sat Feb 11 20:29:38 CET 2006


Update of /cvsroot/ffmpeg/ffmpeg
In directory mail:/var2/tmp/cvs-serv4878

Modified Files:
	configure 
Log Message:
Add incdir to configure.


Index: configure
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -d -r1.246 -r1.247
--- configure	11 Feb 2006 18:50:44 -0000	1.246
+++ configure	11 Feb 2006 19:29:36 -0000	1.247
@@ -14,6 +14,7 @@
 echo "  --help                   print this message"
 echo "  --prefix=PREFIX          install in PREFIX [$prefix]"
 echo "  --libdir=DIR             install libs in DIR [PREFIX/lib]"
+echo "  --incdir=DIR             install includes in DIR [PREFIX/include/ffmpeg]"
 echo "  --mandir=DIR             install man page in DIR [PREFIX/man]"
 echo "  --enable-mp3lame         enable MP3 encoding via libmp3lame [default=no]"
 echo "  --enable-libogg          enable Ogg support via libogg [default=no]"
@@ -116,6 +117,7 @@
 # default parameters
 prefix="/usr/local"
 libdir=""
+incdir=""
 mandir=""
 bindir=""
 cross_prefix=""
@@ -463,6 +465,8 @@
   ;;
   --libdir=*) libdir=`echo $opt | cut -d '=' -f 2`; force_libdir=yes
   ;;
+  --incdir=*) incdir=`echo $opt | cut -d '=' -f 2`;
+  ;;
   --mandir=*) mandir=`echo $opt | cut -d '=' -f 2`
   ;;
   --source-path=*) source_path=`echo $opt | cut -d '=' -f 2`
@@ -1301,6 +1305,10 @@
 libdir="${prefix}/lib"
 fi
 
+if test x"$incdir" = x""; then
+libdir="${prefix}/include/ffmpeg"
+fi
+
 if test x"$mandir" = x""; then
 mandir="${prefix}/man"
 fi
@@ -1387,6 +1395,7 @@
 
 echo "prefix=\$(DESTDIR)$prefix" >> config.mak
 echo "libdir=\$(DESTDIR)$libdir" >> config.mak
+echo "incdir=\$(DESTDIR)$incdir" >> config.mak
 echo "bindir=\$(DESTDIR)$bindir" >> config.mak
 echo "mandir=\$(DESTDIR)$mandir" >> config.mak
 echo "MAKE=$make" >> config.mak





More information about the ffmpeg-cvslog mailing list