mirror of https://github.com/saitohirga/WSJT-X.git
- add --enable-g95 and --enable-gfortran hooks
- add start of --enable-jack support git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@161 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Diane Bruce
parent
e355356fd9
commit
0c9559732d
11
Makefile.in
11
Makefile.in
|
|
@ -18,15 +18,14 @@ FFLAGS += -Wall -fbounds-check -fno-second-underscore -ffixed-line-length-none -
|
|||
${CC} ${CPPFLAGS} ${CFLAGS} -c -o ${<:.c=.o} $<
|
||||
|
||||
.f.o:
|
||||
${G95} ${CPPFLAGS} ${FFLAGS} -c -o ${<:.f=.o} $<
|
||||
${FC} ${CPPFLAGS} ${FFLAGS} -c -o ${<:.f=.o} $<
|
||||
|
||||
.F90.o:
|
||||
${G95} ${CPPFLAGS} ${FFLAGS} -c -o ${<:.F90=.o} $<
|
||||
${FC} ${CPPFLAGS} ${FFLAGS} -c -o ${<:.F90=.o} $<
|
||||
|
||||
OS=@OS@
|
||||
G95=@G95@
|
||||
COMPILER=@G95_LIB_PATH@
|
||||
FC=@G95@
|
||||
FC=@FC@
|
||||
COMPILER += @FC_LIB_PATH@
|
||||
|
||||
LDFLAGS += -L${COMPILER}
|
||||
LDFLAGS += -lg2c
|
||||
|
|
@ -104,7 +103,7 @@ wsjt6: Audio.so #wsjt.spec
|
|||
Audio.so: $(OBJS2C) $(OBJS3C) $(OBJS2F77) $(SRCS2F90) $(AUDIOSRCS)
|
||||
${F2PY} -c --quiet --opt="-O ${CFLAGS} \
|
||||
-fno-second-underscore" $(OBJS2C) $(OBJS2F77) -m Audio \
|
||||
--f77exec=${G95} --f90exec=${G95} ${CPPFLAGS} ${LDFLAGS} \
|
||||
--f77exec=${FC} --f90exec=${FC} ${CPPFLAGS} ${LDFLAGS} \
|
||||
only: $(F2PYONLY) \
|
||||
: $(SRCS2F90) \
|
||||
${SRCS3C} ${AUDIOSRCS}
|
||||
|
|
|
|||
82
configure.ac
82
configure.ac
|
|
@ -81,14 +81,15 @@ AC_PATH_PROG(LD, ld)
|
|||
AC_PATH_PROG(TEST, [test], [test])
|
||||
AC_PATH_PROG(PYTHON, python)
|
||||
AC_PATH_PROG(F2PY, f2py)
|
||||
AC_PATH_PROG(G95, gfortran)
|
||||
|
||||
AC_PATH_PROG(G95, g95)
|
||||
AC_MSG_CHECKING([g95 lib path])
|
||||
G95_LIB_PATH=`${G95} -print-file-name=`
|
||||
AC_MSG_RESULT(${G95_LIB_PATH})
|
||||
AC_DEFINE_UNQUOTED(G95_LIB_PATH, "${G95_LIB_PATH}", [Path to G95 libs.])
|
||||
AC_SUBST(G95_LIB_PATH, "${G95_LIB_PATH}")
|
||||
|
||||
AC_PATH_PROG(GFORTRAN, gfortran)
|
||||
AC_PATH_PROG(GFORTRAN, gfortran41)
|
||||
AC_MSG_CHECKING([gfortran lib path])
|
||||
GFORTRAN_LIB_PATH=`${GFORTRAN} -print-file-name=`
|
||||
AC_MSG_RESULT(${GFORTRAN_LIB_PATH})
|
||||
AC_MSG_CHECKING([OS])
|
||||
OS=`uname`
|
||||
AC_SUBST(OS, "${OS}")
|
||||
|
|
@ -221,6 +222,16 @@ AC_ARG_ENABLE(portaudio,
|
|||
AC_HELP_STRING([--enable-portaudio],[Force PORTAUDIO SOUND usage.]),
|
||||
[portaudio=$enableval], [portaudio=no])
|
||||
|
||||
dnl jack soundsupport
|
||||
dnl =================
|
||||
|
||||
AC_ARG_ENABLE(jack,
|
||||
AC_HELP_STRING([--enable-jack],[Force JACK usage.]),
|
||||
[jack=$enableval] , [jack=no])
|
||||
|
||||
dnl serial or parallel support (temporary until python changes)
|
||||
dnl ===========================================================
|
||||
|
||||
AC_ARG_ENABLE(parallel,
|
||||
AC_HELP_STRING([--enable-parallel],[Force PARALLEL port usage for ptt.]),
|
||||
[parallel=$enableval], [parallel=no])
|
||||
|
|
@ -229,9 +240,52 @@ AC_ARG_ENABLE(serial,
|
|||
AC_HELP_STRING([--enable-serial],[Force SERIAL port usage for ptt.]),
|
||||
[serial=$enableval], [serial=no])
|
||||
|
||||
dnl pick gfortran or g95
|
||||
dnl ====================
|
||||
|
||||
AC_ARG_ENABLE(g95,
|
||||
AC_HELP_STRING([--enable-g95],[Use G95 compiler if available.]),
|
||||
[g95=$enableval], [g95=no])
|
||||
|
||||
AC_ARG_ENABLE(gfortran,
|
||||
AC_HELP_STRING([--enable-gfortran],[Use gfortran compiler if available.]),
|
||||
[gfortran=$enableval], [gfortran=no])
|
||||
|
||||
dnl now set conf.h,, CPPFLAGS and CFLAGS flags as needed
|
||||
dnl ====================================================
|
||||
|
||||
if test "$g95" = yes; then
|
||||
FC_LIB_PATH=${G95_LIB_PATH}
|
||||
FC=${G95}
|
||||
gfortran=no
|
||||
elif test "$gfortran" = yes; then
|
||||
FC_LIB_PATH=${GFORTRAN_LIB_PATH}
|
||||
FC=${GFORTRAN}
|
||||
g95=no
|
||||
fi
|
||||
|
||||
if test -z $FC ; then
|
||||
if test ! -z $GFORTRAN ; then
|
||||
FC_LIB_PATH=${GFORTRAN_LIB_PATH}
|
||||
FC=${GFORTRAN}
|
||||
gfortran=yes
|
||||
elif test ! -z $G95 ; then
|
||||
FC_LIB_PATH=${G95_LIB_PATH}
|
||||
FC=${G95}
|
||||
g95=yes
|
||||
fi
|
||||
fi
|
||||
|
||||
if test -z $FC ; then
|
||||
AC_MSG_ERROR([You need g95 or gfortran])
|
||||
fi
|
||||
|
||||
|
||||
AC_DEFINE_UNQUOTED(FC_LIB_PATH, "${FC_LIB_PATH}", [Path to fortran libs.])
|
||||
AC_SUBST(FC_LIB_PATH, "${FC_LIB_PATH}")
|
||||
AC_DEFINE_UNQUOTED(FC, "${FC}", [Fortran compiler.])
|
||||
AC_SUBST(FC, "${FC}")
|
||||
|
||||
dnl set defaults
|
||||
dnl ============
|
||||
|
||||
|
|
@ -272,6 +326,12 @@ if test "$portaudio" = yes; then
|
|||
LDFLAGS="${LDFLAGS} -lportaudio -lsamplerate"
|
||||
fi
|
||||
|
||||
if test "$jack" = yes; then
|
||||
AC_DEFINE(USE_JACK, 1, [Define if you want JACK used.])
|
||||
AC_SUBST(AUDIO, "a2d.f90 jtaudio.c start_jack.c")
|
||||
LDFLAGS="${LDFLAGS} -ljack -lsamplerate"
|
||||
fi
|
||||
|
||||
dnl set conf flags
|
||||
|
||||
if test $HAS_ASOUNDLIB_H -eq 1; then
|
||||
|
|
@ -331,6 +391,14 @@ dnl do summary
|
|||
echo
|
||||
echo
|
||||
|
||||
if test $g95 == "yes"; then
|
||||
echo "Using g95 as fortran compiler.";
|
||||
fi
|
||||
|
||||
if test $gfortran == "yes"; then
|
||||
echo "Using gfortran as fortran compiler.";
|
||||
fi
|
||||
|
||||
if test $portaudio == "yes"; then
|
||||
echo "Using portaudio.";
|
||||
fi
|
||||
|
|
@ -343,6 +411,10 @@ if test $oss == "yes"; then
|
|||
echo "Using oss.";
|
||||
fi
|
||||
|
||||
if test $jack == "yes"; then
|
||||
echo "Using jack.";
|
||||
fi
|
||||
|
||||
if test $serial == "yes"; then
|
||||
echo "Using serial port for ptt.";
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in New Issue