| Message ID | 1428511959-25990-1-git-send-email-emil.l.velikov@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Will anyone have any objections against the series. I am planning to have this merged by the end of the week. Thanks Emil On 8 April 2015 at 17:52, Emil Velikov <emil.l.velikov@gmail.com> wrote: > Required by intel and drmstat at least. Considering that every compiler > used to build libdrm is C99 compatible, just enable it for the whole > build. > > Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> > --- > configure.ac | 5 +++++ > intel/Makefile.am | 2 -- > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/configure.ac b/configure.ac > index e715262..320e482 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -36,6 +36,11 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) > > # Check for programs > AC_PROG_CC > +AC_PROG_CC_C99 > + > +if test "x$ac_cv_prog_cc_c99" = xno; then > + AC_MSG_ERROR([Building libdrm requires C99 enabled compiler]) > +fi > > AC_USE_SYSTEM_EXTENSIONS > AC_SYS_LARGEFILE > diff --git a/intel/Makefile.am b/intel/Makefile.am > index de3baab..d004568 100644 > --- a/intel/Makefile.am > +++ b/intel/Makefile.am > @@ -42,8 +42,6 @@ libdrm_intel_la_LIBADD = ../libdrm.la \ > > libdrm_intel_la_SOURCES = $(LIBDRM_INTEL_FILES) > > -intel_bufmgr_gem_o_CFLAGS = $(AM_CFLAGS) -c99 > - > libdrm_intelincludedir = ${includedir}/libdrm > libdrm_intelinclude_HEADERS = $(LIBDRM_INTEL_H_FILES) > > -- > 2.3.1 >
diff --git a/configure.ac b/configure.ac index e715262..320e482 100644 --- a/configure.ac +++ b/configure.ac @@ -36,6 +36,11 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) # Check for programs AC_PROG_CC +AC_PROG_CC_C99 + +if test "x$ac_cv_prog_cc_c99" = xno; then + AC_MSG_ERROR([Building libdrm requires C99 enabled compiler]) +fi AC_USE_SYSTEM_EXTENSIONS AC_SYS_LARGEFILE diff --git a/intel/Makefile.am b/intel/Makefile.am index de3baab..d004568 100644 --- a/intel/Makefile.am +++ b/intel/Makefile.am @@ -42,8 +42,6 @@ libdrm_intel_la_LIBADD = ../libdrm.la \ libdrm_intel_la_SOURCES = $(LIBDRM_INTEL_FILES) -intel_bufmgr_gem_o_CFLAGS = $(AM_CFLAGS) -c99 - libdrm_intelincludedir = ${includedir}/libdrm libdrm_intelinclude_HEADERS = $(LIBDRM_INTEL_H_FILES)
Required by intel and drmstat at least. Considering that every compiler used to build libdrm is C99 compatible, just enable it for the whole build. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> --- configure.ac | 5 +++++ intel/Makefile.am | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-)