File ffmpeg_configure.diff of Package ffmpeg - j0ke.net Open Build Service

File ffmpeg_configure.diff of Package ffmpeg (Revision 398d7594618b257112d2b06ed3a833a1)

Currently displaying revision 398d7594618b257112d2b06ed3a833a1, show latest

--- configure.orig	2009-02-22 01:18:34.000000000 +0100
+++ configure	2009-02-22 01:30:09.000000000 +0100
@@ -1894,11 +1894,11 @@
 # ---
 # check availability of some header files
 
-if check_func dlopen; then
-    ldl=
-elif check_func dlopen -ldl; then
+#if check_func dlopen; then
+#    ldl=
+#elif check_func dlopen -ldl; then
     ldl=-ldl
-fi
+#fi
 
 check_func  fork
 check_func  gethrtime
@@ -2137,19 +2137,20 @@
 check_ldflags '-Wl,-rpath-link,\$(BUILD_ROOT)/libpostproc -Wl,-rpath-link,\$(BUILD_ROOT)/libswscale -Wl,-rpath-link,\$(BUILD_ROOT)/libavfilter -Wl,-rpath-link,\$(BUILD_ROOT)/libavdevice -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
 check_ldflags -Wl,-Bsymbolic
 
-if enabled small; then
-    check_cflags -Os            # not all compilers support -Os
-    optimizations="small"
-elif enabled optimizations; then
-    if enabled xlc; then
-        add_cflags  -O5
-        add_ldflags -O5
-    elif enabled ccc; then
-        add_cflags -fast
-    else
-        add_cflags -O3
-    fi
-fi
+#if enabled small; then
+#    check_cflags -Os            # not all compilers support -Os
+#    optimizations="small"
+#elif enabled optimizations; then
+#    if enabled xlc; then
+#        add_cflags  -O5
+#        add_ldflags -O5
+#    elif enabled ccc; then
+#        add_cflags -fast
+#    else
+#        add_cflags -O3
+#    fi
+#fi
+add_cflags '${CFLAGS}'
 check_cflags -fno-math-errno
 check_cflags -fno-signed-zeros
 
@@ -2545,7 +2546,7 @@
 Conflicts:
 Libs: -L\${libdir} -l${shortname} $(disabled shared && echo $libs)
 Libs.private: $(enabled shared && echo $libs)
-Cflags: -I\${includedir}
+Cflags: -I/usr/include -I/usr/include/$name
 EOF
 cat <<EOF > $name/$name-uninstalled.pc
 prefix=
@@ -2559,7 +2560,7 @@
 Requires: $requires
 Conflicts:
 Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs
-Cflags: -I\${includedir}
+Cflags: -I/usr/include -I/usr/include/$name
 EOF
 }