+++ /dev/null
-diff -ruN 3ddesktop-0.2.0.orig/acinclude.m4 3ddesktop-0.2.0/acinclude.m4
---- 3ddesktop-0.2.0.orig/acinclude.m4 Thu Jan 1 01:00:00 1970
-+++ 3ddesktop-0.2.0/acinclude.m4 Fri Aug 9 17:19:09 2002
-@@ -0,0 +1,172 @@
-+
-+dnl ########################### -*- Mode: M4 -*- #######################
-+dnl Copyright (C) 98, 1999 Matthew D. Langston <langston@SLAC.Stanford.EDU>
-+dnl
-+dnl This file is free software; you can redistribute it and/or modify it
-+dnl under the terms of the GNU General Public License as published by
-+dnl the Free Software Foundation; either version 2 of the License, or
-+dnl (at your option) any later version.
-+dnl
-+dnl This file is distributed in the hope that it will be useful, but
-+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
-+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+dnl General Public License for more details.
-+dnl
-+dnl You should have received a copy of the GNU General Public License
-+dnl along with this file; if not, write to:
-+dnl
-+dnl Free Software Foundation, Inc.
-+dnl Suite 330
-+dnl 59 Temple Place
-+dnl Boston, MA 02111-1307, USA.
-+dnl ####################################################################
-+
-+
-+dnl @synopsis MDL_HAVE_OPENGL
-+dnl
-+dnl Search for OpenGL. We search first for Mesa (a GPL'ed version of
-+dnl OpenGL) before a vendor's version of OpenGL, unless we were
-+dnl specifically asked not to with `--with-Mesa=no' or `--without-Mesa'.
-+dnl
-+dnl The four "standard" OpenGL libraries are searched for: "-lGL",
-+dnl "-lGLU", "-lGLX" (or "-lMesaGL", "-lMesaGLU" as the case may be) and
-+dnl "-lglut".
-+dnl
-+dnl All of the libraries that are found (since "-lglut" or "-lGLX" might
-+dnl be missing) are added to the shell output variable "GL_LIBS", along
-+dnl with any other libraries that are necessary to successfully link an
-+dnl OpenGL application (e.g. the X11 libraries). Care has been taken to
-+dnl make sure that all of the libraries in "GL_LIBS" are listed in the
-+dnl proper order.
-+dnl
-+dnl Additionally, the shell output variable "GL_CFLAGS" is set to any
-+dnl flags (e.g. "-I" flags) that are necessary to successfully compile
-+dnl an OpenGL application.
-+dnl
-+dnl The following shell variable (which are not output variables) are
-+dnl also set to either "yes" or "no" (depending on which libraries were
-+dnl found) to help you determine exactly what was found.
-+dnl
-+dnl have_GL
-+dnl have_GLU
-+dnl have_GLX
-+dnl have_glut
-+dnl
-+dnl A complete little toy "Automake `make distcheck'" package of how to
-+dnl use this macro is available at:
-+dnl
-+dnl ftp://ftp.slac.stanford.edu/users/langston/autoconf/ac_opengl-0.01.tar.gz
-+dnl
-+dnl Please note that as the ac_opengl macro and the toy example evolves,
-+dnl the version number increases, so you may have to adjust the above
-+dnl URL accordingly.
-+dnl
-+dnl @version 0.01 $Id$
-+dnl @author Matthew D. Langston <langston@SLAC.Stanford.EDU>
-+
-+AC_DEFUN([MDL_HAVE_OPENGL],
-+[
-+ AC_REQUIRE([AC_PROG_CC])
-+ AC_REQUIRE([AC_PATH_X])
-+ AC_REQUIRE([AC_PATH_XTRA])
-+ AC_REQUIRE([MDL_CHECK_LIBM])
-+
-+ AC_CACHE_CHECK([for OpenGL], mdl_cv_have_OpenGL,
-+ [
-+dnl Check for Mesa first, unless we were asked not to.
-+ AC_ARG_ENABLE(Mesa,[
-+ AC_HELP_STRING([--with-Mesa],
-+ [Prefer the Mesa library over a vendors native OpenGL library (default is yes)])
-+ ], use_Mesa=$enableval, use_Mesa=yes)
-+
-+ if test x"$use_Mesa" = xyes; then
-+ GL_search_list="MesaGL GL"
-+ GLU_search_list="MesaGLU GLU"
-+ GLX_search_list="MesaGLX GLX"
-+ else
-+ GL_search_list="GL MesaGL"
-+ GLU_search_list="GLU MesaGLU"
-+ GLX_search_list="GLX MesaGLX"
-+ fi
-+
-+ AC_LANG_SAVE
-+ AC_LANG_C
-+
-+dnl If we are running under X11 then add in the appropriate libraries.
-+ if ! test x"$no_x" = xyes; then
-+dnl Add everything we need to compile and link X programs to GL_CFLAGS
-+dnl and GL_X_LIBS.
-+ GL_CFLAGS="$X_CFLAGS"
-+ GL_X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS $LIBM"
-+ fi
-+ GL_save_CPPFLAGS="$CPPFLAGS"
-+ CPPFLAGS="$GL_CFLAGS"
-+
-+ GL_save_LIBS="$LIBS"
-+ LIBS="$GL_X_LIBS"
-+
-+ # Save the "AC_MSG_RESULT file descriptor" to FD 8.
-+ exec 8>&AC_FD_MSG
-+
-+ # Temporarily turn off AC_MSG_RESULT so that the user gets pretty
-+ # messages.
-+ exec AC_FD_MSG>/dev/null
-+
-+ AC_SEARCH_LIBS(glAccum, $GL_search_list, have_GL=yes, have_GL=no)
-+ AC_SEARCH_LIBS(gluBeginCurve, $GLU_search_list, have_GLU=yes, have_GLU=no)
-+ AC_SEARCH_LIBS(glXChooseVisual, $GLX_search_list, have_GLX=yes, have_GLX=no)
-+ AC_SEARCH_LIBS(glutInit, glut, have_glut=yes, have_glut=no)
-+
-+ # Restore pretty messages.
-+ exec AC_FD_MSG>&8
-+
-+ if test -n "$LIBS"; then
-+ mdl_cv_have_OpenGL=yes
-+ GL_LIBS="$LIBS"
-+ AC_SUBST(GL_CFLAGS)
-+ AC_SUBST(GL_LIBS)
-+ else
-+ mdl_cv_have_OpenGL=no
-+ GL_CFLAGS=
-+ fi
-+
-+dnl Reset GL_X_LIBS regardless, since it was just a temporary variable
-+dnl and we don't want to be global namespace polluters.
-+ GL_X_LIBS=
-+
-+ LIBS="$GL_save_LIBS"
-+ CPPFLAGS="$GL_save_CPPFLAGS"
-+
-+ AC_LANG_RESTORE
-+ ])
-+])
-+
-+
-+dnl @synopsis MDL_CHECK_LIBM
-+dnl
-+dnl Search for math library (typically -lm).
-+dnl
-+dnl The variable LIBM (which is not an output variable by default) is
-+dnl set to a value which is suitable for use in a Makefile (for example,
-+dnl in make's LOADLIBES macro) provided you AC_SUBST it first.
-+dnl
-+dnl @version 0.01 $Id$
-+dnl @author Matthew D. Langston <langston@SLAC.Stanford.EDU>
-+
-+# AC_CHECK_LIBM - check for math library
-+AC_DEFUN([MDL_CHECK_LIBM],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+LIBM=
-+case "$host" in
-+*-*-beos* | *-*-cygwin*)
-+ # These system don't have libm
-+ ;;
-+*-ncr-sysv4.3*)
-+ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-+ AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
-+ ;;
-+*)
-+ AC_CHECK_LIB(m, main, LIBM="-lm")
-+ ;;
-+esac
-+])
+++ /dev/null
---- 3ddesktop-0.2.0/3ddeskd.cpp.wiget Thu Aug 8 03:21:43 2002
-+++ 3ddesktop-0.2.0/3ddeskd.cpp Mon Aug 12 12:26:11 2002
-@@ -1773,7 +1773,7 @@
-
- if (!load_image(filename, data, &sizex, &sizey, 1)) {
-
-- sprintf (filename, "/usr/local/share/3ddesktop/digits.bmp");
-+ sprintf (filename, SHAREDIR "/digits.bmp");
-
- if (!load_image(filename, data, &sizex, &sizey, 1)) {
-
---- 3ddesktop-0.2.0/config.hpp.wiget Thu Aug 8 03:21:13 2002
-+++ 3ddesktop-0.2.0/config.hpp Mon Aug 12 12:26:11 2002
-@@ -54,7 +54,7 @@
- " priceisright, flip, or random)\n"
- " --acquire[=#] Grab images for all the desktops by cycling thru\n"
- " (sleep for # millisecs at each screen for refresh)\n"
-- " --dir=/path the install dir if different than /usr/share/3ddesktop\n"
-+ " --dir=/path the install dir if different than " SHAREDIR "\n"
- " --workspaces switch between workspace desktops instead of grid areas\n"
- " --depth=# specify how much to zoom out\n"
- " --randdelay=# seconds before random movement (0 for none) 15 default\n"
-@@ -144,7 +144,7 @@
- goto_column = NO_GOTO;
- goto_row = NO_GOTO;
-
-- strcpy(base_dir, "/usr/share/3ddesktop");
-+ strcpy(base_dir, SHAREDIR);
-
- digit_size = 50;
- digit_color = COLOR_RED;
-@@ -508,21 +508,15 @@
- FILE *fp = fopen(config_file, "r");
- if (!fp) {
-
-- sprintf(config_file, "/usr/local/share/3ddesktop/3ddesktop.conf");
-+ sprintf(config_file, SYSCONFDIR "/3ddesktop.conf");
-
- fp = fopen(config_file, "r");
- if (!fp) {
-
-- sprintf(config_file, "/usr/share/3ddesktop/3ddesktop.conf");
--
-- fp = fopen(config_file, "r");
-- if (!fp) {
--
-- // don't error on this - may not be there
-- msgout (DEBUG, "Could not open config file: 3ddesktop.conf: %s\n",
-- strerror(errno));
-- return;
-- }
-+ // don't error on this - may not be there
-+ msgout (DEBUG, "Could not open config file: 3ddesktop.conf: %s\n",
-+ strerror(errno));
-+ return;
- }
- }
-
---- 3ddesktop-0.2.0/Makefile.in.wiget Mon Aug 12 12:26:11 2002
-+++ 3ddesktop-0.2.0/Makefile.in Mon Aug 12 12:26:41 2002
-@@ -33,17 +33,20 @@
- CC = @CC@
- CXX = @CXX@
-
--CFLAGS = -Wall -I. @CFLAGS@ @imlib2_cflags@
--#-I/usr/include/kde -I/usr/lib/qt-2.3.0/include
--CPPFLAGS = -g -Wall -O2 @X_CFLAGS@ @GL_CFLAGS@ @CPPFLAGS@ @imlib2_cflags@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@ @GL_LIBS@ @X_LIBS@ -lXxf86vm @imlib2_libs@
- INSTALL = install
- prefix = @prefix@
--bindir = $(prefix)/bin
--libdir = $(prefix)/lib
--infodir = $(prefix)/info
--sharedir = $(prefix)/share/3ddesktop
-+bindir = @bindir@
-+libdir = @libdir@
-+infodir = @infodir@
-+datadir = @datadir@
-+sharedir = $(datadir)/3ddesktop
-+sysconfdir = @sysconfdir@
-+
-+CFLAGS = $(OPT) -Wall -I. @CFLAGS@ @imlib2_cflags@
-+#-I/usr/include/kde -I/usr/lib/qt-2.3.0/include
-+CPPFLAGS = -Wall @X_CFLAGS@ @GL_CFLAGS@ @CPPFLAGS@ @imlib2_cflags@ -DSHAREDIR=\"$(sharedir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
-
- SOURCES=3ddeskd.cpp xutil.cpp faceset.cpp util.cpp
- DOCS=README ChangeLog
-@@ -54,12 +57,13 @@
- all: 3ddeskd 3ddesk
-
- install: all
-- $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(sharedir)
-+ $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(sharedir) $(DESTDIR)$(sysconfdir)
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sharedir)
- $(INSTALL) 3ddeskd $(DESTDIR)$(bindir)/3ddeskd
- $(INSTALL) 3ddesk $(DESTDIR)$(bindir)/3ddesk
-- $(INSTALL) digits.bmp 3ddesktop.conf $(DESTDIR)$(sharedir)
-+ $(INSTALL) digits.bmp $(DESTDIR)$(sharedir)
-+ $(INSTALL) 3ddesktop.conf $(DESTDIR)$(sysconfdir)
-
- uninstall:
- /bin/rm -f $(bindir)/3ddeskd $(bindir)/3ddesk
projects / packages / 3ddesktop.git / commitdiff