@@ -28,9 +28,6 @@ AC_DEFUN([AX_CHECK_PROG],
28
28
]
29
29
)
30
30
31
- AC_ARG_VAR ( [ JAVAC] , [ Place where javac is installed] )
32
- AC_ARG_VAR ( [ JAR] , [ Place where jar is installed] )
33
- AC_ARG_VAR ( [ ANT] , [ Place where ant utility is installed] )
34
31
# TODO: Change the value for qmake for QT5 later
35
32
AC_ARG_VAR ( [ QMAKE] , [ Place where qmake-qt4 is installed] )
36
33
AC_ARG_VAR ( [ MPICC] , [ Path to MPI2 compatible C-compiler] )
@@ -41,9 +38,6 @@ AC_ARG_VAR([MPI_LIBS], [Additional libs for parallel program])
41
38
AC_ARG_VAR ( [ MPI_LDFLAGS] , [ Path to additional libs for parallel program] )
42
39
AC_ARG_VAR ( [ GOALS] , [ List of goals to be built] )
43
40
44
- AX_ARG_ENABLE([ java-gui] , [ " java "] , [ ""] ,
45
- [ Enable Java version of network-viewer program (disabled by default)]
46
- ) # java
47
41
AX_ARG_ENABLE([ qt-gui] , [ " network_viewer_qt_v2 "] , [ ""] ,
48
42
[ Enable Qt version of network-viewer program (disabled by default)]
49
43
) # network_viewer_qt_v2
@@ -57,17 +51,14 @@ AX_ARG_ENABLE([clustering], [" clustering "], [""],
57
51
AC_ARG_ENABLE ( [ all] ,
58
52
[ AS_HELP_STRING ( [ --enable-all] , [ Enable all modules] ) ] ,
59
53
[ AS_CASE ( [ "${enableval}"] ,
60
- [ yes] , [ AC_SUBST ( [ GOALS] , [ "java network_test network_viewer_qt_v2 clustering"] ) ] ,
54
+ [ yes] , [ AC_SUBST ( [ GOALS] , [ "network_test network_viewer_qt_v2 clustering"] ) ] ,
61
55
[ no] , [ ] ,
62
56
[ AC_MSG_ERROR ( [ Bad value ${enableval} for --enable-all] ) ]
63
57
)
64
58
]
65
59
# nothing to do because feature is disabled by default
66
60
) # all
67
61
68
- AS_IF ( [ test "x$JAVAC" = "x"] , [ AC_SUBST ( [ JAVAC] , [ javac] ) ] )
69
- AS_IF ( [ test "x$JAR" = "x"] , [ AC_SUBST ( [ JAR] , [ jar] ) ] )
70
- AS_IF ( [ test "x$ANT" = "x"] , [ AC_SUBST ( [ ANT] , [ ant] ) ] )
71
62
AS_IF ( [ test "x$MPICC" = "x"] , [ AC_SUBST ( [ MPICC] , [ mpicc] ) ] )
72
63
AS_IF ( [ test "x$MPICXX" = "x"] , [ AC_SUBST ( [ MPICXX] , [ mpicxx] ) ] )
73
64
AS_IF ( [ test "x$QMAKE" = "x"] , [ AC_SUBST ( [ QMAKE] , [ qmake-qt4] ) ] )
@@ -83,11 +74,6 @@ AC_PROG_RANLIB
83
74
AX_CHECK_PROG([ MPICC] , [ MPI compiler for C programming language has not been found] )
84
75
AX_CHECK_PROG([ MPICXX] , [ MPI compiler for C++ programming language has not been found] )
85
76
AS_CASE ( [ "$GOALS"] ,
86
- [ *"java"*] , [
87
- AX_CHECK_PROG([ ANT] , [ ant is required but has not been found] )
88
- AX_CHECK_PROG([ JAR] , [ jar is required but has not been found] )
89
- AX_CHECK_PROG([ JAVAC] , [ javac is required but has not been found] )
90
- ] ,
91
77
[ *"qt"*] , [
92
78
AX_CHECK_PROG([ QMAKE] , [ qmake-qt4 is required but has not been found] )
93
79
AC_CHECK_LIB ( [ qwt-qt4] ,[ QwtPlot::axisScaleEngine] )
0 commit comments