Add --enable-static configure option (default = no) to control whether

static libraries are installed (they are always built for the test
programs)

Fix default permissions of scheduler directories.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@4999 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/Makedefs.in b/Makedefs.in
index eb2505a2642a59b7fc70f97b1edae38ab850b695..70899942397b01ad60bb346bd1b9f211397f0bca 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -74,6 +74,12 @@ LIBSLP               =       @LIBSLP@
 LIBTIFF                =       @LIBTIFF@
 LIBZ           =       @LIBZ@
 
+#
+# Install static libraries?
+#
+
+INSTALLSTATIC  =       @INSTALLSTATIC@
+
 #
 # Program options...
 #

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index a5292f8a1935a73ce0b73d6b7ac811775120c5c5..45ed29a06d5cf32b45aecee13e6af0af1f0c3a0c 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -69,8 +69,15 @@ if test "x$CXX" = x; then
        AC_MSG_ERROR([Unable to find required C++ compiler command.])
 fi
 
-dnl Architecture checks...
-AC_C_BIGENDIAN
+dnl Static library option...
+INSTALLSTATIC=""
+AC_ARG_ENABLE(install_static, [  --enable-static         install static libraries, default=no])
+
+if test x$enable_install_static = xyes; then
+       INSTALLSTATIC="installstatic"
+fi
+
+AC_SUBST(INSTALLSTATIC)
 
 dnl Check for libraries...
 AC_SEARCH_LIBS(crypt, crypt)

diff --git a/cups/Makefile b/cups/Makefile
index 6b764ffe6542404cb6f9cab6d44d887d23f7eb6f..6cc85c3175cdc70ad1aa0312b4d6758387e59b93 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -140,7 +140,7 @@ depend:
 # Install object and target files...
 #
 
-install:       all     installhdrs
+install:       all installhdrs @INSTALLSTATIC@
        $(INSTALL_DIR) $(LIBDIR)
        $(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
        if test $(LIBCUPS) = "libcups.so.2" -o $(LIBCUPS) = "libcups.sl.2"; then \
@@ -152,6 +152,9 @@ install:    all     installhdrs
                $(RM) $(LIBDIR)/libcups.dylib; \
                $(LN) $(LIBCUPS) $(LIBDIR)/libcups.dylib; \
        fi
+
+installstatic:
+       $(INSTALL_DIR) -m 755 $(LIBDIR)
        if test $(LIBCUPS) != "libcups.a"; then \
                $(INSTALL_LIB) libcups.a $(LIBDIR); \
                $(RANLIB) $(LIBDIR)/libcups.a; \

diff --git a/filter/Makefile b/filter/Makefile
index f83c758c7ea9e5566baa2cd79e31bd5904b179a6..80330eed3475da3e8c41239ae3b151ac70d8b6ba 100644 (file)
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -71,14 +71,14 @@ depend:
 # Install all targets...
 #
 
-install:       all installhdrs
+install:       all installhdrs @INSTALLSTATIC@
        $(INSTALL_DIR) $(SERVERBIN)/filter
        for file in $(FILTERS); do \
                $(INSTALL_BIN) $$file $(SERVERBIN)/filter; \
        done
        $(RM) $(SERVERBIN)/filter/rastertodymo
        $(LN) rastertolabel $(SERVERBIN)/filter/rastertodymo
-       $(INSTALL_DIR) $(LIBDIR)
+       $(INSTALL_DIR) -m 755 $(LIBDIR)
        $(INSTALL_LIB) $(LIBCUPSIMAGE) $(LIBDIR)
        -if test $(LIBCUPSIMAGE) = "libcupsimage.so.2" -o $(LIBCUPSIMAGE) = "libcupsimage.sl.2"; then \
                $(RM) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
@@ -89,6 +89,9 @@ install:      all installhdrs
                $(RM) $(LIBDIR)/libcupsimage.dylib; \
                $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/libcupsimage.dylib; \
        fi
+
+installstatic:
+       $(INSTALL_DIR) -m 755 $(LIBDIR)
        -if test $(LIBCUPSIMAGE) != "libcupsimage.a"; then \
                $(INSTALL_LIB) libcupsimage.a $(LIBDIR); \
                $(RANLIB) $(LIBDIR)/libcupsimage.a; \

diff --git a/scheduler/Makefile b/scheduler/Makefile
index bb2c97c90677ad4e0ed4a83a0bb59dd3584f47d2..443442fedeeed5c542a3e9248c4491d84b86bdca 100644 (file)
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -103,40 +103,40 @@ depend:
 
 install:       all
        echo Creating $(SBINDIR)...
-       $(INSTALL_DIR) $(SBINDIR)
+       $(INSTALL_DIR) -m 755 $(SBINDIR)
        echo Installing cupsd in $(SBINDIR)...
        $(INSTALL_BIN) cupsd $(SBINDIR)
        echo Creating $(SERVERBIN)...
-       $(INSTALL_DIR) $(SERVERBIN)
+       $(INSTALL_DIR) -m 755 $(SERVERBIN)
        echo Creating $(SERVERBIN)/daemon...
-       $(INSTALL_DIR) $(SERVERBIN)/daemon
+       $(INSTALL_DIR) -m 755 $(SERVERBIN)/daemon
        echo Installing cups-deviced, cups-driverd, cups-lpd, and cups-polld in $(SERVERBIN)/daemon...
        $(INSTALL_BIN) cups-deviced $(SERVERBIN)/daemon
        $(INSTALL_BIN) cups-driverd $(SERVERBIN)/daemon
        $(INSTALL_BIN) cups-lpd $(SERVERBIN)/daemon
        $(INSTALL_BIN) cups-polld $(SERVERBIN)/daemon
        echo Creating $(SERVERBIN)/driver...
-       $(INSTALL_DIR) $(SERVERBIN)/driver
+       $(INSTALL_DIR) -m 755 $(SERVERBIN)/driver
        echo Creating $(SERVERROOT)...
-       $(INSTALL_DIR) $(SERVERROOT)
+       $(INSTALL_DIR) -m 755 $(SERVERROOT)
        echo Creating $(SERVERROOT)/interfaces...
-       $(INSTALL_DIR) -g $(CUPS_GROUP) $(SERVERROOT)/interfaces
+       $(INSTALL_DIR) -m 755 -g $(CUPS_GROUP) $(SERVERROOT)/interfaces
        echo Creating $(SERVERROOT)/ppd...
-       $(INSTALL_DIR) -g $(CUPS_GROUP) $(SERVERROOT)/ppd
+       $(INSTALL_DIR) -m 755 -g $(CUPS_GROUP) $(SERVERROOT)/ppd
        echo Creating $(STATEDIR)...
-       $(INSTALL_DIR) $(STATEDIR)
+       $(INSTALL_DIR) -m 755 $(STATEDIR)
        echo Creating $(STATEDIR)/certs...
-       $(INSTALL_DIR) $(STATEDIR)/certs
+       $(INSTALL_DIR) -m 711 $(STATEDIR)/certs
        echo Creating $(LOGDIR)...
-       $(INSTALL_DIR) $(LOGDIR)
+       $(INSTALL_DIR) -m 755 $(LOGDIR)
        echo Creating $(REQUESTS)...
-       $(INSTALL_DIR) -g $(CUPS_GROUP) $(REQUESTS)
+       $(INSTALL_DIR) -m 710 -g $(CUPS_GROUP) $(REQUESTS)
        echo Creating -g $(CUPS_GROUP) $(REQUESTS)/tmp...
-       $(INSTALL_DIR) $(REQUESTS)/tmp
+       $(INSTALL_DIR) -m 1770 -g $(CUPS_GROUP) $(REQUESTS)/tmp
        echo Creating $(CACHEDIR)...
-       $(INSTALL_DIR) $(CACHEDIR)
-       echo Creating $(CACHEDIR)/ppd...
-       $(INSTALL_DIR) $(CACHEDIR)/ppd
+       $(INSTALL_DIR) -m 775 -g $(CUPS_GROUP) $(CACHEDIR)
+#      echo Creating $(CACHEDIR)/ppd...
+#      $(INSTALL_DIR) -m 755 $(CACHEDIR)/ppd
 
 
 #

diff --git a/systemv/Makefile b/systemv/Makefile
index c2aecfa85be86650e35543b6f9c0c6b31344a59e..8388833c1d4f7eabbd7e425c963fc0dd11a12b44 100644 (file)
--- a/systemv/Makefile
+++ b/systemv/Makefile
@@ -70,10 +70,10 @@ install:    all
        $(INSTALL_DIR) $(BINDIR)
        $(INSTALL_BIN) cancel $(BINDIR)
        $(INSTALL_BIN) cupstestppd $(BINDIR)
-       $(RM) $(SBINDIR)/disable
-       $(LN) accept $(SBINDIR)/disable
-       $(RM) $(SBINDIR)/enable
-       $(LN) accept $(SBINDIR)/enable
+       $(RM) $(SBINDIR)/cupsdisable
+       $(LN) accept $(SBINDIR)/cupsdisable
+       $(RM) $(SBINDIR)/cupsenable
+       $(LN) accept $(SBINDIR)/cupsenable
        $(INSTALL_BIN) lp $(BINDIR)
        $(INSTALL_BIN) lpoptions $(BINDIR)
        $(INSTALL_BIN) lpstat $(BINDIR)