diff options
| author | James Booth <boothj5@gmail.com> | 2012-07-02 00:36:30 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2012-07-02 00:36:30 +0100 |
| commit | 11066f204b327dfa1d741d2127b4c2405bf1fb0f (patch) | |
| tree | 79f7ddb011542a3f5ce1e238a9294870efbf5a32 | |
| parent | 28f5cdf786774cf683821012be36605cbcab0893 (diff) | |
| download | profani-tty-11066f204b327dfa1d741d2127b4c2405bf1fb0f.tar.gz | |
Set compiler, preprocessor flags in configure.ac
Picked up and used in Makefile.am
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 21 |
2 files changed, 14 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index 0fc91e46..d86c7854 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ 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` - + -Wno-unused-result $(NCURSES_CFLAGS) $(NCURSES_LIBS) -lstrophe -lxml2 -lexpat \ + $(OPENSSL_CFLAGS) $(OPENSSL_LIBS) -lresolv $(GLIB_CFLAGS) $(GLIB_LIBS) \ + $(NOTIFY_CFLAGS) $(NOTIFY_LIBS) bin_PROGRAMS = profanity profanity_SOURCES = src/command.c src/contact.c src/history.c src/jabber.h \ diff --git a/configure.ac b/configure.ac index 32dda324..01d6d1cb 100644 --- a/configure.ac +++ b/configure.ac @@ -11,28 +11,29 @@ AC_CONFIG_HEADERS([src/config.h]) AC_PROG_CC # Checks for libraries. -# FIXME: Replace `main' with a function in `-lexpat': -AC_CHECK_LIB([expat], [main], [], [AC_MSG_ERROR([expat is required for profanity])]) -# FIXME: Replace `main' with a function in `-lncurses': AC_CHECK_LIB([ncurses], [main], [], [AC_MSG_ERROR([ncurses is required for profanity])]) -# FIXME: Replace `main' with a function in `-lresolv': AC_CHECK_LIB([resolv], [main], [], [AC_MSG_ERROR([libresolv is required for profanity])]) -# FIXME: Replace `main' with a function in `-lssl': AC_CHECK_LIB([ssl], [main], [], [AC_MSG_ERROR([openssl is required for profanity])]) -# FIXME: Replace `main' with a function in `-lstrophe': AC_CHECK_LIB([strophe], [main], [], [AC_MSG_ERROR([libstrophe is required for profanity])]) -# FIXME: Replace `main' with a function in `-lxml2': +AC_CHECK_LIB([expat], [main], [], [AC_MSG_ERROR([expat is required for profanity])]) AC_CHECK_LIB([xml2], [main], [], [AC_MSG_ERROR([xml2 is required for profanity])]) AC_CHECK_LIB([glib], [main], [], [AC_MSG_ERROR([glib is required for profanity])]) -CFLAGS="$CFLAGS `pkg-config --cflags --libs libnotify`" - # Checks for header files. AC_CHECK_HEADERS([stdlib.h string.h]) -# Checks for typedefs, structures, and compiler characteristics. + +PKG_CHECK_MODULES([OPENSSL], [openssl]) +PKG_CHECK_MODULES([NCURSES], [ncurses]) +PKG_CHECK_MODULES([GLIB], [glib-2.0]) +PKG_CHECK_MODULES([NOTIFY], [libnotify]) + +CFLAGS="$CFLAGS $GLIB_CFLAGS $GLIB_LIBS $NOTIFY_CFLAGS $NOTIFY_LIBS" +CPPFLAGS="$CPPFLAGS $GLIB_CFLAGS $GLIB_LIBS $NOTIFY_CFLAGS $NOTIFY_LIBS" AC_CHECK_HEADERS([libnotify/notify.h], [], [AC_MSG_NOTICE([libnotify not found, desktop notification option not included])]) +# Checks for typedefs, structures, and compiler characteristics. + # Checks for library functions. AC_FUNC_MALLOC AC_CHECK_FUNCS([atexit memset strdup strndup strstr]) |