Date: Sat, 12 Jun 2004 22:08:01 +1000 From: Lachlan Andrew To: Gabriele Bartolini , Gilles Detillieux Cc: htdig-dev@lists.sourceforge.net Subject: [htdig-dev] Cygwin configuration Greetings all, On Sat, 12 Jun 2004 05:50 pm, Gabriele Bartolini wrote: > I am sorry about that. But if we want to easily maintain the > configure system, we should avoid manually hacking aclocal.m4 > files. Usually we should modify the acinclude.m4 and regenerate > aclocal.m4 through aclocal. Yes, it is my fault for modifying only automatically generated files. A proper patch (which I wrote before your email arrived...) is attached. > In this case however, I would suggest a different approach, that is > to say insert a conditional compilation into the os_abs.c file. At > the end there is the simple patch I'd commit. Let me know what you > think and if you have the chance to try it, let me know (I don't > have any C++ compiler on Windows). > That certainly is an option. However, doesn't it defeat the point of that whole file? Files that were in the os directory (and being with an os_ prefix now) were supposed to be different for each OS, to encapsulate these differences. That said, Gabriele's solution is probably the neater option, since all the other OS-dependent files are just the Un*x ones. > I ask you another big favour: if someone of you could please revise > the Release.html file. You did a good job on it, Gabriele. I can't think of any real revisions that are needed. Cheers, Lachlan -- lha@users.sourceforge.net ht://Dig developer DownUnder (http://www.htdig.org) diff -ru ../cvs/htdig/db/configure ./db/configure --- ../cvs/htdig/db/configure 2004-06-05 11:57:15.000000000 +1000 +++ ./db/configure 2004-06-12 18:19:03.000000000 +1000 @@ -23071,6 +23071,13 @@ sco*) CC=${CC-"cc -belf"} LIBS="-lsocket -lnsl $LIBS";; solaris*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";; + +# Check for Windows-style absolute paths +cygwin* | mingw* | pw32*) + if [ -f os_abs.c.win32 ] ; then + mv os_abs.c os_abs.c.unix + mv os_abs.c.win32 os_abs.c + fi ;; esac CFLAGS=${CFLAGS-$optimize_def} diff -ru ../cvs/htdig/db/configure.in ./db/configure.in --- ../cvs/htdig/db/configure.in 2003-09-26 22:22:51.000000000 +1000 +++ ./db/configure.in 2004-06-12 18:19:00.000000000 +1000 @@ -96,6 +96,13 @@ sco*) CC=${CC-"cc -belf"} LIBS="-lsocket -lnsl $LIBS";; solaris*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";; + +# Check for Windows-style absolute paths +cygwin* | mingw* | pw32*) + if [ -f os_abs.c.win32 ] ; then + mv os_abs.c os_abs.c.unix + mv os_abs.c.win32 os_abs.c + fi ;; esac CFLAGS=${CFLAGS-$optimize_def}