IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4981


Ignore:
Timestamp:
Sep 8, 2005, 5:02:06 PM (21 years ago)
Author:
desonia
Message:

Bug 515

Location:
trunk/psLib
Files:
25 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/configure.ac

    r4956 r4981  
    2222SUBDIR="etc src test" dnl don't include 'swig', as it is optional
    2323
    24 SRCPATH="`pwd`/src"
     24SRCPATH='$(top_srcdir)/src'
    2525SRCDIRS="sys astro db fft fits imageops math mathtypes types xml"
    2626SRCINC=`echo "${SRCDIRS=}" | ${SED} "s|\(\\w\+\)|-I\${SRCPATH=}/\1|g"`
    … …  
    2828SRCSUBLIBS=`echo "${SRCDIRS=}" | ${SED} "s|\(\\w\+\)|\1/libpslib\1.la|g"`
    2929AC_SUBST(SRCSUBLIBS,${SRCSUBLIBS=})
    30 CFLAGS="${CFLAGS=} -I${SRCPATH=} ${SRCINC=}"
    3130AC_SUBST(SRCINC,${SRCINC=})
    3231
    … …  
    6160AC_PREFIX_DEFAULT([`pwd`])
    6261test "$prefix" = NONE && prefix=`pwd`
    63 
    64 dnl Setup the info for psLib for pkg-config
    65 PSLIB_CFLAGS="-I${includedir}"
    6662
    6763dnl check for standard language functionality
    … …  
    111107
    112108  AC_MSG_CHECKING([MySQL cflags])
    113   MYSQL_CFLAGS="`${MYSQL_CONFIG} --cflags`"
     109  MYSQL_CFLAGS="`${MYSQL_CONFIG} --include`"
     110  PSLIB_CFLAGS="${PSLIB_CFLAGS=} ${MYSQL_CFLAGS}"
    114111  AC_MSG_RESULT([${MYSQL_CFLAGS}])
    115   CFLAGS="${CFLAGS=} ${MYSQL_CFLAGS}"
    116112
    117113  AC_MSG_CHECKING([MySQL link options])
    118   MYSQL_LDFLAGS="`${MYSQL_CONFIG} --libs`"
    119   AC_MSG_RESULT([${MYSQL_LDFLAGS}])
    120   PSLIB_LIBS="${PSLIB_LIBS=} ${MYSQL_LDFLAGS}"
     114  MYSQL_LIBS="`${MYSQL_CONFIG} --libs`"
     115  PSLIB_LIBS="${PSLIB_LIBS=} ${MYSQL_LIBS}"
     116  AC_MSG_RESULT([${MYSQL_LIBS}])
    121117  AC_SUBST(TST_PSDB,"tst_psDB") dnl enable the test for psDB
    122118
     119dnl AC_RUN_IFELSE() uses CFLAGS to find mysql_version.h
     120  TMP_CFLAGS=${CFLAGS}
     121  CFLAGS=${MYSQL_CFLAGS}
    123122  AC_RUN_IFELSE([AC_LANG_PROGRAM(
    124123[[#include <stdlib.h>
    … …  
    132131    }
    133132]])], [], [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.])])
    134 
     133  CFLAGS=${TMP_CFLAGS}
    135134else
     135  dnl FIXME
    136136  CFLAGS="${CFLAGS=} -DOMIT_PSDB"
    137137  PSLIB_CFLAGS="${PSLIB_CFLAGS=} -DOMIT_PSDB"
    138138  AC_MSG_RESULT([disable building MySQL functionality])
    139139fi
     140
     141AC_SUBST([MYSQL_CFLAGS])
    140142
    141143dnl ----------------- CFITSIO options --------------------
    … …  
    150152[AS_HELP_STRING(--with-cfitsio-lib=DIR,Specify CFITSIO library directory.)],
    151153[CFITSIO_LDFLAGS="-L$withval"])
    152 CFLAGS="${CFLAGS=} $CFITSIO_CFLAGS"
    153 dnl LDFLAGS="${LDFLAGS} $CFITSIO_LDFLAGS -lcfitsio"
     154PSLIB_CFLAGS="${PSLIB_CFLAGS=} ${CFITSIO_CFLAGS}"
    154155PSLIB_LIBS="${PSLIB_LIBS=} $CFITSIO_LDFLAGS -lcfitsio"
    155156AC_CHECK_HEADERS([fitsio.h],[],
    156157   [AC_MSG_ERROR([CFITSIO is required.  Obtain it at  http://heasarc.gsfc.nasa.gov/docs/software/fitsio or use --with-cfitsio to specify location.])])
     158
     159AC_SUBST([CFITSIO_CFLAGS])
    157160
    158161dnl ------------------ FFTW3 options ---------------------
    … …  
    167170[AS_HELP_STRING(--with-fftw3-lib=DIR,Specify FFTW version 3 library directory.)],
    168171[FFTW3_LDFLAGS="-L$withval"])
    169 CFLAGS="${CFLAGS=} $FFTW3_CFLAGS"
    170 dnl LDFLAGS="${LDFLAGS=} $FFTW3_LDFLAGS -lfftw3f"
     172PSLIB_CFLAGS="${PSLIB_CFLAGS=} ${FFTW3_CFLAGS}"
    171173PSLIB_LIBS="${PSLIB_LIBS=} $FFTW3_LDFLAGS -lfftw3f"
    172174AC_MSG_CHECKING([FFTW header files])
    173175AC_CHECK_HEADERS([fftw3.h],[],
    174176   [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.])])
     177
     178AC_SUBST([FFTW3_CFLAGS])
    175179
    176180dnl -------------------- GSL options ---------------------
    … …  
    184188GSL_CFLAGS="`${GSL_CONFIG} --cflags`"
    185189AC_MSG_RESULT([${GSL_CFLAGS}])
    186 CFLAGS="${CFLAGS=} ${GSL_CFLAGS}"
    187 dnl LDFLAGS="${LDFLAGS=} `${GSL_CONFIG} --libs`"
     190PSLIB_CFLAGS="${PSLIB_CFLAGS=} ${GSL_CFLAGS}"
    188191PSLIB_LIBS="${PSLIB_LIBS=} `${GSL_CONFIG} --libs`"
     192
     193AC_SUBST([GSL_CFLAGS])
    189194
    190195dnl ------------------- XML2 options ---------------------
    … …  
    198203XML_CFLAGS="`${XML_CONFIG} --cflags`"
    199204AC_MSG_RESULT([${XML_CFLAGS}])
    200 CFLAGS="${CFLAGS=} ${XML_CFLAGS}"
    201 dnl LDFLAGS="${LDFLAGS=} `${XML_CONFIG} --libs`"
     205PSLIB_CFLAGS="${PSLIB_CFLAGS=} ${XML_CFLAGS}"
    202206PSLIB_LIBS="${PSLIB_LIBS=} `${XML_CONFIG} --libs`"
    203 PSLIB_CFLAGS="${PSLIB_CFLAGS=} `${XML_CONFIG} --cflags`"
    204 
     207
     208AC_SUBST([XML_CFLAGS])
    205209
    206210dnl ------------------- SWIG options ---------------------

  • trunk/psLib/pslib-config.in

    r3769 r4981  
    5757
    5858    --cflags)
    59         echo @PSLIB_CFLAGS@
     59        echo -I@includedir@ @PSLIB_CFLAGS@
    6060        ;;
    6161

  • trunk/psLib/pslib.pc.in

    r3237 r4981  
    88Version: @VERSION@
    99Libs: -L@libdir@ -lpslib @PSLIB_LIBS@ @LIBS@
    10 Cflags: @PSLIB_CFLAGS@
     10Cflags: -I${includedir} @PSLIB_CFLAGS@

  • trunk/psLib/src/Makefile.am

    r4956 r4981  
    33lib_LTLIBRARIES = libpslib.la
    44
     5libpslib_la_CPPFLAGS = $(SRCINC)
    56libpslib_la_LIBADD = $(SRCSUBLIBS)
    67

  • trunk/psLib/src/astro/Makefile.am

    r4620 r4981  
    44
    55noinst_LTLIBRARIES = libpslibastro.la
     6
     7libpslibastro_la_CPPFLAGS = $(SRCINC)
    68libpslibastro_la_SOURCES = \
    79        psTime.c \

  • trunk/psLib/src/db/Makefile.am

    r4540 r4981  
    33noinst_LTLIBRARIES = libpslibdb.la
    44
     5libpslibdb_la_CPPFLAGS = $(SRCINC) $(MYSQL_CFLAGS)
    56libpslibdb_la_SOURCES = \
    67        psDB.c

  • trunk/psLib/src/fft/Makefile.am

    r4540 r4981  
    33noinst_LTLIBRARIES = libpslibfft.la
    44
     5libpslibfft_la_CPPFLAGS = $(SRCINC) $(FFTW3_CFLAGS)
    56libpslibfft_la_SOURCES = \
    67        psImageFFT.c \

  • trunk/psLib/src/fits/Makefile.am

    r4540 r4981  
    33noinst_LTLIBRARIES = libpslibfits.la
    44
     5libpslibfits_la_CPPFLAGS = $(SRCINC) $(CFITSIO_CFLAGS)
    56libpslibfits_la_SOURCES = \
    67        psFits.c

  • trunk/psLib/src/imageops/Makefile.am

    r4540 r4981  
    33noinst_LTLIBRARIES = libpslibimageops.la
    44
     5libpslibimageops_la_CPPFLAGS = $(SRCINC)
    56libpslibimageops_la_SOURCES = \
    67        psImageConvolve.c \

  • trunk/psLib/src/math/Makefile.am

    r4958 r4981  
    33noinst_LTLIBRARIES = libpslibmath.la
    44
     5libpslibmath_la_CPPFLAGS = $(SRCINC) $(GSL_CFLAGS)
    56libpslibmath_la_SOURCES = \
    67        psBinaryOp.c \

  • trunk/psLib/src/mathtypes/Makefile.am

    r4540 r4981  
    33noinst_LTLIBRARIES = libpslibmathtypes.la
    44
     5libpslibmathtypes_la_CPPFLAGS = $(SRCINC)
    56libpslibmathtypes_la_SOURCES = \
    67        psImage.c \

  • trunk/psLib/src/sys/Makefile.am

    r4956 r4981  
    33noinst_LTLIBRARIES = libpslibsys.la
    44
     5libpslibsys_la_CPPFLAGS = $(SRCINC)
    56libpslibsys_la_SOURCES = \
    67        psAbort.c \

  • trunk/psLib/src/types/Makefile.am

    r4540 r4981  
    33noinst_LTLIBRARIES = libpslibtypes.la
    44
     5libpslibtypes_la_CPPFLAGS = $(SRCINC)
    56libpslibtypes_la_SOURCES = \
    67        psArray.c \

  • trunk/psLib/src/xml/Makefile.am

    r4540 r4981  
    33noinst_LTLIBRARIES = libpslibxml.la
    44
     5libpslibxml_la_CPPFLAGS = $(SRCINC) $(XML_CFLAGS)
    56libpslibxml_la_SOURCES = \
    67        psXML.c

  • trunk/psLib/swig/Makefile.am

    r4541 r4981  
    55        rm -rf psLibModule
    66
    7 SRCDIR = $(shell cd $(top_srcdir) && pwd)
     7# this is going into a make file one directory deeper in the tree so the
     8# realitive paths need to be adjusted
     9SWIGINC=`echo "${SRCINC}" | ${SED} "s|-I|-I../|g"`
    810
    911####################################################
    … …  
    1820psLibModule/setup.txt:
    1921        if [ ! -d psLibModule ]; then mkdir psLibModule; fi
    20         echo "includes=$(SRCINC)" > psLibModule/setup.txt
     22        echo "includes=-I../$(top_srcdir)/src $(SWIGINC) $(PSLIB_CFLAGS)" > psLibModule/setup.txt
    2123        echo "ldflags=-L$(top_builddir)/src $(PSLIB_LIBS)" >> psLibModule/setup.txt
    2224        echo "cflags=$(CFLAGS) -std=c99 -Wno-unused -Wno-strict-aliasing" >> psLibModule/setup.txt

  • trunk/psLib/test/astro/Makefile.am

    r4601 r4981  
    22#
    33
     4AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
    45AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
    56

  • trunk/psLib/test/db/Makefile.am

    r4877 r4981  
    11#Makefile for db tests of psLib
    22#
     3AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
    34AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
    45

  • trunk/psLib/test/fft/Makefile.am

    r4547 r4981  
    11#Makefile for fft tests of psLib
    22#
     3AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
    34AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
    45

  • trunk/psLib/test/fits/Makefile.am

    r4547 r4981  
    11#Makefile for fits tests of psLib
    22#
     3AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
    34AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
    45

  • trunk/psLib/test/imageops/Makefile.am

    r4547 r4981  
    11#Makefile for imageops tests of psLib
    22#
     3AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
    34AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
    45

  • trunk/psLib/test/math/Makefile.am

    r4956 r4981  
    11#Makefile for math tests of psLib
    22#
     3AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
    34AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
    45

  • trunk/psLib/test/mathtypes/Makefile.am

    r4547 r4981  
    11#Makefile for mathtypes tests
    22#
     3AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
    34AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
    45

  • trunk/psLib/test/sys/Makefile.am

    r4549 r4981  
    11#Makefile for sys tests
    22#
     3AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
    34AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
    45

  • trunk/psLib/test/types/Makefile.am

    r4561 r4981  
    11#Makefile for types tests
    22#
     3AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
    34AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
    45AM_CFLAGS = -DXML_CONFIG_FILE="\"$(top_srcdir)/etc/pslib/psTime.xml\""

  • trunk/psLib/test/xml/Makefile.am

    r4956 r4981  
    11#Makefile for types tests
    22#
     3AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
    34AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS)
    45
Note: See TracChangeset for help on using the changeset viewer.