diff options
| author | msheby <msheby@cinecert.com> | 2009-03-12 18:51:15 +0000 |
|---|---|---|
| committer | msheby <> | 2009-03-12 18:51:15 +0000 |
| commit | 9eaedba3c8ea1c00b849cb4f41288e00cdd49e87 (patch) | |
| tree | 8210993a52568d893ab9169f88658ea6e4c895ca /src | |
| parent | ea3a7122b054fd6238b7ad7a61fcf3f7e52b72d3 (diff) | |
Allow for build-time configuration of randomly cased UUIDs.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/KM_util.cpp | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 12 |
2 files changed, 10 insertions, 4 deletions
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 |