From 2655d9e8fad38acd4ce7388c0ba3eaaa976d6940 Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 1 Jul 2012 14:52:45 +0100 Subject: [PATCH] Moved config.h to source folder --- .gitignore | 4 ++-- Makefile.am | 14 ++++++++++++++ bootstrap.sh | 3 +++ configure.ac | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 Makefile.am create mode 100755 bootstrap.sh create mode 100644 configure.ac diff --git a/.gitignore b/.gitignore index e5c765ae..46201620 100644 --- a/.gitignore +++ b/.gitignore @@ -15,8 +15,8 @@ Makefile Makefile.in aclocal.m4 autom4te.cache/ -config.h -config.h.in +src/config.h +src/config.h.in config.status configure configure.scan diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 00000000..0fc91e46 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,14 @@ +CFLAGS = -O3 -Werror -Wall -Wextra -Wno-unused-parameter -Wno-unused-but-set-variable \ + -Wno-unused-result -lncurses -lstrophe -lxml2 -lexpat -lssl -lresolv \ + `pkg-config --libs --cflags glib-2.0` `pkg-config --libs --cflags libnotify` + + +bin_PROGRAMS = profanity +profanity_SOURCES = src/command.c src/contact.c src/history.c src/jabber.h \ + src/preferences.c src/prof_autocomplete.c src/status_bar.c src/util.h \ + src/command.h src/contact.h src/history.h src/log.c src/preferences.h \ + src/prof_autocomplete.h src/title_bar.c src/windows.c src/common.c \ + src/contact_list.c src/input_win.c src/log.h src/profanity.c \ + src/prof_history.c src/ui.h src/common.h src/ contact_list.h src/jabber.c \ + src/main.c src/profanity.h src/prof_history.h src/util.c + diff --git a/bootstrap.sh b/bootstrap.sh new file mode 100755 index 00000000..c5a7472d --- /dev/null +++ b/bootstrap.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +autoreconf --install diff --git a/configure.ac b/configure.ac new file mode 100644 index 00000000..1559d287 --- /dev/null +++ b/configure.ac @@ -0,0 +1,37 @@ +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + +AC_PREREQ([2.69]) +AC_INIT([profanity], [0.10], [boothj5web@gmail.com]) +AM_INIT_AUTOMAKE([foreign]) +AC_CONFIG_SRCDIR([src/main.c]) +AC_CONFIG_HEADERS([src/config.h]) + +# Checks for programs. +AC_PROG_CC + +# Checks for libraries. +# FIXME: Replace `main' with a function in `-lexpat': +AC_CHECK_LIB([expat], [main]) +# FIXME: Replace `main' with a function in `-lncurses': +AC_CHECK_LIB([ncurses], [main]) +# FIXME: Replace `main' with a function in `-lresolv': +AC_CHECK_LIB([resolv], [main]) +# FIXME: Replace `main' with a function in `-lssl': +AC_CHECK_LIB([ssl], [main]) +# FIXME: Replace `main' with a function in `-lstrophe': +AC_CHECK_LIB([strophe], [main]) +# FIXME: Replace `main' with a function in `-lxml2': +AC_CHECK_LIB([xml2], [main]) + +# Checks for header files. +AC_CHECK_HEADERS([stdlib.h string.h]) + +# Checks for typedefs, structures, and compiler characteristics. + +# Checks for library functions. +AC_FUNC_MALLOC +AC_CHECK_FUNCS([atexit memset strdup strndup strstr]) + +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT