Changeset - r187:84c2a2e5cfee
« 186:9159de
188:70694e »
gravatar
ladanyi@tmit.bme.hu
ladanyi@tmit.bme.hu
Fix bug caused by m4 consuming pairs of square brackets (#108).
0 3 0
default
3 files changed with 3 insertions and 3 deletions:
m4/lx_check_cplex.m4
1
1
m4/lx_check_glpk.m4
1
1
m4/lx_check_soplex.m4
1
1
↑ Collapse diff ↑
m4/lx_check_cplex.m4
Ignore white space 6 line context
... ... 
@@ -37,25 +37,25 @@
37 37 
    lx_save_cxxflags="$CXXFLAGS"
38 38 
    lx_save_ldflags="$LDFLAGS"
39 39 
    lx_save_libs="$LIBS"
40 40 
    CXXFLAGS="$CPLEX_CFLAGS"
41 41 
    LDFLAGS="$CPLEX_LDFLAGS"
42 42 
    LIBS="$CPLEX_LIBS"
43 43 

			




	44
	44
	
		
    lx_cplex_test_prog='


			




	45
	45
	
		
      extern "C" {


			




	46
	46
	
		
      #include <ilcplex/cplex.h>


			




	47
	47
	
		
      }


			




	48
	48
	
		

			




	49
	
	
		
      int main(int argc, char* argv[])


			




	
	49
	
		
      int main(int argc, char** argv)


			




	50
	50
	
		
      {


			




	51
	51
	
		
        CPXENVptr env = NULL;


			




	52
	52
	
		
        return 0;


			




	53
	53
	
		
      }'


			




	54
	54
	
		

			




	55
	55
	
		
    AC_LANG_PUSH(C++)


			




	56
	56
	
		
    AC_LINK_IFELSE([$lx_cplex_test_prog], [lx_cplex_found=yes], [lx_cplex_found=no])


			




	57
	57
	
		
    AC_LANG_POP(C++)


			




	58
	58
	
		

			




	59
	59
	
		
    CXXFLAGS="$lx_save_cxxflags"


			




	60
	60
	
		
    LDFLAGS="$lx_save_ldflags"


			




	61
	61
	
		
    LIBS="$lx_save_libs"

			




        

    

    

    

        

            

                

                    m4/lx_check_glpk.m4
                

                

                  
                  
                  
                  Ignore white space
                  6 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -33,25 +33,25 @@


			




	33
	33
	
		
    lx_save_cxxflags="$CXXFLAGS"


			




	34
	34
	
		
    lx_save_ldflags="$LDFLAGS"


			




	35
	35
	
		
    lx_save_libs="$LIBS"


			




	36
	36
	
		
    CXXFLAGS="$GLPK_CFLAGS"


			




	37
	37
	
		
    LDFLAGS="$GLPK_LDFLAGS"


			




	38
	38
	
		
    LIBS="$GLPK_LIBS"


			




	39
	39
	
		

			




	40
	40
	
		
    lx_glpk_test_prog='


			




	41
	41
	
		
      extern "C" {


			




	42
	42
	
		
      #include <glpk.h>


			




	43
	43
	
		
      }


			




	44
	44
	
		

			




	45
	
	
		
      int main(int argc, char* argv[])


			




	
	45
	
		
      int main(int argc, char** argv)


			




	46
	46
	
		
      {


			




	47
	47
	
		
        LPX *lp;


			




	48
	48
	
		
        lp = lpx_create_prob();


			




	49
	49
	
		
        lpx_delete_prob(lp);


			




	50
	50
	
		
        return 0;


			




	51
	51
	
		
      }'


			




	52
	52
	
		

			




	53
	53
	
		
    AC_LANG_PUSH(C++)


			




	54
	54
	
		
    AC_LINK_IFELSE([$lx_glpk_test_prog], [lx_glpk_found=yes], [lx_glpk_found=no])


			




	55
	55
	
		
    AC_LANG_POP(C++)


			




	56
	56
	
		

			




	57
	57
	
		
    CXXFLAGS="$lx_save_cxxflags"

			




        

    

    

    

        

            

                

                    m4/lx_check_soplex.m4
                

                

                  
                  
                  
                  Ignore white space
                  24 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -31,25 +31,25 @@


			




	31
	31
	
		
    SOPLEX_LIBS="-lsoplex -lz"


			




	32
	32
	
		

			




	33
	33
	
		
    lx_save_cxxflags="$CXXFLAGS"


			




	34
	34
	
		
    lx_save_ldflags="$LDFLAGS"


			




	35
	35
	
		
    lx_save_libs="$LIBS"


			




	36
	36
	
		
    CXXFLAGS="$SOPLEX_CXXFLAGS"


			




	37
	37
	
		
    LDFLAGS="$SOPLEX_LDFLAGS"


			




	38
	38
	
		
    LIBS="$SOPLEX_LIBS"


			




	39
	39
	
		

			




	40
	40
	
		
    lx_soplex_test_prog='


			




	41
	41
	
		
      #include <soplex/soplex.h>


			




	42
	42
	
		

			




	43
	
	
		
      int main(int argc, char* argv[])


			




	
	43
	
		
      int main(int argc, char** argv)


			




	44
	44
	
		
      {


			




	45
	45
	
		
        soplex::SoPlex soplex;


			




	46
	46
	
		
        return 0;


			




	47
	47
	
		
      }'


			




	48
	48
	
		

			




	49
	49
	
		
    AC_LANG_PUSH(C++)


			




	50
	50
	
		
    AC_LINK_IFELSE([$lx_soplex_test_prog], [lx_soplex_found=yes], [lx_soplex_found=no])


			




	51
	51
	
		
    AC_LANG_POP(C++)


			




	52
	52
	
		

			




	53
	53
	
		
    CXXFLAGS="$lx_save_cxxflags"


			




	54
	54
	
		
    LDFLAGS="$lx_save_ldflags"


			




	55
	55
	
		
    LIBS="$lx_save_libs"


			




        

    






    
    



    


    

     
    
0 comments (0 inline)