63 lines
1.2 KiB
Plaintext
63 lines
1.2 KiB
Plaintext
$OpenBSD: patch-configure,v 1.2 2007/05/12 06:47:56 steven Exp $
|
|
--- configure.orig Sat May 18 21:08:25 2002
|
|
+++ configure Sat May 12 08:27:51 2007
|
|
@@ -1,8 +1,5 @@
|
|
-#!/bin/bash
|
|
+#!/bin/sh
|
|
|
|
-# configure adns
|
|
-(cd adns; ./configure)
|
|
-
|
|
#configure larbin itself
|
|
cat /dev/null > config.h
|
|
cat /dev/null > config.make
|
|
@@ -12,38 +9,20 @@ if [ -e /proc/self/status ]; then
|
|
fi
|
|
|
|
# find existing programs
|
|
-function exists () {
|
|
+function exists {
|
|
command -v $1 2> /dev/null > /dev/null;
|
|
}
|
|
|
|
-if exists gmake; then
|
|
- echo "MAKE=gmake" >> config.make
|
|
- export MAKE=gmake
|
|
-else
|
|
- echo "MAKE=make" >> config.make
|
|
- export MAKE=make
|
|
-fi
|
|
-
|
|
-if exists gcc; then
|
|
- echo "CC=gcc" >> config.make
|
|
- export CC=gcc
|
|
-fi
|
|
-
|
|
-if exists g++; then
|
|
- echo "CXX=g++" >> config.make
|
|
-fi
|
|
-
|
|
#find libraries to use
|
|
echo "int main () { return 0; }" > test.c
|
|
|
|
-function testlib () {
|
|
+function testlib {
|
|
if $CC $1 -o test test.c 2> /dev/null > /dev/null; then
|
|
echo "LIBS +=" $1 >> config.make
|
|
fi
|
|
}
|
|
|
|
testlib -pthread
|
|
-testlib -lpthread
|
|
testlib -lresolv
|
|
testlib -lsocket
|
|
testlib -lnsl
|
|
@@ -52,7 +31,6 @@ rm -f test test.c test.o
|
|
|
|
# run make dep
|
|
touch .depend
|
|
-touch adns/.depend
|
|
touch src/.depend
|
|
touch src/fetch/.depend
|
|
touch src/interf/.depend
|