Autoconf now knows how to build rcynic and utils against either our

private OpenSSL or system OpenSSL.  Not (yet) hacked for POW and
pywrap, nor tested (yet) on any other platform.

Mechanism we're using to find our private OpenSSL directory now is
kind of icky, may need to switch to some kind of double indirection
scheme using AC_SUBST_FILE to hide the nasty bits.

svn path=/configure; revision=3580

5 files changed, 46 insertions, 50 deletions

diff --git a/utils/find_roa/Makefile.in b/utils/find_roa/Makefile.in
index 7d22c936..559d1370 100644
--- a/utils/find_roa/Makefile.in
+++ b/utils/find_roa/Makefile.in
@@ -1,26 +1,25 @@
 # $Id$
 
-OPENSSL_DIR = ../../openssl/openssl
-
-CFLAGS = -g -I${OPENSSL_DIR}/include -Wall
-
-# -H -Wl,-t
-
 NAME = find_roa
 
 BIN = ${NAME}
+SRC = ${NAME}.c
 OBJ = ${NAME}.o
-LIB = ${OPENSSL_DIR}/libcrypto.a
+
+CFLAGS = @CFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
 
 all: ${BIN}
 
 clean:
-	rm -rf ${BIN} ${OBJ} hashed-pem-dir
+	rm -f ${BIN} ${OBJ}
+
+${BIN}: ${SRC}
+	${CC} ${CFLAGS} -o $@ ${SRC} ${LDFLAGS} -lcrypto ${LIBS}
 
-${BIN}: ${OBJ} ${LIB} Makefile
-	${CC} -g -o $@ ${OBJ} ${LIB}
 
-TEST_ARGS = ../../rcynic/rcynic-data/authenticated 10.3.0.44 10.2.0.6 10.0.0.0/24
+TEST_ARGS = @top_srcdir@/rcynic/rcynic-data/authenticated 10.3.0.44 10.2.0.6 10.0.0.0/24
 
 test: ${BIN}
 #	./${BIN} ${TEST_ARGS}
diff --git a/utils/hashdir/Makefile.in b/utils/hashdir/Makefile.in
index 7c779d7a..29004c6f 100644
--- a/utils/hashdir/Makefile.in
+++ b/utils/hashdir/Makefile.in
@@ -1,24 +1,24 @@
 # $Id$
 
-OPENSSL_DIR = ../../openssl/openssl
+NAME = hashdir
 
-CFLAGS = -g -I${OPENSSL_DIR}/include
+BIN = ${NAME}
+SRC = ${NAME}.c
+OBJ = ${NAME}.o
 
-# -H -Wl,-t
-
-BIN = hashdir
-OBJ = hashdir.o
-LIB = ${OPENSSL_DIR}/libcrypto.a
+CFLAGS = @CFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
 
 all: ${BIN}
 
 clean::
 	rm -f ${BIN} ${OBJ}
 
-${BIN}: ${OBJ} ${LIB} Makefile
-	${CC} -g -o $@ ${OBJ} ${LIB}
+${BIN}: ${SRC}
+	${CC} ${CFLAGS} -o $@ ${SRC} ${LDFLAGS} -lcrypto ${LIBS}
 
-INPUT  = ../../rcynic/rcynic-data/authenticated
+INPUT  = @top_srcdir@/rcynic/rcynic-data/authenticated
 OUTPUT = hashed-pem-dir
 
 test: ${BIN}
diff --git a/utils/print_manifest/Makefile.in b/utils/print_manifest/Makefile.in
index 1e6cb878..c1d8ca40 100644
--- a/utils/print_manifest/Makefile.in
+++ b/utils/print_manifest/Makefile.in
@@ -1,26 +1,25 @@
 # $Id$
 
-OPENSSL_DIR = ../../openssl/openssl
-
-CFLAGS = -g -I${OPENSSL_DIR}/include -Wall
-
-# -H -Wl,-t
-
 NAME = print_manifest
 
+
 BIN = ${NAME}
+SRC = ${NAME}.c
 OBJ = ${NAME}.o
-LIB = ${OPENSSL_DIR}/libcrypto.a
+
+CFLAGS = @CFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
 
 all: ${BIN}
 
 clean:
 	rm -f ${BIN} ${OBJ}
 
-${BIN}: ${OBJ} ${LIB} Makefile
-	${CC} -g -o $@ ${OBJ} ${LIB}
+${BIN}: ${SRC}
+	${CC} ${CFLAGS} -o $@ ${SRC} ${LDFLAGS} -lcrypto ${LIBS}
 
-MANIFEST_DIR = ../../rpkid/tests/smoketest.dir/publication
+MANIFEST_DIR = @top_srcdir@/rpkid/tests/smoketest.dir/publication
 
 test: all
 	-date -u +'now:            %Y%m%d%H%M%SZ'
diff --git a/utils/print_roa/Makefile.in b/utils/print_roa/Makefile.in
index 2d6dcddc..c4da5730 100644
--- a/utils/print_roa/Makefile.in
+++ b/utils/print_roa/Makefile.in
@@ -1,26 +1,24 @@
 # $Id$
 
-OPENSSL_DIR = ../../openssl/openssl
-
-CFLAGS = -g -I${OPENSSL_DIR}/include -Wall
-
-# -H -Wl,-t
-
 NAME = print_roa
 
 BIN = ${NAME}
+SRC = ${NAME}.c
 OBJ = ${NAME}.o
-LIB = ${OPENSSL_DIR}/libcrypto.a
+
+CFLAGS = @CFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
 
 all: ${BIN}
 
 clean:
 	rm -f ${BIN} ${OBJ}
 
-${BIN}: ${OBJ} ${LIB} Makefile
-	${CC} -g -o $@ ${OBJ} ${LIB}
+${BIN}: ${SRC}
+	${CC} ${CFLAGS} -o $@ ${SRC} ${LDFLAGS} -lcrypto ${LIBS}
 
-ROA_DIR = ../../rpkid/tests/smoketest.dir/publication
+ROA_DIR = @top_srcdir@/rpkid/tests/smoketest.dir/publication
 
 test: all
 	-date -u +'now:            %Y%m%d%H%M%SZ'
diff --git a/utils/uri/Makefile.in b/utils/uri/Makefile.in
index 229dc702..88f12de7 100644
--- a/utils/uri/Makefile.in
+++ b/utils/uri/Makefile.in
@@ -1,22 +1,22 @@
 # $Id$
 
-OPENSSL_DIR = ../../openssl/openssl
+NAME = uri
 
-CFLAGS = -g -I${OPENSSL_DIR}/include
+BIN = ${NAME}
+SRC = ${NAME}.c
+OBJ = ${NAME}.o
 
-# -H -Wl,-t
-
-BIN = uri
-OBJ = uri.o
-LIB = ${OPENSSL_DIR}/libcrypto.a
+CFLAGS = @CFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
 
 all: ${BIN}
 
 clean:
 	rm -f ${BIN} ${OBJ}
 
-${BIN}: ${OBJ} ${LIB} Makefile
-	${CC} -g -o $@ ${OBJ} ${LIB}
+${BIN}: ${SRC}
+	${CC} ${CFLAGS} -o $@ ${SRC} ${LDFLAGS} -lcrypto ${LIBS}
 
 test:
 	@true