You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
|
|
|
|
Index: configure
|
|
|
|
|
--- configure.orig 2011-01-28 06:55:29.000000000 +0100
|
|
|
|
|
+++ configure 2015-01-12 21:47:06.937460715 +0100
|
|
|
|
|
@@ -8573,10 +8573,6 @@
|
|
|
|
|
hardcode_shlibpath_var=no
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
- freebsd1*)
|
|
|
|
|
- ld_shlibs=no
|
|
|
|
|
- ;;
|
|
|
|
|
-
|
|
|
|
|
# FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
|
|
|
|
|
# support. Future versions do this automatically, but an explicit c++rt0.o
|
|
|
|
|
# does not break anything, and helps significantly (at the cost of a little
|
|
|
|
|
@@ -9448,10 +9444,6 @@
|
|
|
|
|
shlibpath_var=LD_LIBRARY_PATH
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
-freebsd1*)
|
|
|
|
|
- dynamic_linker=no
|
|
|
|
|
- ;;
|
|
|
|
|
-
|
|
|
|
|
freebsd* | dragonfly*)
|
|
|
|
|
# DragonFly does not have aout. When/if they implement a new
|
|
|
|
|
# versioning mechanism, adjust this.
|
|
|
|
|
@@ -9459,7 +9451,6 @@
|
|
|
|
|
objformat=`/usr/bin/objformat`
|
|
|
|
|
else
|
|
|
|
|
case $host_os in
|
|
|
|
|
- freebsd[123]*) objformat=aout ;;
|
|
|
|
|
*) objformat=elf ;;
|
|
|
|
|
esac
|
|
|
|
|
fi
|
|
|
|
|
@@ -10696,7 +10687,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ap_httpd="`$APXS -q SBINDIR`/`$APXS -q TARGET`"
|
|
|
|
|
- ap_httpd_version="`$ap_httpd -v | grep 'version' | sed -e 's![^/]*/\([[:digit:].]*\).*$!\1!'`"
|
|
|
|
|
+ ap_httpd_version="`$ap_httpd -v | grep 'version' | sed -e 's!.*/\([0-9.][0-9.]*\).*$!\1!'`"
|
|
|
|
|
|
|
|
|
|
if test "x" != "x"
|
|
|
|
|
then
|
