equal
deleted
inserted
replaced
19 |
19 |
20 if test x"$with_cplex_includedir" != x"no"; then |
20 if test x"$with_cplex_includedir" != x"no"; then |
21 CPLEX_CFLAGS="-I$with_cplex_includedir" |
21 CPLEX_CFLAGS="-I$with_cplex_includedir" |
22 elif test x"$with_cplex" != x"yes"; then |
22 elif test x"$with_cplex" != x"yes"; then |
23 CPLEX_CFLAGS="-I$with_cplex/include" |
23 CPLEX_CFLAGS="-I$with_cplex/include" |
|
24 elif test x"$CPLEX_INCLUDEDIR" != x; then |
|
25 CPLEX_CFLAGS="-I$CPLEX_INCLUDEDIR" |
24 fi |
26 fi |
25 |
27 |
26 if test x"$with_cplex_libdir" != x"no"; then |
28 if test x"$with_cplex_libdir" != x"no"; then |
27 CPLEX_LDFLAGS="-L$with_cplex_libdir" |
29 CPLEX_LDFLAGS="-L$with_cplex_libdir" |
28 elif test x"$with_cplex" != x"yes"; then |
30 elif test x"$with_cplex" != x"yes"; then |
29 CPLEX_LDFLAGS="-L$with_cplex/lib" |
31 CPLEX_LDFLAGS="-L$with_cplex/lib" |
|
32 elif test x"$CPLEX_LIBDIR" != x; then |
|
33 CPLEX_LDFLAGS="-L$CPLEX_LIBDIR" |
30 fi |
34 fi |
31 CPLEX_LIBS="-lcplex -lm -lpthread" |
35 CPLEX_LIBS="-lcplex -lm -lpthread" |
32 |
36 |
33 lx_save_cxxflags="$CXXFLAGS" |
37 lx_save_cxxflags="$CXXFLAGS" |
34 lx_save_ldflags="$LDFLAGS" |
38 lx_save_ldflags="$LDFLAGS" |