From: <fl...@us...> - 2002-12-30 19:34:12
|
Update of /cvsroot/pvmpov/pvmpov_3_5 In directory sc8-pr-cvs1:/tmp/cvs-serv18616 Modified Files: Makefile.am README aclocal.m4 configure configure.in Added Files: acinclude.m4 Log Message: Import of the latest sources of POV-Ray version 3.5c and MG's PVM patch (revision 2). Added some command line options to the configure script: --enable/disable-pvm, --with-pvm-incs=DIR, --with-pvm-arch=ARCH, --with-pvm-libs=DIR, --with-pvm-auxlibs=LDFLAGS. --- NEW FILE: acinclude.m4 --- AC_DEFUN(AC_FIND_FILE, [ # parameter: # 1: variable to set with directory where file (parameter 3) was found # 2/3: directories/file to search for. # 4: directories to search in ( for 2/3 ). # 5: what to do on success. # 6: what to do in the other case. for dir1 in $4; do for dir2 in $2 .; do if test -r "$dir1/$dir2/$3"; then break 2 fi done done if test -r "$dir1/$dir2/$3"; then $1=`echo "$dir1/$dir2" | sed -e 's%/./%/%g' -e 's%/.$%%'` $5 else unset $1 $6 fi ]) AC_DEFUN(AC_CHECK_PVM, [ dnl ****************************************** dnl Dirs, where PVM might be. dnl ****************************************** POSSIBLE_PVM_DIRS="$PVM_ROOT \ /usr \ /usr/local \ /usr/gnu \ /opt/gnu \ /opt/local/pvm3 \ /usr/lib/pvm3 \ /usr/local/lib/pvm3\ /opt/local/pvm \ /usr/lib/pvm \ /usr/local/lib/pvm \ $prefix \ " dnl ****************************************** dnl Checks for pvm headers dnl ****************************************** AC_ARG_ENABLE( pvm, [ --enable-pvm Enables PVM support (default is no)], [ PVM_CFLAGS="-DHAVE_LIBPVM3" AC_MSG_CHECKING(for pvm headers path) AC_ARG_WITH( pvm-incs, [ --with-pvm-incs=DIR PVM headers are in DIR ], [ PVM_INCLUDEDIR="$withval" ], [ AC_FIND_FILE( PVM_INCLUDEDIR, include, pvm3.h, $POSSIBLE_PVM_DIRS, [ ], [ AC_MSG_RESULT(not found) AC_MSG_ERROR( [PVM3 header file pvm3.h not found. Use --with-pvm-incs=DIR] )] )] ) PVM_CFLAGS="$PVM_CFLAGS -I$PVM_INCLUDEDIR" AC_SUBST(PVM_CFLAGS) AC_MSG_RESULT($PVM_INCLUDEDIR) dnl ****************************************** dnl Checks for pvm architecture dnl ****************************************** AC_MSG_CHECKING(for pvm architecture) AC_ARG_WITH( pvm-arch, [ --with-pvm-arch=DIR PVM architecture is ARCH], [ PVM_ARCH="$withval" ], [ AC_FIND_FILE( PVM_ARCH_PROG, lib, pvmgetarch, $POSSIBLE_PVM_DIRS, [ PVM_ARCH=`$PVM_ARCH_PROG/pvmgetarch` ], [ AC_MSG_RESULT(not found) AC_MSG_ERROR( [PVM architecture not found. Use --with-pvm-arch=ARCH] )] )] ) AC_SUBST(PVM_ARCH) AC_MSG_RESULT($PVM_ARCH) dnl ****************************************** dnl Checks for pvm libraries. dnl ****************************************** AC_MSG_CHECKING(for pvm library path) AC_ARG_WITH( pvm-libs, [ --with-pvm-libs=DIR PVM library is in DIR ], [ PVM_LIBDIR="$withval" ], [ AC_FIND_FILE( PVM_LIBDIR, lib/$PVM_ARCH lib, libpvm3.a, $POSSIBLE_PVM_DIRS, [ ], [ AC_MSG_RESULT(not found) AC_MSG_ERROR( [PVM3 library libpvm3.a not found. Use --with-pvm-libs=DIR] )] )] ) PVM_LDFLAGS="-L$PVM_LIBDIR -lpvm3" AC_MSG_RESULT($PVM_LIBDIR) dnl ****************************************** dnl Checks for aux-libraries for pvm. dnl ****************************************** AC_MSG_CHECKING(for auxiliary pvm libs) AC_ARG_WITH( pvm-auxlibs, [ --with-pvm-auxlibs=LDFLAGS PVM auxiliary libraries are LDFLAGS], [ PVM_AUX_LIB="$withval" ], [ AC_FIND_FILE( PVM_DEFFILE, conf, $PVM_ARCH.def, $POSSIBLE_PVM_DIRS, [ PVM_AUX_LIB=`grep ARCHLIB $PVM_DEFFILE/$PVM_ARCH.def \ | grep -v '^#' | head -1 \ | sed -e 's/.*=//'` ], [ AC_MSG_RESULT(not found) AC_MSG_ERROR( [PVM3 auxiiliary LDFLAGS not found. Use --with-pvm-auxlibs=LDFLAGS] )] )] ) PVM_LDFLAGS="$PVM_LDFLAGS $PVM_AUX_LIB" AC_SUBST(PVM_LDFLAGS) AC_MSG_RESULT($PVM_AUX_LIB) ], [ AC_MSG_RESULT("PVM support disabled")]) ]) Index: Makefile.am =================================================================== RCS file: /cvsroot/pvmpov/pvmpov_3_5/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile.am 5 Oct 2002 10:07:53 -0000 1.1.1.1 --- Makefile.am 30 Dec 2002 19:33:37 -0000 1.2 *************** *** 23,28 **** ############################################################################## povray.ini: povray.in ! sed 's!the C:.POVRAY3 drive and!${pkglibdir}-3.5!' povray.in > povray.ini echo >> povray.ini echo ";; Search path for #include source files or command line ini files not" >> povray.ini --- 23,29 ---- ############################################################################## + povlibdir = @datadir@/povray-3.5 povray.ini: povray.in ! sed 's!the C:.POVRAY3 drive and!${povlibdir}!' povray.in > povray.ini echo >> povray.ini echo ";; Search path for #include source files or command line ini files not" >> povray.ini *************** *** 30,35 **** echo ";; search path, up to a maximum of 25." >> povray.ini echo >> povray.ini ! echo "Library_Path=${pkglibdir}-3.5" >> povray.ini ! echo "Library_Path=${pkglibdir}-3.5/include" >> povray.ini echo >> povray.ini echo ";; File output type control." >> povray.ini --- 31,36 ---- echo ";; search path, up to a maximum of 25." >> povray.ini echo >> povray.ini ! echo "Library_Path=${povlibdir}" >> povray.ini ! echo "Library_Path=${povlibdir}/include" >> povray.ini echo >> povray.ini echo ";; File output type control." >> povray.ini *************** *** 43,52 **** echo "Output_File_Type=N8 ;; (+/-Ftype)" >> povray.ini SUBDIRS = doc include ini scenes scripts src tests ! docdir = $(prefix)/share/doc/@PACKAGE@-@VERSION@ doc_DATA = povlegal.doc povwhere.txt gamma.gif gamma.gif.txt README README.unix ! povlibdir = @datadir@/povray-3.5 ! povlib_DATA = povray.ini TEST = tests/test.sh ! EXTRA_DIST = doc include scenes scripts tests povlegal.doc povwhere.txt gamma.gif gamma.gif.txt README README.unix povray.in povray.ini POVINI = @datadir@/povray-3.5 clean-generic: --- 44,53 ---- echo "Output_File_Type=N8 ;; (+/-Ftype)" >> povray.ini SUBDIRS = doc include ini scenes scripts src tests ! docdir = ${datadir}/doc/@PACKAGE@-@VERSION@ doc_DATA = povlegal.doc povwhere.txt gamma.gif gamma.gif.txt README README.unix ! povconfdir = @sysconfdir@ ! sysconf_DATA = povray.conf povray.ini TEST = tests/test.sh ! EXTRA_DIST = doc include scenes scripts tests povlegal.doc povwhere.txt gamma.gif gamma.gif.txt README README.unix povray.in povray.ini povray.conf POVINI = @datadir@/povray-3.5 clean-generic: Index: README =================================================================== RCS file: /cvsroot/pvmpov/pvmpov_3_5/README,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** README 5 Oct 2002 10:07:49 -0000 1.1.1.1 --- README 30 Dec 2002 19:33:38 -0000 1.2 *************** *** 1,11 **** ! POV-Ray 3.5 ! This is a first effort at an official version of POV-Ray using a configure ! script and Makefile generated by GNU autoconf and GNU automake. There ! should be a bit of emphasis on this being a FIRST effort, and I rather ! expect this to proceed by successive approximation. It's hardly a perfect ! arrangment, and I'd never used autoconf or automake before this, so I'm sure ! I have lots of tricks to learn, and I'm sure future releases (hopefully ! including minor versions) will be superior. If you have problems on your platform, let me know, and I'll see what I can --- 1,10 ---- ! POV-Ray 3.50c ! This is a fairly early effort at an official version of POV-Ray using a ! configure script and Makefile generated by GNU autoconf and GNU automake. ! I rather expect this to proceed by successive approximation. It's hardly ! a perfect arrangment, and I'd never used autoconf or automake before this, ! so I'm sure I have lots of tricks to learn, and I'm sure future releases ! (hopefully including minor versions) will be superior. If you have problems on your platform, let me know, and I'll see what I can *************** *** 14,18 **** Follow these instructions to compile POV-Ray: ! - make sure you have libpng, zlib, and libjpeg. POV-Ray flat-out depends on these libraries. Note that systems that use package management may have -devel versions of these libraries, which will be needed to --- 13,32 ---- Follow these instructions to compile POV-Ray: ! - In this version, you'll need to manually edit a couple lines near the ! top of src/optout.h: ! ! #define DISTRIBUTION_MESSAGE_1 "This is an unofficial version compiled by:" ! #error You must complete the following DISTRIBUTION_MESSAGE macro ! #define DISTRIBUTION_MESSAGE_2 " FILL IN NAME HERE........................." ! #define DISTRIBUTION_MESSAGE_3 " The POV-Ray Team(tm) is not responsible for supporting this version." ! ! At the very least, you'll need to edit out the #error line. Filling in ! your name is highly recommended. At some point, I plan to have a configure ! option that will allow you to clear the error and set DISTRIBUTION_MESSAGE_2 ! at compile-time, plus additional code that will warn you at compile-time if ! this line hasn't been edited, but that hasn't been implemented yet. Sorry for ! the inconvenience. ! ! - Make sure you have libpng, zlib, and libjpeg. POV-Ray flat-out depends on these libraries. Note that systems that use package management may have -devel versions of these libraries, which will be needed to *************** *** 24,32 **** have: ! libpng-1.2.1 libjpeg-6b zlib-1.1.4 ! - from the directory where this file resides, run: $ ./configure --- 38,46 ---- have: ! libpng-1.2.2 libjpeg-6b zlib-1.1.4 ! - From the directory where this file resides, run: $ ./configure *************** *** 36,46 **** # make install ! - note: this only creates one binary, regardless of platform. I've combined the X, SVGA, and console display versions into one binary. The intent is that if you tell POV-Ray that you want a display, it will Just Work, providing you with the display that makes most sense in your current context. If you don't have either X or SVGA libraries, it should still compile fine, but without ! the support for display types you may be lacking. Pre-compiled binaries ! should depend only on glibc 2.2. ! Mark Gordon <mtg...@po...>, July 2002 --- 50,59 ---- # make install ! - Note: this only creates one binary, regardless of platform. I've combined the X, SVGA, and console display versions into one binary. The intent is that if you tell POV-Ray that you want a display, it will Just Work, providing you with the display that makes most sense in your current context. If you don't have either X or SVGA libraries, it should still compile fine, but without ! the support for display types you may be lacking. ! Mark Gordon <mtg...@po...>, October 2002 Index: aclocal.m4 =================================================================== RCS file: /cvsroot/pvmpov/pvmpov_3_5/aclocal.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** aclocal.m4 5 Oct 2002 15:09:38 -0000 1.2 --- aclocal.m4 30 Dec 2002 19:33:38 -0000 1.3 *************** *** 11,14 **** --- 11,177 ---- dnl PARTICULAR PURPOSE. + AC_DEFUN(AC_FIND_FILE, + [ + # parameter: + # 1: variable to set with directory where file (parameter 3) was found + # 2/3: directories/file to search for. + # 4: directories to search in ( for 2/3 ). + # 5: what to do on success. + # 6: what to do in the other case. + + for dir1 in $4; do + for dir2 in $2 .; do + if test -r "$dir1/$dir2/$3"; then + break 2 + fi + done + done + + if test -r "$dir1/$dir2/$3"; then + $1=`echo "$dir1/$dir2" | sed -e 's%/./%/%g' -e 's%/.$%%'` + $5 + else + unset $1 + $6 + fi + + ]) + + AC_DEFUN(AC_CHECK_PVM, + [ + + dnl ****************************************** + dnl Dirs, where PVM might be. + dnl ****************************************** + + POSSIBLE_PVM_DIRS="$PVM_ROOT \ + /usr \ + /usr/local \ + /usr/gnu \ + /opt/gnu \ + /opt/local/pvm3 \ + /usr/lib/pvm3 \ + /usr/local/lib/pvm3\ + /opt/local/pvm \ + /usr/lib/pvm \ + /usr/local/lib/pvm \ + $prefix \ + " + dnl ****************************************** + dnl Checks for pvm headers + dnl ****************************************** + + AC_ARG_ENABLE( + pvm, + [ --enable-pvm Enables PVM support (default is no)], + [ PVM_CFLAGS="-DHAVE_LIBPVM3" + + AC_MSG_CHECKING(for pvm headers path) + + AC_ARG_WITH( + pvm-incs, + [ --with-pvm-incs=DIR PVM headers are in DIR ], + [ PVM_INCLUDEDIR="$withval" ], + [ AC_FIND_FILE( + PVM_INCLUDEDIR, + include, pvm3.h, + $POSSIBLE_PVM_DIRS, + [ ], + [ AC_MSG_RESULT(not found) + AC_MSG_ERROR( + [PVM3 header file pvm3.h not found. Use --with-pvm-incs=DIR] + )] + )] + ) + PVM_CFLAGS="$PVM_CFLAGS -I$PVM_INCLUDEDIR" + AC_SUBST(PVM_CFLAGS) + + AC_MSG_RESULT($PVM_INCLUDEDIR) + + dnl ****************************************** + dnl Checks for pvm architecture + dnl ****************************************** + + AC_MSG_CHECKING(for pvm architecture) + + AC_ARG_WITH( + pvm-arch, + [ --with-pvm-arch=DIR PVM architecture is ARCH], + [ PVM_ARCH="$withval" ], + [ AC_FIND_FILE( + PVM_ARCH_PROG, + lib, pvmgetarch, + $POSSIBLE_PVM_DIRS, + [ PVM_ARCH=`$PVM_ARCH_PROG/pvmgetarch` ], + [ AC_MSG_RESULT(not found) + AC_MSG_ERROR( + [PVM architecture not found. Use --with-pvm-arch=ARCH] + )] + )] + ) + + AC_SUBST(PVM_ARCH) + + AC_MSG_RESULT($PVM_ARCH) + + dnl ****************************************** + dnl Checks for pvm libraries. + dnl ****************************************** + + AC_MSG_CHECKING(for pvm library path) + + AC_ARG_WITH( + pvm-libs, + [ --with-pvm-libs=DIR PVM library is in DIR ], + [ PVM_LIBDIR="$withval" ], + [ AC_FIND_FILE( + PVM_LIBDIR, + lib/$PVM_ARCH lib, libpvm3.a, + $POSSIBLE_PVM_DIRS, + [ ], + [ AC_MSG_RESULT(not found) + AC_MSG_ERROR( + [PVM3 library libpvm3.a not found. Use --with-pvm-libs=DIR] + )] + )] + ) + + PVM_LDFLAGS="-L$PVM_LIBDIR -lpvm3" + + AC_MSG_RESULT($PVM_LIBDIR) + + dnl ****************************************** + dnl Checks for aux-libraries for pvm. + dnl ****************************************** + + AC_MSG_CHECKING(for auxiliary pvm libs) + + AC_ARG_WITH( + pvm-auxlibs, + [ --with-pvm-auxlibs=LDFLAGS PVM auxiliary libraries are LDFLAGS], + [ PVM_AUX_LIB="$withval" ], + [ AC_FIND_FILE( + PVM_DEFFILE, + conf, $PVM_ARCH.def, + $POSSIBLE_PVM_DIRS, + [ PVM_AUX_LIB=`grep ARCHLIB $PVM_DEFFILE/$PVM_ARCH.def \ + | grep -v '^#' | head -1 \ + | sed -e 's/.*=//'` ], + [ AC_MSG_RESULT(not found) + AC_MSG_ERROR( + [PVM3 auxiiliary LDFLAGS not found. Use --with-pvm-auxlibs=LDFLAGS] + )] + )] + ) + + PVM_LDFLAGS="$PVM_LDFLAGS $PVM_AUX_LIB" + AC_SUBST(PVM_LDFLAGS) + + AC_MSG_RESULT($PVM_AUX_LIB) + + ], + [ AC_MSG_RESULT("PVM support disabled")]) + ]) + # Do all the work for Automake. This macro actually does too much -- # some checks are only needed if your package does certain things. Index: configure =================================================================== RCS file: /cvsroot/pvmpov/pvmpov_3_5/configure,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** configure 5 Oct 2002 15:09:38 -0000 1.2 --- configure 30 Dec 2002 19:33:38 -0000 1.3 *************** *** 13,16 **** --- 13,26 ---- # Any additions from configure.in: ac_help="$ac_help + --enable-pvm Enables PVM support (default is no)" + ac_help="$ac_help + --with-pvm-incs=DIR PVM headers are in DIR " + ac_help="$ac_help + --with-pvm-arch=DIR PVM architecture is ARCH" + ac_help="$ac_help + --with-pvm-libs=DIR PVM library is in DIR " [...2302 lines suppressed...] - trap '' 1 2 15 cat > confcache <<\EOF --- 3529,3532 ---- *************** *** 3355,3359 **** s%@CPP@%$CPP%g s%@CXX@%$CXX%g ! s%@CXXCPP@%$CXXCPP%g s%@X_CFLAGS@%$X_CFLAGS%g s%@X_PRE_LIBS@%$X_PRE_LIBS%g --- 3676,3682 ---- s%@CPP@%$CPP%g s%@CXX@%$CXX%g ! s%@PVM_CFLAGS@%$PVM_CFLAGS%g ! s%@PVM_ARCH@%$PVM_ARCH%g ! s%@PVM_LDFLAGS@%$PVM_LDFLAGS%g s%@X_CFLAGS@%$X_CFLAGS%g s%@X_PRE_LIBS@%$X_PRE_LIBS%g Index: configure.in =================================================================== RCS file: /cvsroot/pvmpov/pvmpov_3_5/configure.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** configure.in 5 Oct 2002 15:26:35 -0000 1.2 --- configure.in 30 Dec 2002 19:33:38 -0000 1.3 *************** *** 9,16 **** AC_PROG_CPP AC_PROG_CXX - AC_PROG_CXXCPP AC_PROG_MAKE_SET dnl Checks for libraries. AC_CHECK_LIB(m, sin) AC_CHECK_LIB(z, inflate) --- 9,20 ---- AC_PROG_CPP AC_PROG_CXX AC_PROG_MAKE_SET + AC_CHECK_PVM + dnl Checks for libraries. + AC_CHECK_LIB(c, socket,,[AC_CHECK_LIB(socket, socket)]) + AC_CHECK_LIB(c, xdr_short,,[AC_CHECK_LIB(nsl, xdr_short)]) + AC_CHECK_LIB(m, sin) AC_CHECK_LIB(z, inflate) *************** *** 20,24 **** AC_CHECK_LIB(vga, vga_init) AC_CHECK_LIB(vgagl, gl_setcontextvga) - AC_CHECK_LIB(pvm3, pvm_mytid) dnl look for ios, iostream, fstream dnl Moved check for libX11 until after AC_PATH_EXTRA can define --- 24,27 ---- *************** *** 32,35 **** --- 35,40 ---- AC_CHECK_HEADERS(limits.h sys/time.h unistd.h, ) + #-------------------------------------------------------------------- + dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST *************** *** 46,50 **** AC_FUNC_VPRINTF AC_CHECK_FUNCS(getcwd gettimeofday) - AC_OUTPUT(Makefile src/Makefile doc/Makefile doc/html/Makefile doc/html/images/Makefile doc/html/images/vfaq/Makefile tests/Makefile scenes/Makefile scenes/advanced/Makefile scenes/advanced/drums2/Makefile scenes/advanced/fish13/Makefile scenes/advanced/ionic5/Makefile scenes/advanced/newltpot/Makefile scenes/advanced/ntreal/Makefile scenes/advanced/piece2/Makefile scenes/advanced/piece3/Makefile scenes/advanced/teapot/Makefile scenes/advanced/balcony/Makefile scenes/advanced/blocks/Makefile scenes/advanced/cats/Makefile scenes/advanced/cliche/Makefile scenes/advanced/glasschess/Makefile scenes/camera/Makefile scenes/incdemo/Makefile scenes/incdemo/glasses/Makefile scenes/incdemo/metals/Makefile scenes/incdemo/stones/Makefile scenes/incdemo/woods/Makefile scenes/interior/Makefile scenes/interior/media/Makefile scenes/lights/Makefile scenes/objects/Makefile scenes/objects/csg/Makefile scenes/objects/quartic/Makefile scenes/textures/Makefile scenes/textures/pigments/Makefile scenes/textures/pigments/skies/Makefile scenes/textures/finishes/Makefile scenes/textures/normals/Makefile scenes/textures/patterns/Makefile scenes/animations/Makefile scenes/animations/ambient/Makefile scenes/animations/boing/Makefile scenes/animations/camera2/Makefile scenes/animations/clockd/Makefile scenes/animations/diffuse/Makefile scenes/animations/float1/Makefile scenes/animations/float2/Makefile scenes/animations/float3/Makefile scenes/animations/float4/Makefile scenes/animations/fractalzoom/Makefile scenes/animations/l_o/Makefile scenes/animations/life/Makefile scenes/animations/pentmap/Makefile scenes/animations/quilted/Makefile scenes/animations/raddem/Makefile scenes/animations/reflect/Makefile scenes/animations/slinky/Makefile scenes/animations/speclr/Makefile scenes/animations/splinefollow/Makefile scenes/animations/vect1/Makefile scenes/animations/vect2/Makefile scenes/language/Makefile scenes/language/arrays/Makefile scenes/language/fileio/Makefile scenes/language/macros/Makefile scenes/objectmods/Makefile scenes/portfolio/Makefile scenes/qtvr/Makefile scenes/radiosity/Makefile include/Makefile ini/Makefile scripts/Makefile ) --- 51,54 ---- |