diff options
| -rw-r--r-- | m4/_xine.m4 | 2 | ||||
| -rw-r--r-- | m4/iconv.m4 | 16 | ||||
| -rw-r--r-- | po/Makefile.in.in | 3 |
3 files changed, 20 insertions, 1 deletions
diff --git a/m4/_xine.m4 b/m4/_xine.m4 index a67425bdc..897ba07a2 100644 --- a/m4/_xine.m4 +++ b/m4/_xine.m4 @@ -180,7 +180,7 @@ dnl AC_CHECK_GENERATE_INTTYPES_H (INCLUDE-DIRECTORY) dnl generate a default inttypes.h if the header file does not exist already AC_DEFUN([AC_CHECK_GENERATE_INTTYPES], [AC_CHECK_HEADER([inttypes.h],, - [[ ! -d $1 ] && mkdir $1 + [if test ! -d $1; then mkdir $1; fi AC_CHECK_HEADER([stdint.h], [cat >$1/inttypes.h << EOF #ifndef _INTTYPES_H diff --git a/m4/iconv.m4 b/m4/iconv.m4 index 654c41589..5ed7c43ae 100644 --- a/m4/iconv.m4 +++ b/m4/iconv.m4 @@ -15,6 +15,22 @@ AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV dnl accordingly. AC_LIB_LINKFLAGS_BODY([iconv]) + + dnl + dnl xine: added the prefix /usr/local on FreeBSD if none specified + dnl + if test -z "$INCICONV"; then + case "$host" in + *-*-freebsd*) + dir=/usr/local + if test -d $dir/include; then INCICONV="$INCICONV -I$dir/include"; fi + if test -d $dir/lib; then + LIBICONV="$LIBICONV -L$dir/lib" + LTLIBICONV="$LTLIBICONV -L$dir/lib" + fi + ;; + esac + fi ]) AC_DEFUN([AM_ICONV_LINK], diff --git a/po/Makefile.in.in b/po/Makefile.in.in index c2dbc6460..2ec0141c1 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -382,6 +382,9 @@ Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@ && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ $(SHELL) ./config.status +debug: +install-debug: + force: # Tell versions [3.59,3.63) of GNU make not to export all variables. |