X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2FMakefile.in;h=68a676fb34c75c63af72ca1474b9c419a5fa4824;hb=278c59e14c53fd412b734e699bd4f314f766f804;hp=d9b512295c178766710b84e45e79fa0d0b5ef618;hpb=a719ec12b8b2563112366a8ac3196816fd64d2c7;p=xscreensaver

diff --git a/driver/Makefile.in b/driver/Makefile.in
index d9b51229..68a676fb 100644
--- a/driver/Makefile.in
+++ b/driver/Makefile.in
@@ -94,6 +94,13 @@ PASSWD_LIBS	= @PASSWD_LIBS@
 LOCK_SRCS	= @LOCK_SRCS@
 LOCK_OBJS	= @LOCK_OBJS@
 
+XMU_SRCS	= @XMU_SRCS@
+XMU_OBJS	= @XMU_OBJS@
+
+GL_SRCS		= @SAVER_GL_SRCS@
+GL_OBJS		= @SAVER_GL_OBJS@
+GL_LIBS		= @SAVER_GL_LIBS@
+
 DEMO_UTIL_SRCS	= $(UTILS_SRC)/resources.c $(UTILS_SRC)/usleep.c \
 		  $(UTILS_SRC)/visual.c
 DEMO_UTIL_OBJS	= $(UTILS_BIN)/resources.o $(UTILS_BIN)/usleep.o \
@@ -114,9 +121,9 @@ SAVER_OBJS_1	= xscreensaver.o windows.o timers.o subprocs.o \
 		  xset.o splash.o setuid.o stderr.o
 
 SAVER_SRCS	= $(SAVER_SRCS_1) prefs.c $(LOCK_SRCS) \
-		  $(SAVER_UTIL_SRCS) @XMU_SRCS@
+		  $(SAVER_UTIL_SRCS) $(GL_SRCS) $(XMU_SRCS)
 SAVER_OBJS	= $(SAVER_OBJS_1) prefs.o $(LOCK_OBJS) \
-		  $(SAVER_UTIL_OBJS) @XMU_OBJS@
+		  $(SAVER_UTIL_OBJS) $(GL_OBJS) $(XMU_OBJS)
 
 CMD_SRCS	= remote.c xscreensaver-command.c
 CMD_OBJS	= remote.o xscreensaver-command.o
@@ -129,7 +136,7 @@ DEMO_SRCS	= $(DEMO_SRCS_1) remote.c \
 DEMO_OBJS	= $(DEMO_OBJS_1) remote.o \
 		  $(TOOLKIT_OBJS) $(DEMO_UTIL_OBJS)
 
-SAVER_LIBS	= $(LIBS) $(X_LIBS) @SAVER_LIBS@ \
+SAVER_LIBS	= $(LIBS) $(X_LIBS) @SAVER_LIBS@ $(GL_LIBS) \
 		  $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) \
 		  $(PASSWD_LIBS)
 
@@ -176,6 +183,7 @@ install-program: $(EXES)
 	   else								\
 	    e=echo ;							\
  $$e ""									     ;\
+ $$e "  ####################################################################";\
  $$e "  Warning: xscreensaver has been compiled with support for shadow"     ;\
  $$e "           passwords.  If your system actually uses shadow passwords," ;\
  $$e "           then xscreensaver must be installed as a setuid root"	     ;\
@@ -184,6 +192,7 @@ install-program: $(EXES)
  $$e ""									     ;\
  $$e "           For now, xscreensaver will be installed non-setuid, which"  ;\
  $$e "           means that locking might not work.  (Try it and see.)"	     ;\
+ $$e "  ####################################################################";\
  $$e ""									     ;\
 	   fi ; 							\
 	fi ;								\
@@ -194,7 +203,32 @@ install-program: $(EXES)
 
 install-ad: XScreenSaver.ad
 	@if [ ! -d $(AD_DIR) ]; then $(INSTALL_DIRS) $(AD_DIR) ; fi
-	$(INSTALL_DATA) XScreenSaver.ad $(AD_DIR)/XScreenSaver
+	@-echo $(INSTALL_DATA) XScreenSaver.ad $(AD_DIR)/XScreenSaver ;	      \
+	if $(INSTALL_DATA) XScreenSaver.ad $(AD_DIR)/XScreenSaver ; then      \
+	  true ;							      \
+	else								      \
+	  e=echo ;							      \
+	  if [ -f $(AD_DIR)/XScreenSaver ]; then			      \
+ $$e ""									     ;\
+ $$e "  ####################################################################";\
+ $$e "  Warning: unable to install $(AD_DIR)/XScreenSaver"		     ;\
+ $$e "           That file exists, and is unwritable.  It is probably from"  ;\
+ $$e "           an older version of xscreensaver, and could cause things"   ;\
+ $$e "           to malfunction.  Please delete it!"			     ;\
+ $$e "  ####################################################################";\
+ $$e ""									     ;\
+	    exit 1 ;							      \
+	  else								      \
+ $$e ""									     ;\
+ $$e "  ####################################################################";\
+ $$e "  Warning: unable to install $(AD_DIR)/XScreenSaver"		     ;\
+ $$e "           The directory is unwritable.  This is probably ok;"	     ;\
+ $$e "           xscreensaver should work without that file."		     ;\
+ $$e "  ####################################################################";\
+ $$e ""									     ;\
+	    exit 0 ;							      \
+	  fi								      \
+	fi
 
 install-man: $(MEN)
 	@men="$(MEN)" ;							\
@@ -235,11 +269,14 @@ install-pam:
 	  if [ ! -f $$dir/$$dest ]; then				\
 	    e=echo ;							\
  $$e ""									     ;\
+ $$e "  ####################################################################";\
  $$e "  Warning: xscreensaver has been compiled with support for Pluggable"  ;\
  $$e "           Authentication Modules (PAM).  However, we were unable to"  ;\
- $$e "           install the file $$dir/$$dest.  PAM is unlikely to work"    ;\
- $$e "           without this file (and old-style password authentication"   ;\
- $$e "           will be used instead, which may or may not work.)"	     ;\
+ $$e "           install the file $$dir/$$dest.  PAM is unlikely"	     ;\
+ $$e "           to work without this file (and old-style password"	     ;\
+ $$e "           authentication will be used instead, which may or may not"  ;\
+ $$e "           work.)"						     ;\
+ $$e "  ####################################################################";\
  $$e ""									     ;\
 	  fi ;								\
 	elif [ -f $$conf ]; then					\
@@ -248,9 +285,11 @@ install-pam:
 	  else								\
 	    e=echo ;							\
  $$e ""									     ;\
+ $$e "  ####################################################################";\
  $$e "  Warning: xscreensaver has been compiled with support for Pluggable"  ;\
  $$e "           Authentication Modules (PAM).  To complete the installation";\
  $$e "           of PAM support, you must add this to the file $$conf:"	     ;\
+ $$e "  ####################################################################";\
  $$e ""									     ;\
 	    cat $$src | grep -v '#%' | sed "s/^/	$$dest	/" ;	\
 	    echo "";							\