[ptx] libpano build patches

[Gerhard Gaussling]

Am Mittwoch 10 November 2004 06:53 schrieb Douglas Wilkins:
> Hi there,
> Attached are two small patches for the libpano build. The first
> allows out of tree builds i.e. from the libpano directory
> mkdir build
> cd build
> ../configure
> make
> make install
>
> The second ensures that configure fails if any of the prerequisites
> are not found.
>
> They work for me, but comments are, as always, welcomed :-)
>
> regards,
> Doug

Hello Doug,

maybe I'm too dumb, too lazy or the patches are already in cvs, whatever 
I got:

$ patch -p1 < 1libpano.diff
patching file Makefile.am
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 29.
2 out of 2 hunks FAILED -- saving rejects to file Makefile.am.rej

$ patch -p1 < 2libpano.diff
missing header for unified diff at line 3 of patch
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- configure.ac.orig  2004-11-10 07:47:14.050994160 +0200
|+++ configure.ac       2004-11-10 07:47:31.066407424 +0200
--------------------------
File to patch: configure.ac
patching file configure.ac
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n] y
Hunk #1 FAILED at 55.
Hunk #2 FAILED at 63.
Hunk #3 FAILED at 71.
Hunk #4 FAILED at 79.
Hunk #5 FAILED at 87.
5 out of 5 hunks FAILED -- saving rejects to file configure.ac.rej

$ grep AX_CHECK configure.ac
AX_CHECK_JAVA
AX_CHECK_ZLIB
AX_CHECK_PNG
AX_CHECK_JPEG
AX_CHECK_TIFF

$ egrep "(DAR|AM_LDFLAGS|INCLUDES|# Over-ride)"Makefile.am
              `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) |\
if HAVE_DARWIN
DAR_SRC =  sys_ansi.c ppm.c
DAR_DEFS = -D__Ansi__=1
DAR_SRC =
DAR_DEFS =
AM_CPPFLAGS = $(JAVA_FLAGS) $(JPEG_FLAGS) $(PNG_FLAGS) $(TIFF_FLAGS) 
$(ZLIB_FLAGS) $(LIN_DEFS) $(DAR_DEFS)
AM_LDFLAGS  = $(LIB_JAVA) $(LIB_JPEG) $(LIB_PNG) $(LIB_TIFF) $(LIB_ZLIB)
libpano12_la_SOURCES = $(STD_SRC) $(X11_SRC) $(WIN_SRC) $(MAC_SRC) 
$(LIN_SRC) $(DAR_SRC)

I cleaned up my machine from libpano and hugin and all links I done 
manually in /usr/lib or /usr/local.

All build flawlessy, the libs and links are build in .libs, and the 
tools are built in tools. They are according 'file' bash scripts.

$ panoinfo
panoinfo: error while loading shared libraries: libpano12.so.0: cannot 
open shared object file: No such file or directory
$ PTOptimizer
PTOptimizer: error while loading shared libraries: libpano12.so.0: 
cannot open shared object file: No such file or directory

$ ls /usr/local/lib/libpano*
/usr/local/lib/libpano12.a   /usr/local/lib/libpano12.so    /usr/local/lib/libpano12.so.0.0.0
/usr/local/lib/libpano12.la  /usr/local/lib/libpano12.so.0
$ ls /usr/lib/libpano*
ls: /usr/lib/libpano*: No such file or directory
$ echo $LD_LIBRARY_PATH
/usr/share/qt3/lib:/home/gerhard/GNUstep/Library/Libraries:/usr/local/lib/GNUstep/Local/Library/Libraries:/usr/local/lib/GNUstep/Network/Library/Libraries:/usr/lib/GNUstep/System/Library/Libraries

Ok, that's the point I think.

$ ls /usr/local/include/pano12
filter.h  panorama.h  pteditor.h  ptutils.h  queryfeature.h  version.h

So, I assume that all is ok, only the missing LD_LIBRARY_PATH 
for /usr/local/lib in my ~/.bashrc

regards

Gerhard Gaußling