blob: 4d439c175d52cefa5403c54e0e6f38f9d8c6cfd9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
Use CFLAGS from environment and make sure we install the .m4 into the
correct place regardless of whether `aclocal` is installed on the host.
Index: libdvdnav-0.1.10/configure.ac
===================================================================
--- libdvdnav-0.1.10.orig/configure.ac
+++ libdvdnav-0.1.10/configure.ac
@@ -175,8 +175,9 @@ dnl ------------------------------------
dnl cflags
dnl ---------------------------------------------
dnl Common cflags for all platforms
-CFLAGS="-O3 -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE $CFLAGS"
-DEBUG_CFLAGS="-g -DDEBUG $CFLAGS"
+CFLAGS="${CFLAGS} -Wall"
+CPPFLAGS="${CPPFLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
+DEBUG_CFLAGS="${CFLAGS} -g -DDEBUG"
AC_SUBST(DEBUG_CFLAGS)
Index: libdvdnav-0.1.10/m4/Makefile.am
===================================================================
--- libdvdnav-0.1.10.orig/m4/Makefile.am
+++ libdvdnav-0.1.10/m4/Makefile.am
@@ -2,10 +2,6 @@ include $(top_srcdir)/misc/Makefile.comm
EXTRA_DIST = dvdnav.m4
-if INSTALL_M4
-m4datadir = @ACLOCAL_DIR@
-else
m4datadir = $(datadir)/aclocal
-endif
m4data_DATA = dvdnav.m4
|
GitWeb
