Damitha Kumarage wrote:
Hi Anuradha,
Anuradha Ratnaweera wrote:
Hi all,
I finally got make dist working! But it needed a lot of
`improvements' all over the place. This is the first set of them, and
they are for the configure.ac file. Here is an un-summary of changes:
(summarizing is shortening, and the explainations below are _bigger_
than actual code changes, so I am calling it an un-summary ;-) ).
- Changed the order of doing things to match the order
- AC_INIT and AM_INIT_AUTOMAKE gets the package name properly (without
this, make dist fails. Check for PACKAGE= and VERSION= values in
Makefile without them)
- Removed AC_CONFIG_AUX_DIR. It is to be used for a different reason
which we don't need here. make dist doesn't work without this change.
The directory conftools can go away from SVN too.
- Removed AC_PROG_LIBTOOL (one AM_PROG_LIBTOOL is enough)
- Replaced LDFLAGS setting with a test (AC_CHECK_LIB) for cutest
I had a plan to remove cutest from LDFLAGS because then main module is
link wise
independant of cutest. Cutest is needed for only unit tests which is
not included in
the source build. To build unit tests we need to go into the c/test
folder and make it.
So testing for cutest in configure.ac is not required.
So shall we remove checking for cutest?
+1 for removing cutest from source build. cutest should only be visible
to developers.
Samisa...
- Removed setting LIBS to -ldl, because AC_CHECK_LIB automatically
sets that
- Changed # to dnl everywhere (standard practice)
I have attached both the patch and configure.ac itself. I don't think
it _breaks_ anything, but mostly rearranging and removing.
Anuradha
--
http://anuradha-ratnaweera.blogspot.com
http://www.linux.lk/~anuradha/
------------------------------------------------------------------------
Index: configure.ac
===================================================================
--- configure.ac (revision 354402)
+++ configure.ac (working copy)
@@ -1,40 +1,38 @@
-# run autogen.sh to generate the configure script.
+dnl run autogen.sh to generate the configure script.
AC_PREREQ(2.59)
+
AC_INIT(axis2, 1.0.0)
-AC_CONFIG_SRCDIR([modules/common/src/axis2.c])
-AC_CONFIG_AUX_DIR(conftools)
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE
-AC_CONFIG_HEADER(config.h)
-AC_PROG_LIBTOOL
-# Checks for programs.
-AC_PROG_CXX
+AM_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+
+AC_CONFIG_SRCDIR([modules/common/src/axis2.c])
+
+dnl Checks for programs.
AC_PROG_CC
+AC_PROG_CXX
AC_PROG_CPP
+AM_PROG_LIBTOOL
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
-# Checks for libraries.
+dnl Checks for libraries.
AC_CHECK_LIB(dl, dlopen)
+AC_CHECK_LIB(cutest, CuTestInit)
-#using libtool
-AM_PROG_LIBTOOL
-
CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE -g3 -O2"
#CFLAGS="$CFLAGS -Wall -ansi -Wshadow -DLINUX=2 -D_REENTRANT
-D_GNU_SOURCE -D_LARGEFILE64_SOURCE -g -O2 -pthread"
-LDFLAGS="$LDFLAGS -L${CUTEST_HOME}/lib/"
-LIBS="-ldl"
-# Checks for header files.
+dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([stdio.h stdlib.h string.h])
-# Checks for typedefs, structures, and compiler characteristics.
+dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
-# Checks for library functions.
+dnl Checks for library functions.
AC_FUNC_MALLOC
AC_FUNC_REALLOC
#AC_CHECK_FUNCS([memmove])
