diff options
| -rwxr-xr-x | Makefile.am | 20 | ||||
| -rwxr-xr-x | configure.ac | 102 | ||||
| -rwxr-xr-x | src/Makefile.am | 34 |
3 files changed, 107 insertions, 49 deletions
diff --git a/Makefile.am b/Makefile.am index c363b29..f30d030 100755 --- a/Makefile.am +++ b/Makefile.am @@ -1,12 +1,18 @@ -# $calcurse: Makefile.am,v 1.2 2006/09/09 20:21:16 culot Exp $ +# $calcurse: Makefile.am,v 1.3 2007/07/28 15:04:52 culot Exp $ AUTOMAKE_OPTIONS= gnu -SUBDIRS = po src -EXTRA_DIST = ABOUT-NLS \ - doc/manual_en.html \ - doc/manual_fr.html \ - doc/manual_de.html \ - doc/manual_es.html ACLOCAL_AMFLAGS = -I m4 +SUBDIRS = po src + +man_MANS= src/calcurse.1 + +EXTRA_DIST = \ + $(man_MANS) \ + ABOUT-NLS \ + doc/manual_en.html \ + doc/manual_fr.html \ + doc/manual_de.html \ + doc/manual_es.html \ + doc/manual_nl.html diff --git a/configure.ac b/configure.ac index b450cf1..9d20ba0 100755 --- a/configure.ac +++ b/configure.ac @@ -1,48 +1,86 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. -# -# $calcurse: configure.ac,v 1.10 2007/05/22 18:02:49 culot Exp $ +# $calcurse: configure.ac,v 1.11 2007/07/28 15:04:52 culot Exp $ +#------------------------------------------------------------------------------- +# Init +#------------------------------------------------------------------------------- AC_PREREQ(2.59) -AC_INIT(calcurse, 1.8, frederic@culot.org) +AC_INIT(calcurse, 1.9_beta, frederic@culot.org) AM_INIT_AUTOMAKE AM_GNU_GETTEXT([external]) AC_CONFIG_SRCDIR([src/calcurse.c]) AC_CONFIG_HEADER([config.h]) - -# Checks for programs. +#------------------------------------------------------------------------------- +# Checks for system type +#------------------------------------------------------------------------------- +AC_CANONICAL_HOST +#------------------------------------------------------------------------------- +# Checks for programs +#------------------------------------------------------------------------------- AC_PROG_CC - -# Checks for ncurses. +#------------------------------------------------------------------------------- +# Checks for header files +#------------------------------------------------------------------------------- +AC_HEADER_STDC +AC_CHECK_HEADERS([ctype.h getopt.h locale.h math.h signal.h stdbool.h stdio.h \ + stdlib.h string.h sys/stat.h sys/types.h sys/wait.h time.h \ + unistd.h]) +#------------------------------------------------------------------------------- +# Checks for system libs +#------------------------------------------------------------------------------- AC_CHECK_HEADERS([ncurses.h], [ AC_CHECK_LIB(ncurses, initscr, [ LIBS="$LIBS -lncurses" - AC_DEFINE(HAVE_LIBNCURSES, 1, [Define to 1 if you have the 'ncurses' library (-lncurses).]) - ], AC_MSG_ERROR(The ncurses library is required in order to build the program!)) -], AC_MSG_ERROR(The ncurses header is required in order to build the program!)) + AC_DEFINE(HAVE_LIBNCURSES, 1, + [Define to 1 if you have the 'ncurses' library (-lncurses).]) + ], + AC_MSG_ERROR(The ncurses library is required in order to build calcurse!)) +], AC_MSG_ERROR(The ncurses header is required in order to build calcurse!)) -# Checks for pthread. AC_CHECK_HEADERS([pthread.h], [ AC_CHECK_LIB(pthread, pthread_create, [ LIBS="$LIBS -lpthread" - AC_DEFINE(HAVE_LIBNCURSES, 1, [Define to 1 if you have the 'pthread' library (-lpthread).]) - ], AC_MSG_ERROR(The pthread library is required in order to build the program!)) -], AC_MSG_ERROR(The pthread header is required in order to build the program!)) - -# Checks for header files. -AC_HEADER_STDC -AC_CHECK_HEADERS([stdlib.h string.h sys/time.h time.h stdio.h unistd.h getopt.h \ -sys/types.h ctype.h getopt.h sys/wait.h signal.h math.h]) - -# Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_STRUCT_TM -AC_HEADER_STDBOOL - -# Checks for library functions. -AC_FUNC_MALLOC -AC_FUNC_MKTIME -AC_FUNC_STRFTIME -AC_CHECK_FUNCS([floor mkdir strchr]) + AC_DEFINE(HAVE_LIBNCURSES, 1, + [Define to 1 if you have the 'pthread' library (-lpthread).]) + ], + AC_MSG_ERROR(The pthread library is required in order to build calcurse!)) +], AC_MSG_ERROR(The pthread header is required in order to build calcurse!)) +AC_CHECK_HEADERS([math.h], [ + AC_CHECK_LIB(m, exp, [ + LIBS="$LIBS -lm" + AC_DEFINE(HAVE_LIBMATH, 1, + [Define to 1 if you have the 'math' library (-lm).]) + ], + AC_MSG_ERROR(The math library is required in order to build calcurse!)) +], AC_MSG_ERROR(The math header is required in order to build calcurse!)) +#------------------------------------------------------------------------------- +# Compilation options +#------------------------------------------------------------------------------- +CFLAGS="-O2 -Wall -g" +#------------------------------------------------------------------------------- +# Create Makefiles +#------------------------------------------------------------------------------- AC_OUTPUT(Makefile src/Makefile po/Makefile.in po/Makefile) +#------------------------------------------------------------------------------- +# Summary +#------------------------------------------------------------------------------- +echo +echo "========================================================================" +echo "$PACKAGE is configured as follows." +echo "Please check that this configuration matches your expectations." +echo "Also give a look at the config.h file to check for preprocessor symbols." +echo +echo "Host system type : $host" +echo +echo "Options used to compile and link:" +echo " PREFIX = $prefix" +echo " VERSION = $PACKAGE_VERSION" +echo " CC = $CC" +echo " CFLAGS = $CFLAGS" +echo " CPPFLAGS = $CPPFLAGS" +echo " DEFS = $DEFS" +echo " LD = $LD" +echo " LDFLAGS = $LDFLAGS" +echo " LIBS = $LIBS" +echo "========================================================================" +echo diff --git a/src/Makefile.am b/src/Makefile.am index 16e4025..3f2c1b5 100755 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,17 +1,31 @@ -# $calcurse: Makefile.am,v 1.5 2007/07/23 19:24:03 culot Exp $ +# $calcurse: Makefile.am,v 1.6 2007/07/28 15:04:52 culot Exp $ AUTOMAKE_OPTIONS= gnu + bin_PROGRAMS= calcurse -calcurse_SOURCES= calcurse.c apoint.c event.c todo.c utils.c\ - calendar.c vars.c io.c help.c custom.c args.c\ - day.c recur.c notify.c wins.c sigs.c \ - apoint.h event.h todo.h utils.h calendar.h\ - vars.h io.h help.h custom.h args.h i18n.h\ - day.h recur.h notify.h wins.h sigs.h -LIBS= -lncurses -lpthread -lm + +calcurse_SOURCES= \ + calcurse.c i18n.h \ + apoint.c apoint.h \ + args.c args.h \ + calendar.c calendar.h \ + custom.c custom.h \ + day.c day.h \ + event.c event.h \ + help.c help.h \ + io.c io.h \ + notify.c notify.h \ + recur.c recur.h \ + sigs.c sigs.h \ + todo.c todo.h \ + utils.c utils.h \ + vars.c vars.h \ + wins.c wins.h + LDADD= @LTLIBINTL@ + datadir= @datadir@ + localedir= $(datadir)/locale + DEFS= -DLOCALEDIR=\"$(localedir)\" @DEFS@ -man_MANS= calcurse.1 -EXTRA_DIST= calcurse.1 |