summaryrefslogtreecommitdiff
path: root/security/sudo/files/patch-aa
blob: bd6cf0129bedd77cd94748483fd40fcababd8083 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
--- configure.orig	Sun Sep 20 04:25:10 1998
+++ configure	Fri Oct 23 00:17:09 1998
@@ -48,6 +48,8 @@
 ac_help="$ac_help
   --with-csops            add CSOps standard options"
 ac_help="$ac_help
+  --with-fbsdops          add FreeBSD standard options"
+ac_help="$ac_help
   --enable-log-host       Log the hostname in the log file
   --disable-log-host      Do not log hostname in the log file (default)"
 ac_help="$ac_help
@@ -579,8 +581,8 @@
 
 test "$mandir" = '${prefix}/man' && mandir='$(prefix)/man'
 test "$bindir" = '${exec_prefix}/bin' && bindir='$(exec_prefix)/bin'
-test "$sbindir" = '${exec_prefix}/sbin' && sbindir='$(exec_prefix)/etc'
-test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc'
+test "$sbindir" = '${exec_prefix}/sbin' || sbindir='$(exec_prefix)/etc'
+test "$sysconfdir" = '${prefix}/etc' || sysconfdir='/etc'
 
 
 # Check whether --with-CC or --without-CC was given.
@@ -940,7 +942,20 @@
 
 fi
 
-
+# Check whether --with-fbsdops or --without-fbsdops was given.
+if test "${with_fbsdops+set}" = set; then
+  withval="$with_fbsdops"
+  case $with_fbsdops in
+    yes)       OPTIONS="${OPTIONS} -DIGNORE_DOT_PATH -DENV_EDITOR -DUSE_TTY_TICKETS"
+               sbindir='$(exec_prefix)/sbin'
+	       echo 'fbsdops--adding options: IGNORE_DOT_PATH ENV_EDITOR USE_TTY_TICKETS'
+	       ;;
+    no)        ;;
+    *)         echo "Ignoring unknown argument to --with-csops: $with_csops"
+               ;;
+  esac
+fi
+    
 # Extract the first word of "egrep", so it can be a program name with args.
 set dummy egrep; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -5008,7 +5023,7 @@
 fi
 
 if test "$with_skey" = "yes"; then
-    SUDO_LIBS="${SUDO_LIBS} -lskey"
+    SUDO_LIBS="${SUDO_LIBS} -lskey -lmd"
     if test -f /usr/include/skey.h -a -f /usr/lib/libskey.a; then
 	:
     elif test -f /usr/local/include/skey.h; then