From: Andr? L. A. <st...@us...> - 2004-03-24 23:40:46
|
Update of /cvsroot/uts/uts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29778 Modified Files: configure.ac Log Message: Added camfits.st7. Added sbigudrv tests to configure scripts. PROBLEM: camfits.st7 uses CXX, and CFLAGS are not added to CXXFLAGS, i.e., sbigudrv.h can not be found in -I(...). camfits.st7 can't compile by now. Index: configure.ac =================================================================== RCS file: /cvsroot/uts/uts/configure.ac,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** configure.ac 24 Mar 2004 22:26:25 -0000 1.3 --- configure.ac 24 Mar 2004 23:30:04 -0000 1.4 *************** *** 8,11 **** --- 8,12 ---- # Checks for programs. AC_PROG_CC + AC_PROG_CXX # Checks for header files. *************** *** 30,35 **** --- 31,38 ---- AC_HELP_STRING([--with-cfitsio[=DIR]],[Path to CFITSIO library]), [ if test $withval != "yes"; then + if test -f $withval/include/fitsio.h; then LDFLAGS="$LDFLAGS -L$withval/lib" CFLAGS="$CFLAGS -I$withval/include" + fi fi ]) *************** *** 73,76 **** --- 76,102 ---- ]) + AC_ARG_WITH(sbigudrv, + AC_HELP_STRING([--with-sbigudrv[=DIR]],[Path to sbigudrv (SBIG Universal driver) library]), + [ if test $withval != "yes"; then + if test -f $withval/include/sbigudrv.h; then + LDFLAGS="$LDFLAGS -L$withval/lib" + CFLAGS="$CFLAGS -I$withval/include" + fi + fi + ]) + + AC_ARG_WITH(sbigudrv-libdir, + AC_HELP_STRING([--with-sbigudrv-libdir[=DIR]],[Path to sbigudrv (SBIG Universal driver) library directory]), + [ if test $withval != "yes"; then + LDFLAGS="$LDFLAGS -L$withval" + fi + ]) + + AC_ARG_WITH(sbigudrv-incdir, + AC_HELP_STRING([--with-sbigudrv-incdir[=DIR]],[Path to sbigudrv (SBIG Universal driver) includes directory]), + [ if test $withval != "yes"; then + CFLAGS="$CFLAGS -I$withval" + fi + ]) # Checks for libraries. *************** *** 84,87 **** --- 110,116 ---- AC_MSG_ERROR(*** Cannot find simpleskts. Use --with-simpleskts=PATH.)) + AC_CHECK_LIB([sbigudrv], [SBIGUnivDrvCommand], [AC_DEFINE([HAVE_SBIGUDRV], [1], [Have SBIG Unversal Driver])], + AC_MSG_ERROR(*** Cannot find sbigudrv. Use --with-sbigudrv=PATH.)) + # better CFLAGS |