File: 02_remove_apache1.x.diff

package info (click to toggle)
suphp 0.7.1-3
  • links: PTS
  • area: main
  • in suites: wheezy
  • size: 2,008 kB
  • sloc: sh: 9,168; cpp: 2,882; ansic: 1,394; makefile: 59
file content (34 lines) | stat: -rw-r--r-- 1,171 bytes parent folder | download
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
From: Joe Gillotti <joe@u13.net> 
Subject: Disable apache1.x compilation

diff -u --recursive suphp-0.7.1/configure.ac suphp-0.7.1-fixed/configure.ac
--- suphp-0.7.1/configure.ac	2009-03-14 13:58:11.000000000 -0400
+++ suphp-0.7.1-fixed/configure.ac	2012-03-27 00:22:45.282086238 -0400
@@ -241,7 +241,7 @@
 # Conditionally include UserGroup support
 AM_CONDITIONAL([COND_APUSERGROUP], [test \( x"$SETID_MODE" = xparanoid \) -o \( x"$SETID_MODE" = xforce \) ])
 
-AC_CONFIG_FILES([Makefile src/Makefile src/apache/Makefile src/apache2/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile src/apache2/Makefile])
 AC_OUTPUT
 
 if test "$APXS" = "/notfound/"; then
diff -u --recursive suphp-0.7.1/src/Makefile.am suphp-0.7.1-fixed/src/Makefile.am
--- suphp-0.7.1/src/Makefile.am	2008-03-29 09:02:36.000000000 -0400
+++ suphp-0.7.1-fixed/src/Makefile.am	2012-03-27 00:23:10.262087138 -0400
@@ -1,13 +1,10 @@
 AM_CXXFLAGS=-DOPT_CONFIGFILE=\"${sysconfdir}/suphp.conf\"
 
-if COND_AP13
-  MAYBE_AP = apache
-endif
 if COND_AP20
   MAYBE_AP = apache2
 endif
-SUBDIRS = $(MAYBE_AP)
-DIST_SUBDIRS = apache apache2
+SUBDIRS = apache2
+DIST_SUBDIRS = apache2
 
 sbin_PROGRAMS = suphp