cleanup sys/param.h include on FreeBSD

Assisted by Albert Villa who says it is safe to assume sys/param.h is
available, which is needed for FreeBSD version check on whether to
include xlocale.h in mlt_property.h.

diff --git a/src/framework/Makefile b/src/framework/Makefile
index a493dfbc2b24224b9279acde0fa151caf95037f5..fcb7a29b485a0d515f813a6af52c5ecd1bed6019 100644 (file)
--- a/src/framework/Makefile
+++ b/src/framework/Makefile
@@ -18,11 +18,6 @@ NAME = libmlt$(LIBSUF)
 TARGET = $(NAME).$(version)
 SONAME = $(NAME).$(soversion)
 SHFLAGS += -Wl,-soname,$(SONAME)
-       ifeq ($(targetos), FreeBSD)
-               ifdef HAVE_SYS_PARAM_H
-                       CFLAGS += -DHAVE_SYS_PARAM_H
-               endif
-       endif
 endif
 
 OBJS = mlt_frame.o \

diff --git a/src/framework/configure b/src/framework/configure
index 49ab581070efb3fe207eab5395fa843ff4768265..601b20c90144fb1c0e981e631d8638a7b0310a4a 100755 (executable)
--- a/src/framework/configure
+++ b/src/framework/configure
@@ -2,9 +2,3 @@
 echo "framework        -I$prefix/include -I$prefix/include/mlt -D_REENTRANT    -L$libdir -lmlt" >> ../../packages.dat
 
 echo > config.mak
-if [ "$(uname -s)" = "FreeBSD" ]
-then
-       printf "#include <sys/param.h>\n int main(){ return 0;}" | $CC -c -x c - >/dev/null 2>&1
-       [ "$?" -eq 0 ] && echo "HAVE_SYS_PARAM_H=1" >> config.mak
-fi
-exit 0

diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h
index fe328a7112dfc6b1fddb83a4590fc39835a0897a..3322434e21130e13d9f84f24f6fa3fb73c474933 100644 (file)
--- a/src/framework/mlt_property.h
+++ b/src/framework/mlt_property.h
@@ -26,7 +26,8 @@
 
 #include "mlt_types.h"
 
-#ifdef HAVE_SYS_PARAM_H
+#if defined(__FreeBSD__)
+/* This header has existed since 1994 and defines __FreeBSD_version below. */
 #include <sys/param.h>
 #endif