From 74ed3f1e3e965426168bafa8f46e044261ce8aba Mon Sep 17 00:00:00 2001
From: Charlie Sharpsteen <source@sharpsteen.net>
Date: Mon, 27 Sep 2010 14:36:43 -0700
Subject: [PATCH 1/4] Disable libgcrypt and libnsl in configure.ac
OS X does not have libcrypt or libnsl. This commit allows Rasdaman to compile
on OS X but most likely breaks Linux compiles.
Someone who actually knows how to use the autotools should revise these changes
so that the libraries are only disabled on OS X.
---
configure.ac | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 043e293..1c79170 100644
a
|
b
|
AC_CHECK_PROGS(YACC, bison, [${am_missing_run} bison])
|
31 | 31 | |
32 | 32 | # Checks for libraries. |
33 | 33 | # FIXME: Replace `main' with a function in `-lcrypt': |
34 | | AC_CHECK_LIB([crypt], [main], , [AC_MSG_FAILURE([libcrypt.a not found! Please install.])]) |
| 34 | #AC_CHECK_LIB([crypt], [main], , [AC_MSG_FAILURE([libcrypt.a not found! Please install.])]) |
35 | 35 | AC_CHECK_LIB([crypto], [EVP_DigestFinal], , [AC_MSG_FAILURE([libcrypto.a not found! Please install.])]) |
36 | 36 | # FIXME: Replace `main' with a function in `-ldf': |
37 | 37 | #AC_CHECK_LIB([df], [main], , [AC_MSG_FAILURE([libdf.a not found! Please install.])]) |
… |
… |
AC_DEFINE([RASARCHITECTURE], ["X86"])
|
333 | 333 | AC_DEFINE([RASSCHEMAVERSION], [5]) |
334 | 334 | AC_DEFINE([NOPRE]) |
335 | 335 | # if not on DEC Alpha |
336 | | BASEDBLDFLAGS+=" -lnsl" |
337 | | STATICBASEDBLDFLAGS+=" -lnsl" |
| 336 | #BASEDBLDFLAGS+=" -lnsl" |
| 337 | #STATICBASEDBLDFLAGS+=" -lnsl" |
338 | 338 | # endif |
339 | 339 | AC_DEFINE([NO_in_addr_t]) |
340 | 340 | BASEDBCXXFLAGS+=" $DBIF_INC " |