Allow for build-time configuration of randomly cased UUIDs.

diff --git a/configure.ac b/configure.ac
index 168470fe0f62b54b69e1dde939cf0625422d0ca0..c2bb969cfe50e926fd7d4cd26bf6a659966cc528 100644 (file)
--- 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 43b00a4211ccd0cfe3c9f81425719eb8a087ade8..e426afc421c265cb53a4cb520109712fb6166e8b 100755 (executable)
--- 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 81089c0756da3eb7c218d5f5a2ff4a595dbfe32f..67db495c8bb451153c81834b6f2a7eef1181796e 100644 (file)
--- 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