mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 23:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

- acinclude.m4: align to neutrino-mp

Browse Source
This commit is contained in:
svenhoefer
2017-03-22 12:11:26 +01:00
parent 216a774343
commit 54ff55dd47
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
acinclude.m4
View File

@@ -10,7 +10,7 @@ AC_ARG_WITH(target,
AC_ARG_WITH(targetprefix, AC_ARG_WITH(targetprefix,
[ --with-targetprefix=PATH prefix relative to target root (only applicable in cdk mode)], [ --with-targetprefix=PATH prefix relative to target root (only applicable in cdk mode)],
[TARGET_PREFIX="$withval"],[TARGET_PREFIX="NONE"]) [TARGET_PREFIX="$withval"],[TARGET_PREFIX=""])
AC_ARG_WITH(debug, AC_ARG_WITH(debug,
[ --without-debug disable debugging code], [ --without-debug disable debugging code],
@@ -127,6 +127,8 @@ if test "$TARGET" = "cdk"; then
targetlocalstatedir="\${TARGET_PREFIX}/var" targetlocalstatedir="\${TARGET_PREFIX}/var"
targetlibdir="\${TARGET_PREFIX}/lib" targetlibdir="\${TARGET_PREFIX}/lib"
targetmntdir="\${TARGET_PREFIX}/mnt" targetmntdir="\${TARGET_PREFIX}/mnt"
else
mntdir="/mnt" # hack
fi fi
TUXBOX_APPS_DIRECTORY_ONE(configdir,CONFIGDIR,localstatedir,/var,/tuxbox/config, TUXBOX_APPS_DIRECTORY_ONE(configdir,CONFIGDIR,localstatedir,/var,/tuxbox/config,
@@ -241,8 +243,13 @@ _TUXBOX_APPS_LIB_CONFIG($1,$2,WARN)
]) ])
AC_DEFUN([TUXBOX_APPS_PKGCONFIG],[ AC_DEFUN([TUXBOX_APPS_PKGCONFIG],[
AC_PATH_PROG(PKG_CONFIG, pkg-config,no) m4_pattern_forbid([^_?PKG_[A-Z_]+$])
if test "$PKG_CONFIG" = "no" ; then m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
fi
if test x"$PKG_CONFIG" = x"" ; then
AC_MSG_ERROR([could not find pkg-config]); AC_MSG_ERROR([could not find pkg-config]);
fi fi
]) ])
@@ -311,6 +318,10 @@ AC_ARG_WITH(boxmodel,
raspi) raspi)
if test "$BOXTYPE" = "generic"; then if test "$BOXTYPE" = "generic"; then
BOXMODEL="$withval" BOXMODEL="$withval"
else
AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
fi
;;
*) *)
AC_MSG_ERROR([unsupported value $withval for --with-boxmodel]) AC_MSG_ERROR([unsupported value $withval for --with-boxmodel])
;; ;;