Changeset 12430

Timestamp:

Mar 12, 2007, 7:15:35 PM (19 years ago)

Author:

Paul Price

Message:

Configuration fixes to allow configure to run successfully on panstarrs (Solaris machine): Need additional libraries to link cfitsio; md5.h is in a different location (sys/ instead of openssl/). In addition, the user also needs to provide a symlink to /usr/lib/libcrypto.so.0.9.7 as libcrypto.so.0 somewhere in the linking path.

Location:

trunk/psLib

Files:

• configure.ac (modified) (2 diffs)
• src/math/psMD5.c (modified) (1 diff)

trunk/psLib/configure.ac

@@ -134 +134 @@
 CFLAGS=${CFLAGS} ${CFITSIO_CFLAGS}
 LDFLAGS=${LDFLAGS} ${CFITSIO_LDFLAGS}
+
+dnl Solaris needs to suck in these symbols from unusual locations
+AC_SEARCH_LIBS([gethostbyname], [nsl])
+AC_SEARCH_LIBS([socket], [socket])
 
 AC_CHECK_HEADERS([fitsio.h],[],
@@ -431 +435 @@
 
 AC_CHECK_HEADERS([openssl/md5.h],[],
-  [AC_MSG_ERROR([SSL headers not found.  Obtain it at http://www.openssl.org/ or use --with-ssl to specify location.])]
+        [AC_CHECK_HEADERS([sys/md5.h],[],
+                [AC_MSG_ERROR([SSL headers not found.  Obtain it at http://www.openssl.org/ or use --with-ssl to specify location.])]
+        )]
 )
 AC_CHECK_LIB(crypto,MD5,[],

trunk/psLib/src/math/psMD5.c

@@ -5 +5 @@
 #include <stdio.h>
 #include <string.h>
+
+#ifdef HAVE_SYS_MD5_H
+// Seems to be the case for Solaris
+#include <sys/md5.h>
+#else
+// Seems to be the case for most others
 #include <openssl/md5.h>
+#endif // HAVE_SYS_MD5_H
+
 
 #include "psAssert.h"