Fix listing a named queue by a non-admin user. Bug 2398

[exim.git] / src / OS / Makefile-FreeBSD

diff --git a/src/OS/Makefile-FreeBSD b/src/OS/Makefile-FreeBSD
index 3a2697bbab2e1009c2cd60b73fa99c6f523eda29..7c6c0648780e189f0ae71a07eae4e0ee2021212c 100644 (file)
--- a/src/OS/Makefile-FreeBSD
+++ b/src/OS/Makefile-FreeBSD
@@ -1,21 +1,21 @@
-# $Cambridge: exim/src/OS/Makefile-FreeBSD,v 1.6 2009/11/19 18:58:44 nm4 Exp $
-

 # Exim: OS-specific make file for FreeBSD
 # There's no setting of CFLAGS here, to allow the system default
 # for "make" to be the default.
 
 # Exim: OS-specific make file for FreeBSD
 # There's no setting of CFLAGS here, to allow the system default
 # for "make" to be the default.
 

-PORTOBJFORMAT!= test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
-

 CHOWN_COMMAND=/usr/sbin/chown
 STRIP_COMMAND=/usr/bin/strip
 CHMOD_COMMAND=/bin/chmod
 
 CHOWN_COMMAND=/usr/sbin/chown
 STRIP_COMMAND=/usr/bin/strip
 CHMOD_COMMAND=/bin/chmod
 

+# FreeBSD Ports no longer insert compatibility symlinks into /usr/bin for
+# scripting languages which traditionally have had them.
+PERL_COMMAND=/usr/local/bin/perl
+

 HAVE_SA_LEN=YES
 
 # crypt() is in a separate library
 LIBS=-lcrypt -lm -lutil
 
 HAVE_SA_LEN=YES
 
 # crypt() is in a separate library
 LIBS=-lcrypt -lm -lutil
 

-# Dynamicly loaded modules need to be built with -fPIC
+# Dynamically loaded modules need to be built with -fPIC

 CFLAGS_DYNAMIC=-shared -rdynamic -fPIC
 
 # FreeBSD always ships with Berkeley DB
 CFLAGS_DYNAMIC=-shared -rdynamic -fPIC
 
 # FreeBSD always ships with Berkeley DB


@@ -30,11 +30,19 @@ X11=$(LOCALBASE)
 X11=/usr/local
 .endif
 
 X11=/usr/local
 .endif
 

+# nb: FreeBSD is entirely elf; objformat was removed prior to FreeBSD 7
+# http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.bin/objformat/Attic/objformat.c
+# deleted Jan 2007.
+#
+# So if this fails, you're on an ancient unsupported FreeBSD release *and*
+# running GUI software, which seems both unusual and unwise.
+#
+# http://www.freebsd.org/doc/handbook/binary-formats.html suggests that the
+# switch to default to ELF came with FreeBSD 3.  elf(5) claims ELF support
+# introduced in FreeBSD 2.2.6.
+#

 XINCLUDE=-I$(X11)/include
 XINCLUDE=-I$(X11)/include

-XLFLAGS=-L$(X11)/lib
-.if ${PORTOBJFORMAT} == "elf"
-XLFLAGS+=-Wl,-rpath,${X11}/lib
-.endif
+XLFLAGS=-L$(X11)/lib -Wl,-rpath,${X11}/lib

 X11_LD_LIB=$(X11)/lib
 
 EXIWHAT_PS_ARG=-ax
 X11_LD_LIB=$(X11)/lib
 
 EXIWHAT_PS_ARG=-ax