configure.ac (2c2ad1e6) configure.ac (fdf35928)
1dnl * *************************************************************
2dnl *
3dnl * Licensed to the Apache Software Foundation (ASF) under one
4dnl * or more contributor license agreements. See the NOTICE file
5dnl * distributed with this work for additional information
6dnl * regarding copyright ownership. The ASF licenses this file
7dnl * to you under the Apache License, Version 2.0 (the
8dnl * "License"); you may not use this file except in compliance

--- 757 unchanged lines hidden (view full) ---

766[ --with-local-solver if you have solver in a location other than ./solver,
767 please supply the path here.
768
769 Usage: --with-local-solver=<absolute path to solver>
770],,)
771AC_ARG_ENABLE(javascript,
772[ --disable-javascript Disables support for JavaScript macros.
773],,)
1dnl * *************************************************************
2dnl *
3dnl * Licensed to the Apache Software Foundation (ASF) under one
4dnl * or more contributor license agreements. See the NOTICE file
5dnl * distributed with this work for additional information
6dnl * regarding copyright ownership. The ASF licenses this file
7dnl * to you under the Apache License, Version 2.0 (the
8dnl * "License"); you may not use this file except in compliance

--- 757 unchanged lines hidden (view full) ---

766[ --with-local-solver if you have solver in a location other than ./solver,
767 please supply the path here.
768
769 Usage: --with-local-solver=<absolute path to solver>
770],,)
771AC_ARG_ENABLE(javascript,
772[ --disable-javascript Disables support for JavaScript macros.
773],,)
774AC_ARG_WITH(system-apr,
775[ --with-system-apr Use apr library already installed on the system
776],,)
777AC_ARG_WITH(system-apr-util,
778[ --with-system-apr-util Use apr-util library already installed on the system
779],,)
780AC_ARG_WITH(system-serf,
781[ --with-system-serf Use serf library already installed on the system
782],,)
783AC_ARG_WITH(system-coinmp,
784[ --with-system-coinmp Use CoinMP library already installed on the system
785],,)
774AC_ARG_ENABLE(coinmp,
775[ --disable-coinmp Do not use CoinMP as the Calc solver.
776],,)
777AC_ARG_ENABLE(check-only,
778[ --enable-check-only Use this option option if you just want to check your
779 environment. This option stops the generation of an
780 ????env.set
781

--- 3655 unchanged lines hidden (view full) ---

4437else
4438 AC_MSG_RESULT([no])
4439 ENABLE_JAVASCRIPT=NO
4440fi
4441AC_SUBST(ENABLE_JAVASCRIPT)
4442
4443
4444dnl ===================================================================
786AC_ARG_ENABLE(coinmp,
787[ --disable-coinmp Do not use CoinMP as the Calc solver.
788],,)
789AC_ARG_ENABLE(check-only,
790[ --enable-check-only Use this option option if you just want to check your
791 environment. This option stops the generation of an
792 ????env.set
793

--- 3655 unchanged lines hidden (view full) ---

4449else
4450 AC_MSG_RESULT([no])
4451 ENABLE_JAVASCRIPT=NO
4452fi
4453AC_SUBST(ENABLE_JAVASCRIPT)
4454
4455
4456dnl ===================================================================
4457dnl Check for system apr
4458dnl ===================================================================
4459SYSTEM_APR=NO
4460APR_CFLAGS=
4461APR_LIBS=
4462AC_MSG_CHECKING([which libapr to use])
4463if test "x$with_system_apr" = "xyes" -o -n "$with_system_libs"; then
4464 AC_MSG_RESULT([system])
4465 PKG_CHECK_MODULES([APR], [apr-1 >= 1.0])
4466 SYSTEM_APR=YES
4467else
4468 AC_MSG_RESULT([internal])
4469 SYSTEM_APR=NO
4470 BUILD_TYPE="$BUILD_TYPE APR"
4471fi
4472AC_SUBST(SYSTEM_APR)
4473AC_SUBST(APR_CFLAGS)
4474AC_SUBST(APR_LIBS)
4475
4476
4477dnl ===================================================================
4478dnl Check for system apr-util
4479dnl ===================================================================
4480SYSTEM_APRUTIL=NO
4481APRUTIL_CFLAGS=
4482APRUTIL_LIBS=
4483AC_MSG_CHECKING([which libapr-util to use])
4484if test "x$with_system_apr_util" = "xyes" -o -n "$with_system_libs"; then
4485 AC_MSG_RESULT([system])
4486 PKG_CHECK_MODULES([APRUTIL], [apr-util-1 >= 1.0])
4487 SYSTEM_APRUTIL=YES
4488else
4489 AC_MSG_RESULT([internal])
4490 SYSTEMAPR_UTIL=NO
4491 BUILD_TYPE="$BUILD_TYPE APR_UTIL"
4492fi
4493AC_SUBST(SYSTEM_APRUTIL)
4494AC_SUBST(APRUTIL_CFLAGS)
4495AC_SUBST(APRUTIL_LIBS)
4496
4497
4498dnl ===================================================================
4499dnl Check for system serf
4500dnl ===================================================================
4501SYSTEM_SERF=NO
4502SERF_CFLAGS=
4503SERF_LIBS=
4504AC_MSG_CHECKING([which libserf to use])
4505if test "x$with_system_serf" = "xyes" -o -n "$with_system_libs"; then
4506 AC_MSG_RESULT([system])
4507 PKG_CHECK_MODULES([SERF], [serf-1 >= 1.1])
4508 SYSTEM_SERF=YES
4509else
4510 AC_MSG_RESULT([internal])
4511 SYSTEM_SERF=NO
4512 BUILD_TYPE="$BUILD_TYPE SERF"
4513fi
4514AC_SUBST(SYSTEM_SERF)
4515AC_SUBST(SERF_CFLAGS)
4516AC_SUBST(SERF_LIBS)
4517
4518
4519dnl ===================================================================
4445dnl Check for CoinMP
4446dnl ===================================================================
4447ENABLE_COINMP=
4520dnl Check for CoinMP
4521dnl ===================================================================
4522ENABLE_COINMP=
4523SYSTEM_COINMP=NO
4524COINMP_CFLAGS=
4525COINMP_LIBS=
4448AC_MSG_CHECKING([whether to enable support for CoinMP])
4449if test "x$enable_coinmp" = "xyes"; then
4526AC_MSG_CHECKING([whether to enable support for CoinMP])
4527if test "x$enable_coinmp" = "xyes"; then
4450 BUILD_TYPE="$BUILD_TYPE COINMP"
4451 AC_MSG_RESULT([yes])
4452 ENABLE_COINMP=YES
4528 BUILD_TYPE="$BUILD_TYPE COINMP"
4529 AC_MSG_RESULT([yes])
4530 ENABLE_COINMP=YES
4531
4532 dnl Check wether to use system or internal CoinMP
4533 AC_MSG_CHECKING([which coinmp to use])
4534 if test "x$with_system_coinmp" = "xyes" -o -n "$with_system_libs"; then
4535 AC_MSG_RESULT([system])
4536 PKG_CHECK_MODULES([COINMP], [coinmp])
4537 SYSTEM_COINMP=YES
4538 # some systems need this. Like Ubuntu....
4539 AC_CHECK_LIB(m, floor)
4540 AC_CHECK_LIB(dl, dlopen)
4541 else
4542 AC_MSG_RESULT([internal])
4543 SYSTEM_COINMP=NO
4544 BUILD_TYPE="$BUILD_TYPE COINMP"
4545 fi
4453else
4546else
4454 AC_MSG_RESULT([no])
4455 ENABLE_COINMP=NO
4547 AC_MSG_RESULT([no])
4548 ENABLE_COINMP=NO
4456fi
4457AC_SUBST(ENABLE_COINMP)
4549fi
4550AC_SUBST(ENABLE_COINMP)
4551AC_SUBST(SYSTEM_COINMP)
4552AC_SUBST(COINMP_CFLAGS)
4553AC_SUBST(COINMP_LIBS)
4458
4459
4460dnl ===================================================================
4461dnl Check for system curl
4462dnl ===================================================================
4463if test "$_os" = "Darwin" && test "$with_system_curl" != "no"; then
4464 with_system_curl=yes
4465fi

--- 2943 unchanged lines hidden --- 		4554
4555
4556dnl ===================================================================
4557dnl Check for system curl
4558dnl ===================================================================
4559if test "$_os" = "Darwin" && test "$with_system_curl" != "no"; then
4560 with_system_curl=yes
4561fi

--- 2943 unchanged lines hidden ---