IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 3785


Ignore:
Timestamp:
Apr 28, 2005, 4:03:02 PM (21 years ago)
Author:
desonia
Message:

applied changes from Bug#385

Location:
trunk/psLib
Files:
8 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/Makefile.cvs

    r3238 r3785  
    33all:
    44        if [ "`which glibtoolize 2> /dev/null`" != "" ] ; then glibtoolize --force ; else libtoolize --force ; fi
    5         aclocal
    6         autoheader
    7         automake
    8         autoconf
     5        aclocal --force
     6        autoheader --force
     7        automake --add-missing --force
     8        autoconf --force
    99

  • trunk/psLib/configure.ac

    r3779 r3785  
    1 AC_INIT([pslib],[0.6.0],[http://www.pan-starrs.org/bugzilla])
     1AC_PREREQ(2.59)
     2
     3AC_INIT([pslib],[0.6.0],[http://pan-starrs.ifa.hawaii.edu/bugzilla])
     4AC_CONFIG_SRCDIR([pslib.pc.in])
    25AC_CANONICAL_TARGET
    3 AM_CONFIG_HEADER(src/config.h)
    4 AM_INIT_AUTOMAKE(1.6)
     6
     7AM_INIT_AUTOMAKE([1.6 foreign dist-bzip2])
     8AC_CONFIG_HEADERS([src/config.h])
     9AM_MAINTAINER_MODE
    510
    611PSLIB_LT_VERSION="0:5:0"
    … …  
    1419dnl handle debug building
    1520AC_ARG_ENABLE(optimize,
    16   [AC_HELP_STRING([--enable-optimize],[enable compiler optimization])],
     21  [AS_HELP_STRING(--enable-optimize,enable compiler optimization)],
    1722  [AC_MSG_RESULT(compile optimization enabled)
    1823   CFLAGS="${CFLAGS=} -O2"],
    … …  
    5762PSLIB_LIBS="${FLIBS=}"
    5863
     64dnl check for standard language functionality
     65AC_HEADER_STDC
     66AC_HEADER_SYS_WAIT
     67AC_CHECK_HEADERS([float.h limits.h stdint.h stdlib.h string.h sys/time.h unistd.h])
     68AC_HEADER_STDBOOL
     69AC_C_CONST
     70AC_C_INLINE
     71AC_TYPE_PID_T
     72AC_C_RESTRICT
     73AC_TYPE_SIZE_T
     74AC_HEADER_TIME
     75AC_STRUCT_TM
     76
     77dnl Checks for library functions.
     78AC_FUNC_ERROR_AT_LINE
     79AC_FUNC_FORK
     80AC_FUNC_MALLOC
     81AC_FUNC_MEMCMP
     82AC_FUNC_REALLOC
     83AC_FUNC_STRFTIME
     84AC_FUNC_STRTOD
     85AC_FUNC_VPRINTF
     86AC_CHECK_FUNCS([floor gethostname gettimeofday memmove memset mkdir pow regcomp sqrt strchr strcspn strerror strrchr strstr strtol strtoul strtoull])
     87
    5988dnl ----------------- MYSQL options --------------------
    6089dnl MYSQL_LDFLAGS="-L${libdir}/mysql"
    6190dnl MYSQL_CFLAGS="-I${includedir}/mysql"
    6291AC_ARG_ENABLE(mysql,
    63  [AC_HELP_STRING([--disable-mysql],[Disable MySQL functionality])],
     92 [AS_HELP_STRING(--disable-mysql,Disable MySQL functionality)],
    6493 [MYSQL_REQ=$enableval],
    6594 [MYSQL_REQ="yes"])
    … …  
    6998  AC_MSG_RESULT([enable building MySQL functionality])
    7099  AC_ARG_WITH(mysql_config,
    71     [AC_HELP_STRING([--with-mysql_config=FILE],[Specify location of MYSQL configuration script.])],
     100    [AS_HELP_STRING(--with-mysql_config=FILE,Specify location of MYSQL configuration script.)],
    72101    [MYSQL_CONFIG=$withval],
    73102    [MYSQL_CONFIG=`which mysql_config`])
    … …  
    106135dnl ----------------- CFITSIO options --------------------
    107136AC_ARG_WITH(cfitsio,
    108 [AC_HELP_STRING([--with-cfitsio=DIR],[Specify location of CFITSIO.])],
     137[AS_HELP_STRING(--with-cfitsio=DIR,Specify location of CFITSIO.)],
    109138[CFITSIO_CFLAGS="-I$withval/include"
    110139 CFITSIO_LDFLAGS="-L$withval/lib"])
    111140AC_ARG_WITH(cfitsio-include,
    112 [AC_HELP_STRING([--with-cfitsio-include=DIR],[Specify CFITSIO include directory.])],
     141[AS_HELP_STRING(--with-cfitsio-include=DIR,Specify CFITSIO include directory.)],
    113142[CFITSIO_CFLAGS="-I$withval"])
    114143AC_ARG_WITH(cfitsio-lib,
    115 [AC_HELP_STRING([--with-cfitsio-lib=DIR],[Specify CFITSIO library directory.])],
     144[AS_HELP_STRING(--with-cfitsio-lib=DIR,Specify CFITSIO library directory.)],
    116145[CFITSIO_LDFLAGS="-L$withval"])
    117146CFLAGS="${CFLAGS=} $CFITSIO_CFLAGS"
    … …  
    123152dnl ------------------ FFTW3 options ---------------------
    124153AC_ARG_WITH(fftw3,
    125 [AC_HELP_STRING([--with-fftw3=DIR],[Specify location of FFTW version 3.])],
     154[AS_HELP_STRING(--with-fftw3=DIR,Specify location of FFTW version 3.)],
    126155[FFTW3_CFLAGS="-I$withval/include"
    127156 FFTW3_LDFLAGS="-L$withval/lib"])
    128157AC_ARG_WITH(fftw3-include,
    129 [AC_HELP_STRING([--with-fftw3-include=DIR],[Specify FFTW version 3 include directory.])],
     158[AS_HELP_STRING(--with-fftw3-include=DIR,Specify FFTW version 3 include directory.)],
    130159[FFTW3_CFLAGS="-I$withval"])
    131160AC_ARG_WITH(fftw3-lib,
    132 [AC_HELP_STRING([--with-fftw3-lib=DIR],[Specify FFTW version 3 library directory.])],
     161[AS_HELP_STRING(--with-fftw3-lib=DIR,Specify FFTW version 3 library directory.)],
    133162[FFTW3_LDFLAGS="-L$withval"])
    134163CFLAGS="${CFLAGS=} $FFTW3_CFLAGS"
    … …  
    141170dnl -------------------- GSL options ---------------------
    142171AC_ARG_WITH(gsl-config,
    143 [AC_HELP_STRING([--with-gsl-config=FILE],[Specify location of gsl-config.])],
     172[AS_HELP_STRING(--with-gsl-config=FILE,Specify location of gsl-config.)],
    144173[GSL_CONFIG=$withval],
    145174[GSL_CONFIG=`which gsl-config`])
    … …  
    155184dnl ------------------- XML2 options ---------------------
    156185AC_ARG_WITH(xml2-config,
    157 [AC_HELP_STRING([--with-xml2-config=FILE],[Specify location of xml2-config.])],
     186[AS_HELP_STRING(--with-xml2-config=FILE,Specify location of xml2-config.)],
    158187[XML_CONFIG=$withval],
    159188[XML_CONFIG=`which xml2-config`])
    … …  
    169198dnl ------------------- SWIG options ---------------------
    170199AC_ARG_ENABLE(perlmodule,
    171  [AC_HELP_STRING([--disable-perlmodule],[Disable creation of perl module])],
     200 [AS_HELP_STRING(--disable-perlmodule,Disable creation of perl module)],
    172201 [SWIG_REQ="$enableval"],
    173202 [SWIG_REQ="yes"])
    … …  
    177206  AC_MSG_RESULT([enable building perl module])
    178207  AC_ARG_WITH(swig,
    179   [AC_HELP_STRING([--with-swig=FILE],[Specify location of SWIG executable.])],
     208  [AS_HELP_STRING(--with-swig=FILE,Specify location of SWIG executable.)],
    180209  [SWIG=$withval],
    181210  [SWIG=`which swig`])
    … …  
    188217dnl ------------------- PERL options ---------------------
    189218  AC_ARG_WITH(perl,
    190     [AC_HELP_STRING([--with-perl=FILE],[Specify location of PERL executable.])],
     219    [AS_HELP_STRING(--with-perl=FILE,Specify location of PERL executable.)],
    191220    [AC_CHECK_PROG(PERL, $withval, $withval)],
    192221    [AC_CHECK_PROG(PERL, perl, `which perl`)])
    … …  
    199228dnl ---------------- PERLPREFIX option -------------------
    200229  AC_ARG_WITH(perlprefix,
    201     [AC_HELP_STRING([--with-perlprefix=DIR],[Specify prefix of Perl Module's installation. (default=PREFIX)])],
     230    [AS_HELP_STRING(--with-perlprefix=DIR,Specify prefix of Perl Module's installation. (default=PREFIX))],
    202231    [PERL_PREFIX="$withval"],
    203232    [PERL_PREFIX="$prefix"])
    … …  
    227256AC_SUBST(PSLIB_CFLAGS,[$PSLIB_CFLAGS])
    228257
    229 AC_CONFIG_FILES([ Makefile ])
    230 AC_CONFIG_FILES([ src/Makefile ])
    231 AC_CONFIG_FILES([ src/astronomy/Makefile ])
    232 AC_CONFIG_FILES([ src/collections/Makefile ])
    233 AC_CONFIG_FILES([ src/dataManip/Makefile ])
    234 AC_CONFIG_FILES([ src/dataIO/Makefile ])
    235 AC_CONFIG_FILES([ src/image/Makefile ])
    236 AC_CONFIG_FILES([ src/sysUtils/Makefile ])
     258AC_CONFIG_FILES([
     259  Makefile
     260  src/Makefile
     261  src/astronomy/Makefile
     262  src/collections/Makefile
     263  src/dataManip/Makefile
     264  src/dataIO/Makefile
     265  src/image/Makefile
     266  src/sysUtils/Makefile
     267  test/Makefile
     268  test/astronomy/Makefile
     269  test/collections/Makefile
     270  test/dataManip/Makefile
     271  test/dataIO/Makefile
     272  test/image/Makefile
     273  test/sysUtils/Makefile
     274  etc/pslib/Makefile
     275  etc/Makefile
     276  pslib-config
     277  pslib.pc
     278  Doxyfile
     279])
    237280
    238281if test "$SWIG_REQ" == "yes"
    … …  
    241284fi
    242285
    243 AC_CONFIG_FILES([ test/Makefile ])
    244 AC_CONFIG_FILES([ test/astronomy/Makefile ])
    245 AC_CONFIG_FILES([ test/collections/Makefile ])
    246 AC_CONFIG_FILES([ test/dataManip/Makefile ])
    247 AC_CONFIG_FILES([ test/dataIO/Makefile ])
    248 AC_CONFIG_FILES([ test/image/Makefile ])
    249 AC_CONFIG_FILES([ test/sysUtils/Makefile ])
    250 AC_CONFIG_FILES([ etc/pslib/Makefile ])
    251 AC_CONFIG_FILES([ etc/Makefile ])
    252 AC_CONFIG_FILES([ pslib-config ])
    253 AC_CONFIG_FILES([ pslib.pc ])
    254 AC_CONFIG_FILES([ Doxyfile ])
    255 
    256286AC_OUTPUT
    257 

  • trunk/psLib/swig/Makefile.PL

    r3127 r3785  
    1 # File : Makefile.PL 
    2 use ExtUtils::MakeMaker; 
     1# File : Makefile.PL
     2use ExtUtils::MakeMaker;
    33use FileHandle;
    44
    … …  
    1515    };
    1616
    17     #default: 
     17    #default:
    1818    die "Error:  syntaxt error in setup.txt line $_";
    1919  }
    … …  
    2626
    2727
    28 WriteMakefile( 
    29         'NAME' => 'pslib',             # Name of package 
     28WriteMakefile(
     29        'NAME' => 'pslib',             # Name of package
    3030        'INC' => $opts{includes},
    31         'LIBS' => ["$opts{ldflags}"],  # Name of custom libraries 
    32         'OBJECT' => 'pslib_wrap.o',    # Name of custom libraries
    33         'OPTIMIZE' => $opts{cflags},
     31        'LIBS' => ["$opts{ldflags}"],  # Name of custom libraries
     32        'OBJECT' => 'pslib_wrap.o',    # Name of object
     33        'OPTIMIZE' => "$opts{cflags} -w", # cflags with disabling of warnings (SWIG generated code generates warnings)
    3434        'LD' => $opts{ld}
    3535);

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

    r3783 r3785  
    4343tst_psImageManip_SOURCES =  tst_psImageManip.c
    4444tst_psImageStats_SOURCES =  tst_psImageStats.c
    45 tst_psImageStatsSpeed_SOURCES =  tst_psImageStatsSpeed.c
    4645tst_psImageExtraction_SOURCES =  tst_psImageExtraction.c
    4746tst_psImageConvolve_SOURCES =  tst_psImageConvolve.c
Note: See TracChangeset for help on using the changeset viewer.