[Lemon-commits] [lemon_svn] klao: r1988 - hugo/trunk/config

[Lemon SVN]

Author: klao
Date: Tue Jun 21 16:57:17 2005
New Revision: 1988

Modified:
   hugo/trunk/config/lx_check_cplex.m4

Log:
Get CPLEX location (include and libdir) from the environment.
(On lemon.cs.elte.hu use "cplex_env" command to set the environment
  appropriately.)


Modified: hugo/trunk/config/lx_check_cplex.m4
==============================================================================
--- hugo/trunk/config/lx_check_cplex.m4	(original)
+++ hugo/trunk/config/lx_check_cplex.m4	Tue Jun 21 16:57:17 2005
@@ -21,12 +21,16 @@
       CPLEX_CFLAGS="-I$with_cplex_includedir"
     elif test x"$with_cplex" != x"yes"; then
       CPLEX_CFLAGS="-I$with_cplex/include"
+    elif test x"$CPLEX_INCLUDEDIR" != x; then
+      CPLEX_CFLAGS="-I$CPLEX_INCLUDEDIR"
     fi
 
     if test x"$with_cplex_libdir" != x"no"; then
       CPLEX_LDFLAGS="-L$with_cplex_libdir"
     elif test x"$with_cplex" != x"yes"; then
       CPLEX_LDFLAGS="-L$with_cplex/lib"
+    elif test x"$CPLEX_LIBDIR" != x; then
+      CPLEX_LDFLAGS="-L$CPLEX_LIBDIR"
     fi
     CPLEX_LIBS="-lcplex -lm -lpthread"