IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Apr 4, 2005, 12:21:18 PM (21 years ago)
Author:
desonia
Message:

merged changes from rel5.

Location:
trunk/psModules
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules

    • Property svn:ignore

      •  

        old new  
        77aclocal.m4
        88configure
         9Doxyfile
         10DoxygenLog
         11docs
         12man
         13psmodule-config
         14psmodule.pc
         15bin
         16include
         17lib

  • trunk/psModules/configure.ac

    r3636 r3651  
    1010AC_SUBST(CFLAGS)
    1111
    12 CFLAGS="${CFLAGS=} -Wall -Werror -std=c99 -D_GNU_SOURCE"
     12AC_MSG_CHECKING([C99 flag])
     13if test "$GCC" == "yes"
     14then
     15CFLAGS="${CFLAGS=} -std=gnu99"
     16AC_MSG_RESULT([-std=gnu99])
     17else
     18CFLAGS="${CFLAGS=} -std=c99"
     19AC_MSG_RESULT([-std=c99])
     20fi
     21
     22AC_GNU_SOURCE
    1323
    1424AC_PROG_INSTALL
    1525AM_PROG_LIBTOOL
     26
     27AC_PREFIX_DEFAULT([`pwd`])
     28test "$prefix" = NONE && prefix=`pwd`
     29
     30DOXYGEN="doxygen Doxyfile"
     31AC_CHECK_PROG(DOXYGEN,doxygen,[echo Doxygen not detected in configure stage.])
     32AC_SUBST(DOXYGEN,$DOXYGEN)
    1633
    1734AC_ARG_WITH(pslib-config,
    … …  
    3350AC_CHECK_LIB(pslib,main,,AC_MSG_ERROR(psLib library required))
    3451
    35 AC_OUTPUT(Makefile src/Makefile test/Makefile)
     52CFLAGS="${CFLAGS=} -Wall -Werror"
     53
     54AC_CONFIG_FILES([Makefile])
     55AC_CONFIG_FILES([src/Makefile])
     56AC_CONFIG_FILES([test/Makefile])
     57AC_CONFIG_FILES([Doxyfile])
     58AC_CONFIG_FILES([psmodule-config])
     59AC_CONFIG_FILES([psmodule.pc])
     60
     61AC_OUTPUT
Note: See TracChangeset for help on using the changeset viewer.