Index: configure.ac =================================================================== RCS file: /home/moanui/jhoblitt/tmp/cvsroot/pslib/configure.ac,v retrieving revision 1.1.1.1 diff -u -w -r1.1.1.1 configure.ac --- configure.ac 2 Sep 2005 22:00:09 -0000 1.1.1.1 +++ configure.ac 7 Sep 2005 01:09:18 -0000 @@ -21,13 +21,12 @@ SUBDIR="etc src test" dnl don't include 'swig', as it is optional -SRCPATH="`pwd`/src" +SRCPATH='$(top_srcdir)/src' SRCDIRS="sys astro db fft fits imageops math mathtypes types xml" SRCINC=`echo "${SRCDIRS=}" | ${SED} "s|\(\\w\+\)|-I\${SRCPATH=}/\1|g"` SRCSUBLIBS=`echo "${SRCDIRS=}" | ${SED} "s|\(\\w\+\)|\1/libpslib\1.la|g"` AC_SUBST(SRCSUBLIBS,${SRCSUBLIBS=}) -CFLAGS="${CFLAGS=} -I${SRCPATH=} ${SRCINC=}" AC_SUBST(SRCINC,${SRCINC=}) AC_DISABLE_STATIC @@ -61,9 +60,6 @@ AC_PREFIX_DEFAULT([`pwd`]) test "$prefix" = NONE && prefix=`pwd` -dnl Setup the info for psLib for pkg-config -PSLIB_CFLAGS="-I${includedir}" - dnl check for standard language functionality AC_HEADER_STDC AC_HEADER_SYS_WAIT @@ -110,16 +106,19 @@ [AC_MSG_ERROR([MYSQL 4.1.2 or newer is required. http://www.mysql.com or use --with-mysql_config to specify location of ocnfiguration script.])]) AC_MSG_CHECKING([MySQL cflags]) - MYSQL_CFLAGS="`${MYSQL_CONFIG} --cflags`" + MYSQL_CFLAGS="`${MYSQL_CONFIG} --include`" + PSLIB_CFLAGS="${PSLIB_CFLAGS=} ${MYSQL_CFLAGS}" AC_MSG_RESULT([${MYSQL_CFLAGS}]) - CFLAGS="${CFLAGS=} ${MYSQL_CFLAGS}" AC_MSG_CHECKING([MySQL link options]) - MYSQL_LDFLAGS="`${MYSQL_CONFIG} --libs`" - AC_MSG_RESULT([${MYSQL_LDFLAGS}]) - PSLIB_LIBS="${PSLIB_LIBS=} ${MYSQL_LDFLAGS}" + MYSQL_LIBS="`${MYSQL_CONFIG} --libs`" + PSLIB_LIBS="${PSLIB_LIBS=} ${MYSQL_LIBS}" + AC_MSG_RESULT([${MYSQL_LIBS}]) AC_SUBST(TST_PSDB,"tst_psDB") dnl enable the test for psDB +dnl AC_RUN_IFELSE() uses CFLAGS to find mysql_version.h + TMP_CFLAGS=${CFLAGS} + CFLAGS=${MYSQL_CFLAGS} AC_RUN_IFELSE([AC_LANG_PROGRAM( [[#include #include @@ -131,13 +130,16 @@ exit(0); } ]])], [], [AC_MSG_ERROR([MySQL 4.1.2 or newer is required. Obtain it at http://www.mysql.com or use --with-mysql to specify location.])]) - + CFLAGS=${TMP_CFLAGS} else + dnl FIXME CFLAGS="${CFLAGS=} -DOMIT_PSDB" PSLIB_CFLAGS="${PSLIB_CFLAGS=} -DOMIT_PSDB" AC_MSG_RESULT([disable building MySQL functionality]) fi +AC_SUBST([MYSQL_CFLAGS]) + dnl ----------------- CFITSIO options -------------------- AC_ARG_WITH(cfitsio, [AS_HELP_STRING(--with-cfitsio=DIR,Specify location of CFITSIO.)], @@ -149,12 +151,13 @@ AC_ARG_WITH(cfitsio-lib, [AS_HELP_STRING(--with-cfitsio-lib=DIR,Specify CFITSIO library directory.)], [CFITSIO_LDFLAGS="-L$withval"]) -CFLAGS="${CFLAGS=} $CFITSIO_CFLAGS" -dnl LDFLAGS="${LDFLAGS} $CFITSIO_LDFLAGS -lcfitsio" +PSLIB_CFLAGS="${PSLIB_CFLAGS=} ${CFITSIO_CFLAGS}" PSLIB_LIBS="${PSLIB_LIBS=} $CFITSIO_LDFLAGS -lcfitsio" AC_CHECK_HEADERS([fitsio.h],[], [AC_MSG_ERROR([CFITSIO is required. Obtain it at http://heasarc.gsfc.nasa.gov/docs/software/fitsio or use --with-cfitsio to specify location.])]) +AC_SUBST([CFITSIO_CFLAGS]) + dnl ------------------ FFTW3 options --------------------- AC_ARG_WITH(fftw3, [AS_HELP_STRING(--with-fftw3=DIR,Specify location of FFTW version 3.)], @@ -166,13 +169,14 @@ AC_ARG_WITH(fftw3-lib, [AS_HELP_STRING(--with-fftw3-lib=DIR,Specify FFTW version 3 library directory.)], [FFTW3_LDFLAGS="-L$withval"]) -CFLAGS="${CFLAGS=} $FFTW3_CFLAGS" -dnl LDFLAGS="${LDFLAGS=} $FFTW3_LDFLAGS -lfftw3f" +PSLIB_CFLAGS="${PSLIB_CFLAGS=} ${FFTW3_CFLAGS}" PSLIB_LIBS="${PSLIB_LIBS=} $FFTW3_LDFLAGS -lfftw3f" AC_MSG_CHECKING([FFTW header files]) AC_CHECK_HEADERS([fftw3.h],[], [AC_MSG_ERROR([FFTW version 3 with float support is required. Obtain it at http://www.fftw.org/or use --with-fftw3 to specify location.])]) +AC_SUBST([FFTW3_CFLAGS]) + dnl -------------------- GSL options --------------------- AC_ARG_WITH(gsl-config, [AS_HELP_STRING(--with-gsl-config=FILE,Specify location of gsl-config.)], @@ -183,10 +187,11 @@ AC_MSG_CHECKING([GSL cflags]) GSL_CFLAGS="`${GSL_CONFIG} --cflags`" AC_MSG_RESULT([${GSL_CFLAGS}]) -CFLAGS="${CFLAGS=} ${GSL_CFLAGS}" -dnl LDFLAGS="${LDFLAGS=} `${GSL_CONFIG} --libs`" +PSLIB_CFLAGS="${PSLIB_CFLAGS=} ${GSL_CFLAGS}" PSLIB_LIBS="${PSLIB_LIBS=} `${GSL_CONFIG} --libs`" +AC_SUBST([GSL_CFLAGS]) + dnl ------------------- XML2 options --------------------- AC_ARG_WITH(xml2-config, [AS_HELP_STRING(--with-xml2-config=FILE,Specify location of xml2-config.)], @@ -197,11 +202,10 @@ AC_MSG_CHECKING([xml2 cflags]) XML_CFLAGS="`${XML_CONFIG} --cflags`" AC_MSG_RESULT([${XML_CFLAGS}]) -CFLAGS="${CFLAGS=} ${XML_CFLAGS}" -dnl LDFLAGS="${LDFLAGS=} `${XML_CONFIG} --libs`" +PSLIB_CFLAGS="${PSLIB_CFLAGS=} ${XML_CFLAGS}" PSLIB_LIBS="${PSLIB_LIBS=} `${XML_CONFIG} --libs`" -PSLIB_CFLAGS="${PSLIB_CFLAGS=} `${XML_CONFIG} --cflags`" +AC_SUBST([XML_CFLAGS]) dnl ------------------- SWIG options --------------------- AC_ARG_ENABLE(perlmodule, Index: pslib.pc.in =================================================================== RCS file: /home/moanui/jhoblitt/tmp/cvsroot/pslib/pslib.pc.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -w -r1.1.1.1 -r1.2 --- pslib.pc.in 2 Sep 2005 22:00:09 -0000 1.1.1.1 +++ pslib.pc.in 2 Sep 2005 22:02:00 -0000 1.2 @@ -7,4 +7,4 @@ Description: Pan-STARRS Library Version: @VERSION@ Libs: -L@libdir@ -lpslib @PSLIB_LIBS@ @LIBS@ -Cflags: @PSLIB_CFLAGS@ +Cflags: -I${includedir} @PSLIB_CFLAGS@ Index: src/Makefile.am =================================================================== RCS file: /home/moanui/jhoblitt/tmp/cvsroot/pslib/src/Makefile.am,v retrieving revision 1.1.1.1 diff -u -w -r1.1.1.1 Makefile.am --- src/Makefile.am 2 Sep 2005 22:00:09 -0000 1.1.1.1 +++ src/Makefile.am 7 Sep 2005 00:26:09 -0000 @@ -2,6 +2,7 @@ lib_LTLIBRARIES = libpslib.la +libpslib_la_CPPFLAGS = $(SRCINC) libpslib_la_LIBADD = $(SRCSUBLIBS) libpslib_la_SOURCES = psTest.c Index: src/astro/Makefile.am =================================================================== RCS file: /home/moanui/jhoblitt/tmp/cvsroot/pslib/src/astro/Makefile.am,v retrieving revision 1.1.1.1 diff -u -w -r1.1.1.1 Makefile.am --- src/astro/Makefile.am 2 Sep 2005 22:00:09 -0000 1.1.1.1 +++ src/astro/Makefile.am 7 Sep 2005 00:27:37 -0000 @@ -3,6 +3,8 @@ AM_CFLAGS=$(CFLAGS) -DPS_CONFIG_FILE_DEFAULT=\"$(sysconfdir)/pslib/psTime.config\" noinst_LTLIBRARIES = libpslibastro.la + +libpslibastro_la_CPPFLAGS = $(SRCINC) libpslibastro_la_SOURCES = \ psTime.c \ psCoord.c \ Index: src/db/Makefile.am =================================================================== RCS file: /home/moanui/jhoblitt/tmp/cvsroot/pslib/src/db/Makefile.am,v retrieving revision 1.1.1.1 diff -u -w -r1.1.1.1 Makefile.am --- src/db/Makefile.am 2 Sep 2005 22:00:09 -0000 1.1.1.1 +++ src/db/Makefile.am 7 Sep 2005 00:31:25 -0000 @@ -2,6 +2,7 @@ # noinst_LTLIBRARIES = libpslibdb.la +libpslibdb_la_CPPFLAGS = $(SRCINC) $(MYSQL_CFLAGS) libpslibdb_la_SOURCES = \ psDB.c Index: src/fft/Makefile.am =================================================================== RCS file: /home/moanui/jhoblitt/tmp/cvsroot/pslib/src/fft/Makefile.am,v retrieving revision 1.1.1.1 diff -u -w -r1.1.1.1 Makefile.am --- src/fft/Makefile.am 2 Sep 2005 22:00:09 -0000 1.1.1.1 +++ src/fft/Makefile.am 7 Sep 2005 00:30:51 -0000 @@ -2,6 +2,7 @@ # noinst_LTLIBRARIES = libpslibfft.la +libpslibfft_la_CPPFLAGS = $(SRCINC) $(FFTW3_CFLAGS) libpslibfft_la_SOURCES = \ psImageFFT.c \ psVectorFFT.c Index: src/fits/Makefile.am =================================================================== RCS file: /home/moanui/jhoblitt/tmp/cvsroot/pslib/src/fits/Makefile.am,v retrieving revision 1.1.1.1 diff -u -w -r1.1.1.1 Makefile.am --- src/fits/Makefile.am 2 Sep 2005 22:00:09 -0000 1.1.1.1 +++ src/fits/Makefile.am 7 Sep 2005 00:32:09 -0000 @@ -2,6 +2,7 @@ # noinst_LTLIBRARIES = libpslibfits.la +libpslibfits_la_CPPFLAGS = $(SRCINC) $(CFITSIO_CFLAGS) libpslibfits_la_SOURCES = \ psFits.c Index: src/imageops/Makefile.am =================================================================== RCS file: /home/moanui/jhoblitt/tmp/cvsroot/pslib/src/imageops/Makefile.am,v retrieving revision 1.1.1.1 diff -u -w -r1.1.1.1 Makefile.am --- src/imageops/Makefile.am 2 Sep 2005 22:00:09 -0000 1.1.1.1 +++ src/imageops/Makefile.am 7 Sep 2005 00:32:46 -0000 @@ -2,6 +2,7 @@ # noinst_LTLIBRARIES = libpslibimageops.la +libpslibimageops_la_CPPFLAGS = $(SRCINC) libpslibimageops_la_SOURCES = \ psImageConvolve.c \ psImageGeomManip.c \ Index: src/math/Makefile.am =================================================================== RCS file: /home/moanui/jhoblitt/tmp/cvsroot/pslib/src/math/Makefile.am,v retrieving revision 1.1.1.1 diff -u -w -r1.1.1.1 Makefile.am --- src/math/Makefile.am 2 Sep 2005 22:00:09 -0000 1.1.1.1 +++ src/math/Makefile.am 7 Sep 2005 00:33:55 -0000 @@ -2,6 +2,7 @@ # noinst_LTLIBRARIES = libpslibmath.la +libpslibmath_la_CPPFLAGS = $(SRCINC) $(GSL_CFLAGS) libpslibmath_la_SOURCES = \ psBinaryOp.c \ psCompare.c \ Index: src/mathtypes/Makefile.am =================================================================== RCS file: /home/moanui/jhoblitt/tmp/cvsroot/pslib/src/mathtypes/Makefile.am,v retrieving revision 1.1.1.1 diff -u -w -r1.1.1.1 Makefile.am --- src/mathtypes/Makefile.am 2 Sep 2005 22:00:09 -0000 1.1.1.1 +++ src/mathtypes/Makefile.am 7 Sep 2005 00:34:51 -0000 @@ -2,6 +2,7 @@ # noinst_LTLIBRARIES = libpslibmathtypes.la +libpslibmathtypes_la_CPPFLAGS = $(SRCINC) libpslibmathtypes_la_SOURCES = \ psImage.c \ psScalar.c \ Index: src/sys/Makefile.am =================================================================== RCS file: /home/moanui/jhoblitt/tmp/cvsroot/pslib/src/sys/Makefile.am,v retrieving revision 1.1.1.1 diff -u -w -r1.1.1.1 Makefile.am --- src/sys/Makefile.am 2 Sep 2005 22:00:09 -0000 1.1.1.1 +++ src/sys/Makefile.am 7 Sep 2005 00:37:07 -0000 @@ -2,6 +2,7 @@ # noinst_LTLIBRARIES = libpslibsys.la +libpslibsys_la_CPPFLAGS = $(SRCINC) libpslibsys_la_SOURCES = \ psAbort.c \ psConfigure.c \ Index: src/types/Makefile.am =================================================================== RCS file: /home/moanui/jhoblitt/tmp/cvsroot/pslib/src/types/Makefile.am,v retrieving revision 1.1.1.1 diff -u -w -r1.1.1.1 Makefile.am --- src/types/Makefile.am 2 Sep 2005 22:00:09 -0000 1.1.1.1 +++ src/types/Makefile.am 7 Sep 2005 00:38:35 -0000 @@ -2,6 +2,7 @@ # noinst_LTLIBRARIES = libpslibtypes.la +libpslibtypes_la_CPPFLAGS = $(SRCINC) libpslibtypes_la_SOURCES = \ psArray.c \ psBitSet.c \ Index: src/xml/Makefile.am =================================================================== RCS file: /home/moanui/jhoblitt/tmp/cvsroot/pslib/src/xml/Makefile.am,v retrieving revision 1.1.1.1 diff -u -w -r1.1.1.1 Makefile.am --- src/xml/Makefile.am 2 Sep 2005 22:00:09 -0000 1.1.1.1 +++ src/xml/Makefile.am 7 Sep 2005 00:39:22 -0000 @@ -2,6 +2,7 @@ # noinst_LTLIBRARIES = libpslibxml.la +libpslibxml_la_CPPFLAGS = $(SRCINC) $(XML_CFLAGS) libpslibxml_la_SOURCES = \ psXML.c Index: swig/Makefile.am =================================================================== RCS file: /home/moanui/jhoblitt/tmp/cvsroot/pslib/swig/Makefile.am,v retrieving revision 1.1.1.1 diff -u -w -r1.1.1.1 Makefile.am --- swig/Makefile.am 2 Sep 2005 22:00:09 -0000 1.1.1.1 +++ swig/Makefile.am 7 Sep 2005 00:41:02 -0000 @@ -4,7 +4,9 @@ clean-generic: rm -rf psLibModule -SRCDIR = $(shell cd $(top_srcdir) && pwd) +# this is going into a make file one directory deeper in the tree so the +# realitive paths need to be adjusted +SWIGINC=`echo "${SRCINC}" | ${SED} "s|-I|-I../|g"` #################################################### ## PsLibModule swig build section. @@ -17,7 +19,7 @@ psLibModule/setup.txt: if [ ! -d psLibModule ]; then mkdir psLibModule; fi - echo "includes=$(SRCINC)" > psLibModule/setup.txt + echo "includes=-I../$(top_srcdir)/src $(SWIGINC) $(PSLIB_CFLAGS)" > psLibModule/setup.txt echo "ldflags=-L$(top_builddir)/src $(PSLIB_LIBS)" >> psLibModule/setup.txt echo "cflags=$(CFLAGS) -std=c99 -Wno-unused -Wno-strict-aliasing" >> psLibModule/setup.txt Index: test/astro/Makefile.am =================================================================== RCS file: /home/moanui/jhoblitt/tmp/cvsroot/pslib/test/astro/Makefile.am,v retrieving revision 1.1.1.1 diff -u -w -r1.1.1.1 Makefile.am --- test/astro/Makefile.am 2 Sep 2005 22:00:09 -0000 1.1.1.1 +++ test/astro/Makefile.am 7 Sep 2005 00:09:20 -0000 @@ -1,6 +1,7 @@ #Makefile for astro tests of psLib # +AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS) AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS) TESTS = \ Index: test/db/Makefile.am =================================================================== RCS file: /home/moanui/jhoblitt/tmp/cvsroot/pslib/test/db/Makefile.am,v retrieving revision 1.1.1.1 diff -u -w -r1.1.1.1 Makefile.am --- test/db/Makefile.am 2 Sep 2005 22:00:09 -0000 1.1.1.1 +++ test/db/Makefile.am 7 Sep 2005 00:41:47 -0000 @@ -1,5 +1,6 @@ #Makefile for db tests of psLib # +AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS) AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS) TESTS = \ Index: test/fft/Makefile.am =================================================================== RCS file: /home/moanui/jhoblitt/tmp/cvsroot/pslib/test/fft/Makefile.am,v retrieving revision 1.1.1.1 diff -u -w -r1.1.1.1 Makefile.am --- test/fft/Makefile.am 2 Sep 2005 22:00:09 -0000 1.1.1.1 +++ test/fft/Makefile.am 7 Sep 2005 00:41:58 -0000 @@ -1,5 +1,6 @@ #Makefile for fft tests of psLib # +AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS) AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS) TESTS = \ Index: test/fits/Makefile.am =================================================================== RCS file: /home/moanui/jhoblitt/tmp/cvsroot/pslib/test/fits/Makefile.am,v retrieving revision 1.1.1.1 diff -u -w -r1.1.1.1 Makefile.am --- test/fits/Makefile.am 2 Sep 2005 22:00:10 -0000 1.1.1.1 +++ test/fits/Makefile.am 7 Sep 2005 00:42:29 -0000 @@ -1,5 +1,6 @@ #Makefile for fits tests of psLib # +AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS) AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS) TESTS = \ Index: test/imageops/Makefile.am =================================================================== RCS file: /home/moanui/jhoblitt/tmp/cvsroot/pslib/test/imageops/Makefile.am,v retrieving revision 1.1.1.1 diff -u -w -r1.1.1.1 Makefile.am --- test/imageops/Makefile.am 2 Sep 2005 22:00:10 -0000 1.1.1.1 +++ test/imageops/Makefile.am 7 Sep 2005 00:42:43 -0000 @@ -1,5 +1,6 @@ #Makefile for imageops tests of psLib # +AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS) AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS) TESTS = \ Index: test/math/Makefile.am =================================================================== RCS file: /home/moanui/jhoblitt/tmp/cvsroot/pslib/test/math/Makefile.am,v retrieving revision 1.1.1.1 diff -u -w -r1.1.1.1 Makefile.am --- test/math/Makefile.am 2 Sep 2005 22:00:10 -0000 1.1.1.1 +++ test/math/Makefile.am 7 Sep 2005 00:42:51 -0000 @@ -1,5 +1,6 @@ #Makefile for math tests of psLib # +AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS) AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS) TESTS = \ Index: test/mathtypes/Makefile.am =================================================================== RCS file: /home/moanui/jhoblitt/tmp/cvsroot/pslib/test/mathtypes/Makefile.am,v retrieving revision 1.1.1.1 diff -u -w -r1.1.1.1 Makefile.am --- test/mathtypes/Makefile.am 2 Sep 2005 22:00:10 -0000 1.1.1.1 +++ test/mathtypes/Makefile.am 7 Sep 2005 00:43:02 -0000 @@ -1,5 +1,6 @@ #Makefile for mathtypes tests # +AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS) AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS) TESTS = \ Index: test/sys/Makefile.am =================================================================== RCS file: /home/moanui/jhoblitt/tmp/cvsroot/pslib/test/sys/Makefile.am,v retrieving revision 1.1.1.1 diff -u -w -r1.1.1.1 Makefile.am --- test/sys/Makefile.am 2 Sep 2005 22:00:10 -0000 1.1.1.1 +++ test/sys/Makefile.am 7 Sep 2005 00:43:10 -0000 @@ -1,5 +1,6 @@ #Makefile for sys tests # +AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS) AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS) TESTS = \ Index: test/types/Makefile.am =================================================================== RCS file: /home/moanui/jhoblitt/tmp/cvsroot/pslib/test/types/Makefile.am,v retrieving revision 1.1.1.1 diff -u -w -r1.1.1.1 Makefile.am --- test/types/Makefile.am 2 Sep 2005 22:00:10 -0000 1.1.1.1 +++ test/types/Makefile.am 7 Sep 2005 00:43:21 -0000 @@ -1,5 +1,6 @@ #Makefile for types tests # +AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS) AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS) AM_CFLAGS = -DXML_CONFIG_FILE="\"$(top_srcdir)/etc/pslib/psTime.xml\"" Index: test/xml/Makefile.am =================================================================== RCS file: /home/moanui/jhoblitt/tmp/cvsroot/pslib/test/xml/Makefile.am,v retrieving revision 1.1.1.1 diff -u -w -r1.1.1.1 Makefile.am --- test/xml/Makefile.am 2 Sep 2005 22:00:10 -0000 1.1.1.1 +++ test/xml/Makefile.am 7 Sep 2005 00:43:30 -0000 @@ -1,5 +1,6 @@ #Makefile for types tests # +AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS) AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS) TESTS = \