faubackup2 HACKING,1.2,1.3 Makefile.am,1.5,1.6 configure.ac,1.15,1.16
Martin Waitz <[email protected]> Fri, 10 Jun 2005 14:55:55 +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-serv29575 Modified Files: HACKING Makefile.am configure.ac Log Message: use argp argument parser Index: configure.ac =================================================================== RCS file: /cvsroot/faubackup/faubackup2/configure.ac,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** configure.ac 10 Jun 2005 09:05:11 -0000 1.15 --- configure.ac 10 Jun 2005 14:55:53 -0000 1.16 *************** *** 3,6 **** --- 3,7 ---- AC_INIT(FauBackup, 0.1, [email protected]) AC_CONFIG_SRCDIR(src/main.cpp) + AC_CONFIG_LIBOBJ_DIR(lib) AM_INIT_AUTOMAKE *************** *** 20,23 **** --- 21,28 ---- [DOXYGEN=$withval], [DOXYGEN=auto] ) + AC_ARG_WITH(included-argp, + AC_HELP_STRING([--with-included-argp], [force use of included libargp]), + [USE_INCLUDED_ARGP=$withval], [USE_INCLUDED_ARGP=auto] + ) # Checks for system services. *************** *** 29,38 **** # check for compilers AC_PROG_CC ! AC_PROG_RANLIB AC_LANG_CPLUSPLUS AC_PROG_CXX AC_PROG_RANLIB WARNINGS="-Wall -Wshadow -Wundef -Wwrite-strings" WARNINGS="$WARNINGS -Wpointer-arith -Wcast-qual -Wcast-align" --- 34,50 ---- # check for compilers AC_PROG_CC ! AM_PROG_CC_STDC AC_LANG_CPLUSPLUS AC_PROG_CXX + + AC_PROG_MAKE_SET AC_PROG_RANLIB + if test "x$am_cv_prog_cc_stdc" = xno ; then + AC_ERROR([the C compiler doesn't handle ANSI-C]) + fi + + WARNINGS="-Wall -Wshadow -Wundef -Wwrite-strings" WARNINGS="$WARNINGS -Wpointer-arith -Wcast-qual -Wcast-align" *************** *** 45,53 **** # Checks for libraries. - AC_CHECK_LIB(popt, poptGetContext, , AC_MSG_ERROR([Please install libpopt])) AC_CHECK_LIB(rsync, rs_sig_file, , AC_MSG_ERROR([Please install librsync])) AC_CHECK_LIB(boost_regex, regcompW, , AC_MSG_ERROR([Please install libboost])) AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR([Please install pthread])) ! # Checks for header files. --- 57,71 ---- # Checks for libraries. AC_CHECK_LIB(rsync, rs_sig_file, , AC_MSG_ERROR([Please install librsync])) AC_CHECK_LIB(boost_regex, regcompW, , AC_MSG_ERROR([Please install libboost])) AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR([Please install pthread])) ! if test "$USE_INCLUDED_ARGP" = auto; then ! AC_SEARCH_LIBS(argp_parse, argp, ! [USE_INCLUDED_ARGP=no], [USE_INCLUDED_ARGP=yes]) ! fi ! if test "$USE_INCLUDED_ARGP" = yes; then ! AC_SUBST([ARGP_CFLAGS], ['-I ${top_srcdir}/argp']) ! AC_SUBST([ARGP_LDADD], ['${top_builddir}/argp/libargp.a']) ! fi # Checks for header files. *************** *** 55,78 **** AC_HEADER_STDC 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 AC_TYPE_MODE_T AC_CHECK_MEMBERS([struct stat.st_rdev]) ! AC_STRUCT_TM # Checks for library functions. ! AC_FUNC_CHOWN ! AC_FUNC_CLOSEDIR_VOID ! AC_FUNC_LSTAT ! AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK ! AC_FUNC_MALLOC ! AC_FUNC_MEMCMP ! AC_FUNC_STAT ! AC_FUNC_UTIME_NULL AC_CHECK_FUNCS([lchown mkdir strerror strstr strtol utime time2posix]) ! AC_C_BIGENDIAN --- 73,100 ---- AC_HEADER_STDC AC_CHECK_HEADERS([fcntl.h netinet/in.h stdlib.h string.h unistd.h utime.h]) + AC_CHECK_HEADERS([limits.h malloc.h sysexits.h stdarg.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST + AC_C_INLINE + AC_C_BIGENDIAN + AC_STRUCT_TM AC_TYPE_MODE_T + AC_TYPE_SIZE_T AC_CHECK_MEMBERS([struct stat.st_rdev]) ! LSH_GCC_ATTRIBUTES # Checks for library functions. ! AC_FUNC_ALLOCA AC_CHECK_FUNCS([lchown mkdir strerror strstr strtol utime time2posix]) ! AC_CHECK_FUNCS([strerror sleep getpid snprintf]) ! AC_CHECK_FUNCS([flockfile putc_unlocked fputs_unlocked fwrite_unlocked]) ! ! AC_CHECK_DECLS([program_invocation_name, program_invocation_short_name], ! [], [], [[#include <errno.h>]]) ! ! AC_REPLACE_FUNCS([mempcpy strndup strchrnul]) *************** *** 93,101 **** 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) - # calculate the expanded value of some variables --- 115,126 ---- if test "$DOXYGEN" = no; then DOXYGEN=; fi + AC_CHECK_PROG(HAVE_DOT, dot, YES, NO) + + + # Makefile conditionals + AM_CONDITIONAL(USE_INCLUDED_ARGP, [test "$USE_INCLUDED_ARGP" = yes]) AM_CONDITIONAL(HAVE_XMLTO, [test -n "$XMLTO" ]) AM_CONDITIONAL(HAVE_DOXYGEN, [test -n "$DOXYGEN" ]) # calculate the expanded value of some variables *************** *** 105,108 **** --- 130,134 ---- AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR", [location of locale data]) + # Write configuration AC_CONFIG_FILES([ *************** *** 113,116 **** --- 139,143 ---- documentation/Doxyfile documentation/manual.xml + argp/Makefile intl/Makefile po/Makefile.in Index: Makefile.am =================================================================== RCS file: /cvsroot/faubackup/faubackup2/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.am 9 Jun 2005 10:57:30 -0000 1.5 --- Makefile.am 10 Jun 2005 14:55:53 -0000 1.6 *************** *** 1,4 **** ! SUBDIRS=intl src tests documentation po dist_sysconf_DATA = faubackup.conf --- 1,4 ---- ! SUBDIRS = argp intl src tests documentation po dist_sysconf_DATA = faubackup.conf Index: HACKING =================================================================== RCS file: /cvsroot/faubackup/faubackup2/HACKING,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** HACKING 10 Jun 2005 07:50:50 -0000 1.2 --- HACKING 10 Jun 2005 14:55:53 -0000 1.3 *************** *** 13,16 **** --- 13,20 ---- o documentation: Project documentation, including manual and manpages + o argp: + The GNU argument parser + This directory is only used when the target system + does not have glibc or libargp. o intl: Support library for internationalization. *************** *** 29,32 **** --- 33,39 ---- Please provide new tests if you find a problem somewhere. + The three most important directories are documentation, src, and tests. + All other are for support files only. + Contributing ------------------------------------------------------- This SF.Net email is sponsored by: NEC IT Guy Games. How far can you shotput a projector? How fast can you ride your desk chair down the office luge track? If you want to score the big prize, get to know the little guy. Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20