---- ./configure.in.org Thu Aug 8 19:37:38 2002
-+++ ./configure.in Thu Aug 8 19:38:02 2002
-@@ -1,78 +0,0 @@
--dnl Process this file with autoconf to produce a configure script.
--AC_INIT(3ddesk.cpp)
--AM_INIT_AUTOMAKE(3ddesktop,0.1.5)
--
--dnl Checks for programs.
--AC_PROG_CXX
--AC_PROG_CC
--
--dnl Checks for header files.
--AC_PATH_XTRA
--
--AC_HEADER_DIRENT
--AC_HEADER_STDC
--AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h)
--dnl AC_CHECK_HEADERS(Imlib2.h)
--
--dnl Checks for libraries.
--MDL_HAVE_OPENGL
--
--AC_CHECK_HEADERS(GL/gl.h, ,exit)
--AC_CHECK_HEADERS(X11/extensions/xf86vmode.h, ,exit)
--
--dnl ---- I'll assume the header check is enough
--dnl AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryVersion)
--dnl AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryVersion, ,exit)
--
--dnl AC_CHECK_LIB(Imlib2, imlib_create_image_from_drawable)
--
--IMLIB2_CONFIG_IN_PATH=yes
--AC_PROGRAM_CHECK(IMLIB2_CONFIG_IN_PATH, imlib2-config, yes, no)
--if test $IMLIB2_CONFIG_IN_PATH = no; then
-- echo "ERROR."
-- echo "The imlib2-config development script was not found in your execute"
-- echo "path."
-- echo "You may have imlib2 installed somewhere not covered by your path."
-- echo ""
-- echo "If this is the case make sure you have the packages installed, AND"
-- echo "that the imlib2-config script is in your execute path (see your"
-- echo "shell's manual page on setting the \$PATH environment variable)."
-- AC_MSG_ERROR([Fatal Error: no imlib2-config detected.])
-- exit;
--fi
--imlib2_cflags=`imlib2-config --cflags`
--imlib2_libs=`imlib2-config --libs`
--AC_SUBST(imlib2_cflags)
--AC_SUBST(imlib2_libs)
--
--
--
--dnl AC_CHECK_LIB(GL, glClearColor)
--
--dnl AC_CHECK_LIB(GLU, gluBuild2DMipmaps)
--
--dnl AC_CHECK_LIB(X11, XAllowEvents)
--
--dnl AC_CHECK_LIB(Xi, XQueryTree)
--
--dnl AC_CHECK_LIB(Xmu, XInternAtom)
--
--dnl AC_CHECK_LIB(glut, glutSwapBuffers)
--
--AC_CHECK_LIB(m, cos)
--
--dnl Checks for typedefs, structures, and compiler characteristics.
--AC_C_INLINE
--AC_HEADER_TIME
--
--dnl Checks for library functions.
--AC_CHECK_FUNCS(gettimeofday mkdir strerror)
--
--AC_OUTPUT(Makefile)
--
--dnl AC_MSG_RESULT([
--dnl Using the following for compiling and linking OpenGL programs:
--dnl
--dnl GL_CFLAGS: $GL_CFLAGS
--dnl GL_LIBS: $GL_LIBS
--dnl ])
---- ./configure.ac.org Thu Aug 8 19:38:14 2002
-+++ ./configure.ac Thu Aug 8 21:06:00 2002
-@@ -0,0 +1,80 @@
-+dnl Process this file with autoconf to produce a configure script.
-+AC_INIT([3ddesktop],[0.1.5],[your@mail.org])
-+AC_CONFIG_SRCDIR([3ddesk.cpp])
-+AM_INIT_AUTOMAKE
-+
-+dnl Checks for programs.
-+AC_PROG_CC
-+AC_PROG_CXX
-+AC_C_INLINE
-+AC_HEADER_TIME
-+
-+dnl Checks for header files.
-+AC_PATH_XTRA
-+
-+CPPFLAGS="-I/usr/X11R6/include"
-+AC_HEADER_DIRENT
-+AC_HEADER_STDC
-+AC_CHECK_HEADERS([fcntl.h sys/time.h unistd.h])
-+dnl AC_CHECK_HEADERS(Imlib2.h)
-+
-+dnl Checks for libraries.
-+MDL_HAVE_OPENGL
-+
-+AC_CHECK_HEADERS(GL/gl.h,[ ] ,[AC_MSG_ERROR([You need gl.h in your system])])
-+AC_CHECK_HEADERS(X11/extensions/xf86vmode.h,[ ] ,[AC_MSG_ERROR([You need xf86vmode.h in your system])])
-+
-+dnl ---- I'll assume the header check is enough
-+dnl AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryVersion)
-+dnl AC_CHECK_LIB(Xxf86vm, XF86VidModeQueryVersion, ,exit)
-+
-+dnl AC_CHECK_LIB(Imlib2, imlib_create_image_from_drawable)
-+IMLIB2_CONFIG_IN_PATH=yes
-+AC_CHECK_PROG(IMLIB2_CONFIG_IN_PATH, imlib2-config, yes, no)
-+if test $IMLIB2_CONFIG_IN_PATH = no; then
-+ echo "ERROR."
-+ echo "The imlib2-config development script was not found in your execute"
-+ echo "path."
-+ echo "You may have imlib2 installed somewhere not covered by your path."
-+ echo ""
-+ echo "If this is the case make sure you have the packages installed, AND"
-+ echo "that the imlib2-config script is in your execute path (see your"
-+ echo "shell's manual page on setting the \$PATH environment variable)."
-+ AC_MSG_ERROR([Fatal Error: no imlib2-config detected.])
-+ exit;
-+fi
-+imlib2_cflags=`imlib2-config --cflags`
-+imlib2_libs=`imlib2-config --libs`
-+AC_SUBST(imlib2_cflags)
-+AC_SUBST(imlib2_libs)
-+
-+#AC_CHECK_PROG(IMLIB2_CONFIG_IN_PATH, imlib2-config,
-+# CFLAGS="$CFLAGS `imlib2-config --cflags`"
-+# LIBS="$LIBS `imlib2-config --libs`",
-+# [AC_MSG_ERROR(Fatal Error: no imlib2-config detected.)])
-+
-+dnl AC_CHECK_LIB(GL, glClearColor)
-+
-+dnl AC_CHECK_LIB(GLU, gluBuild2DMipmaps)
-+
-+dnl AC_CHECK_LIB(X11, XAllowEvents)
-+
-+dnl AC_CHECK_LIB(Xi, XQueryTree)
-+
-+dnl AC_CHECK_LIB(Xmu, XInternAtom)
-+
-+dnl AC_CHECK_LIB(glut, glutSwapBuffers)
-+
-+AC_CHECK_LIB(m, cos)
-+
-+dnl Checks for library functions.
-+AC_CHECK_FUNCS([gettimeofday mkdir strerror])
-+
-+AC_OUTPUT([Makefile])
-+
-+dnl AC_MSG_RESULT([
-+dnl Using the following for compiling and linking OpenGL programs:
+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 GL_CFLAGS: $GL_CFLAGS
-+dnl GL_LIBS: $GL_LIBS
-+dnl ])
---- ./Makefile.in.org Thu Aug 8 21:03:17 2002
-+++ ./Makefile.in Thu Aug 8 21:07:15 2002
-@@ -98,13 +98,13 @@
-
- maintainer-clean: clean
-
--# automatic re-running of configure if the configure.in file has changed
--${srcdir}/configure: configure.in aclocal.m4
-+# automatic re-running of configure if the configure.ac file has changed
-+${srcdir}/configure: configure.ac aclocal.m4
- cd ${srcdir} && autoconf
-
- # autoheader might not change config.h.in, so touch a stamp file
- ${srcdir}/config.h.in: stamp-h.in
--${srcdir}/stamp-h.in: configure.in #aclocal.m4
-+${srcdir}/stamp-h.in: configure.ac #aclocal.m4
- cd ${srcdir} && autoheader
- echo timestamp > ${srcdir}/stamp-h.in
-
++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
++])
projects / packages / 3ddesktop.git / commitdiff