faubackup2 configure.ac,1.8,1.9
Martin Waitz <[email protected]> Fri, 03 Jun 2005 11:43:40 +0000
| Newsgroups | gmane.comp.sysutils.backup.faubackup.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/faubackup/faubackup2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17655 Modified Files: configure.ac Log Message: cleanup Index: configure.ac =================================================================== RCS file: /cvsroot/faubackup/faubackup2/configure.ac,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** configure.ac 3 Jun 2005 09:56:15 -0000 1.8 --- configure.ac 3 Jun 2005 11:43:38 -0000 1.9 *************** *** 1,9 **** ! AC_PREREQ(2.53) ! AC_INIT(faubackup, 0.1, [email protected]) AC_CONFIG_SRCDIR(src/main.cpp) ! AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION) AM_CONFIG_HEADER(config.h) # commandline configuration --- 1,11 ---- ! dnl Process this file with autoconf to produce the configure script. AC_PREREQ(2.53) ! AC_INIT(FauBackup, 0.1, [email protected]) AC_CONFIG_SRCDIR(src/main.cpp) ! AM_INIT_AUTOMAKE AM_CONFIG_HEADER(config.h) + AM_SANITY_CHECK + # commandline configuration *************** *** 17,56 **** ) - # check for compilers AC_PROG_CC AC_PROG_RANLIB - AC_LANG_CPLUSPLUS AC_PROG_CXX AC_PROG_RANLIB ! # check for documentation generation programs ! if test "$XMLTO" = auto; then ! XMLTO= ! AC_CHECK_PROGS(XMLTO, xmlto) ! fi ! if test "$DOXYGEN" = auto; then ! DOXYGEN= ! AC_CHECK_PROGS(DOXYGEN, doxygen) fi - if test "$XMLTO" = no; then XMLTO=; fi - if test "$DOXYGEN" = no; then DOXYGEN=; fi - - AM_CONDITIONAL(HAVE_XMLTO, [test -n "$XMLTO" ]) - AM_CONDITIONAL(HAVE_DOXYGEN, [test -n "$DOXYGEN" ]) ! AC_CHECK_PROG(HAVE_DOT, dot, YES, NO) ! ! ! #GCC Settings ! CC=gcc ! CFLAGS="-D_REENTRANT -O2 -Wall -Wshadow -Wundef -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align $CFLAGS" - CXX=g++ - CXXFLAGS="-DREENTRANT -O2 -Wall -pedantic -ansi -D_XOPEN_SOURCE -D_BSD_SOURCE" # Checks for libraries. --- 19,45 ---- ) # check for compilers AC_PROG_CC AC_PROG_RANLIB AC_LANG_CPLUSPLUS AC_PROG_CXX AC_PROG_RANLIB + AC_DEFINE(_GNU_SOURCE, 1, [Enable GNU extensions on systems that have them]) + AC_DEFINE(_REENTRANT, 1, [enable reentrant functions]) ! WARNINGS="-Wall -Wshadow -Wundef -Wwrite-strings" ! WARNINGS="$WARNINGS -Wmissing-prototypes -Wstrict-prototypes" ! WARNINGS="$WARNINGS -Wpointer-arith -Wcast-qual -Wcast-align" ! if test "$GCC" = yes -a "$ac_test_CFLAGS" != set; then ! CFLAGS="$CFLAGS $WARNINGS" ! CXXFLAGS="$CXXFLAGS $WARNINGS" fi ! # Checks for system services. ! AC_SYS_LARGEFILE # Checks for libraries. *************** *** 60,68 **** AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR([Please install pthread])) - AM_SANITY_CHECK - - - - # Checks for header files. --- 49,52 ---- *************** *** 71,74 **** --- 55,59 ---- AC_CHECK_HEADERS([fcntl.h netinet/in.h stdlib.h string.h unistd.h utime.h]) + # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST *************** *** 77,80 **** --- 62,66 ---- AC_STRUCT_TM + # Checks for library functions. AC_FUNC_CHOWN *************** *** 89,95 **** AC_C_BIGENDIAN - # Checks for system services. - AC_SYS_LARGEFILE AC_CONFIG_FILES([ Makefile --- 75,99 ---- AC_C_BIGENDIAN + # check for documentation generation programs + if test "$XMLTO" = auto; then + XMLTO= + AC_CHECK_PROGS(XMLTO, xmlto) + fi + if test "$DOXYGEN" = auto; then + DOXYGEN= + AC_CHECK_PROGS(DOXYGEN, doxygen) + fi + + if test "$XMLTO" = no; then XMLTO=; fi + if test "$DOXYGEN" = no; then DOXYGEN=; fi + + AM_CONDITIONAL(HAVE_XMLTO, [test -n "$XMLTO" ]) + AM_CONDITIONAL(HAVE_DOXYGEN, [test -n "$DOXYGEN" ]) + + AC_CHECK_PROG(HAVE_DOT, dot, YES, NO) + + + # Write configuration AC_CONFIG_FILES([ Makefile *************** *** 102,106 **** AC_CONFIG_FILES([tests/tests], [chmod +x tests/tests]) - AC_OUTPUT --- 106,109 ---- ------------------------------------------------------- This SF.Net email is sponsored by Yahoo. Introducing Yahoo! Search Developer Network - Create apps using Yahoo! Search APIs Find out how you can build Yahoo! directly into your own Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005