FS-287: fix bsd shell incompatibility
This commit is contained in:
parent
ad0298f7f9
commit
e2b85e946a
|
@ -367,14 +367,14 @@ src/include/switch_version.h: src/include/switch_version.h.in .version $(libfree
|
||||||
else \
|
else \
|
||||||
if [ -d .git ] ; then \
|
if [ -d .git ] ; then \
|
||||||
version=`git log --format="%h %ci" -1 HEAD | head -1 | sed -e 's|:|-|g' || echo hacked` ; \
|
version=`git log --format="%h %ci" -1 HEAD | head -1 | sed -e 's|:|-|g' || echo hacked` ; \
|
||||||
if [ "x$$version" == "xhacked" ] ; then \
|
if [ "x$$version" = "xhacked" ] ; then \
|
||||||
version="hacked-`date -u +%Y%m%dT%H%M%SZ`" ; \
|
version="hacked-`date -u +%Y%m%dT%H%M%SZ`" ; \
|
||||||
else \
|
else \
|
||||||
version="git-$$version" ; \
|
version="git-$$version" ; \
|
||||||
fi ;\
|
fi ;\
|
||||||
else \
|
else \
|
||||||
version=`svnversion . -n || echo hacked` ; \
|
version=`svnversion . -n || echo hacked` ; \
|
||||||
if [ "x$$version" == "xhacked" ] ; then \
|
if [ "x$$version" = "xhacked" ] ; then \
|
||||||
version="hacked-`date -u +%Y%m%dT%H%M%SZ`" ; \
|
version="hacked-`date -u +%Y%m%dT%H%M%SZ`" ; \
|
||||||
else \
|
else \
|
||||||
version="svn-$$version" ; \
|
version="svn-$$version" ; \
|
||||||
|
|
|
@ -207,7 +207,7 @@ AC_CHECK_HEADERS([sndfile.h])
|
||||||
|
|
||||||
AC_LANG([C])
|
AC_LANG([C])
|
||||||
|
|
||||||
if test "${build}" == "${host}"
|
if test "${build}" = "${host}"
|
||||||
then
|
then
|
||||||
case "${host}" in
|
case "${host}" in
|
||||||
x86_64-*)
|
x86_64-*)
|
||||||
|
|
|
@ -175,14 +175,14 @@ AC_CHECK_HEADERS([sys/select.h])
|
||||||
AC_CHECK_HEADERS([sys/ioctl.h])
|
AC_CHECK_HEADERS([sys/ioctl.h])
|
||||||
AC_CHECK_HEADERS([sys/fcntl.h])
|
AC_CHECK_HEADERS([sys/fcntl.h])
|
||||||
AC_CHECK_HEADERS([audiofile.h])
|
AC_CHECK_HEADERS([audiofile.h])
|
||||||
if test "${build}" == "${host}"
|
if test "${build}" = "${host}"
|
||||||
then
|
then
|
||||||
AC_CHECK_HEADERS([X11/X.h])
|
AC_CHECK_HEADERS([X11/X.h])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_LANG([C++])
|
AC_LANG([C++])
|
||||||
|
|
||||||
if test "${build}" == "${host}"
|
if test "${build}" = "${host}"
|
||||||
then
|
then
|
||||||
case "${host}" in
|
case "${host}" in
|
||||||
x86_64-*)
|
x86_64-*)
|
||||||
|
@ -193,7 +193,7 @@ fi
|
||||||
|
|
||||||
AC_LANG([C])
|
AC_LANG([C])
|
||||||
|
|
||||||
if test "${build}" == "${host}"
|
if test "${build}" = "${host}"
|
||||||
then
|
then
|
||||||
case "${host}" in
|
case "${host}" in
|
||||||
x86_64-*)
|
x86_64-*)
|
||||||
|
|
|
@ -190,7 +190,7 @@ AC_CHECK_HEADERS([audiofile.h])
|
||||||
|
|
||||||
AC_LANG([C])
|
AC_LANG([C])
|
||||||
|
|
||||||
if test "${build}" == "${host}"
|
if test "${build}" = "${host}"
|
||||||
then
|
then
|
||||||
case "${host}" in
|
case "${host}" in
|
||||||
x86_64-*)
|
x86_64-*)
|
||||||
|
|
|
@ -207,7 +207,7 @@ AC_CHECK_HEADERS([fenv.h])
|
||||||
AC_CHECK_HEADERS([fftw3.h], , [AC_CHECK_HEADERS([fftw.h])])
|
AC_CHECK_HEADERS([fftw3.h], , [AC_CHECK_HEADERS([fftw.h])])
|
||||||
AC_CHECK_HEADERS([pcap.h])
|
AC_CHECK_HEADERS([pcap.h])
|
||||||
AC_CHECK_HEADERS([pthread.h])
|
AC_CHECK_HEADERS([pthread.h])
|
||||||
if test "${build}" == "${host}"
|
if test "${build}" = "${host}"
|
||||||
then
|
then
|
||||||
AC_CHECK_HEADERS([X11/X.h])
|
AC_CHECK_HEADERS([X11/X.h])
|
||||||
fi
|
fi
|
||||||
|
@ -253,7 +253,7 @@ AC_CHECK_HEADERS([FL/Fl_Audio_Meter.H], [], [], [],[[#include <FL/Fl.H>
|
||||||
|
|
||||||
AC_LANG([C])
|
AC_LANG([C])
|
||||||
|
|
||||||
if test "${build}" == "${host}"
|
if test "${build}" = "${host}"
|
||||||
then
|
then
|
||||||
case "${host}" in
|
case "${host}" in
|
||||||
x86_64-*)
|
x86_64-*)
|
||||||
|
|
|
@ -53,7 +53,7 @@ else
|
||||||
cd gsm0610
|
cd gsm0610
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $1x == --no-exe-runx ]
|
if [ $1x = --no-exe-runx ]
|
||||||
then
|
then
|
||||||
# Run the .exe files, which should be here
|
# Run the .exe files, which should be here
|
||||||
./FR_A.EXE
|
./FR_A.EXE
|
||||||
|
@ -77,7 +77,7 @@ rm -rf READ_FRA.TXT
|
||||||
rm -rf ACTION
|
rm -rf ACTION
|
||||||
rm -rf unpacked
|
rm -rf unpacked
|
||||||
|
|
||||||
if [ $1x == --no-exex ]
|
if [ $1x = --no-exex ]
|
||||||
then
|
then
|
||||||
# We need to prepare the .exe files to be run separately
|
# We need to prepare the .exe files to be run separately
|
||||||
rm -rf *.INP
|
rm -rf *.INP
|
||||||
|
|
|
@ -447,7 +447,7 @@ if test "$TARGET_EXEEXT" = ".exe"; then
|
||||||
OS_WIN=0
|
OS_WIN=0
|
||||||
OS_OS2=1
|
OS_OS2=1
|
||||||
TARGET_CFLAGS="$TARGET_CFLAGS -DOS_OS2=1"
|
TARGET_CFLAGS="$TARGET_CFLAGS -DOS_OS2=1"
|
||||||
if test "$ac_compiler_gnu" == "yes" ; then
|
if test "$ac_compiler_gnu" = "yes" ; then
|
||||||
TARGET_CFLAGS="$TARGET_CFLAGS -Zomf -Zexe -Zmap"
|
TARGET_CFLAGS="$TARGET_CFLAGS -Zomf -Zexe -Zmap"
|
||||||
BUILD_CFLAGS="$BUILD_CFLAGS -Zomf -Zexe"
|
BUILD_CFLAGS="$BUILD_CFLAGS -Zomf -Zexe"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue