diff options
| -rw-r--r-- | configure.ac | 12 | ||||
| -rwxr-xr-x | src/KM_util.cpp | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 12 |
3 files changed, 20 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 168470f..c2bb969 100644 --- a/configure.ac +++ b/configure.ac @@ -71,7 +71,7 @@ AZ_PYTHON_DEFAULT AZ_PYTHON_WITH AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) AC_ARG_ENABLE([freedist], - [ --enable-freedist Ensure source distribution is of BSD-licensed code.], + [ --enable-freedist ensure source distribution is of BSD-licensed code], [case "${enableval}" in yes) freedist=true ;; no) freedist=false ;; @@ -79,13 +79,21 @@ AC_ARG_ENABLE([freedist], esac],[freedist=false]) AM_CONDITIONAL([FREEDIST], [test x$freedist = xtrue]) AC_ARG_ENABLE([dev-headers], - [ --enable-dev-headers Install development headers], + [ --enable-dev-headers install development headers], [case "${enableval}" in yes) dev_headers=true ;; no) dev_headers=false ;; *) AC_MSG_ERROR([bad value ${enableval} for --enable-dev-headers]) ;; esac],[dev_headers=false]) AM_CONDITIONAL([DEV_HEADERS], [test x$dev_headers = xtrue]) +AC_ARG_ENABLE([random-case-UUID], + [ --enable-random-case-UUID allow randomly cased UUID headers when the environment variable KM_USE_RANDOM_UUID is set], + [case "${enableval}" in + yes) random_case_UUID=true ;; + no) random_case_UUID=false ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-random-case-UUID]) ;; + esac],[random_case_UUID=false]) + AM_CONDITIONAL([ENABLE_RANDOM_UUID], [test x$random_case_UUID = xtrue]) # Checks for libraries. AC_CHECK_LIB([pthread], [pthread_create]) diff --git a/src/KM_util.cpp b/src/KM_util.cpp index 43b00a4..e426afc 100755 --- a/src/KM_util.cpp +++ b/src/KM_util.cpp @@ -40,8 +40,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <map> #include <string> -#define CONFIG_RANDOM_UUID - const char* Kumu::Version() { diff --git a/src/Makefile.am b/src/Makefile.am index 81089c0..67db495 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,9 +25,17 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Allow for configure's changes to this makefile +AM_CPPFLAGS = +AM_LDFLAGS = + if OPENBSD_HOST -AM_CPPFLAGS = -I/var/local/include -I/usr/local/include -AM_LDFLAGS = -L./.libs -L/var/local/lib -L/usr/local/lib +AM_CPPFLAGS += -I/var/local/include -I/usr/local/include +AM_LDFLAGS += -L./.libs -L/var/local/lib -L/usr/local/lib +endif + +if ENABLE_RANDOM_UUID +AM_CPPFLAGS += -DCONFIG_RANDOM_UUID endif # list of all the header files that should be installed |