Skip to content

Commit 38adc40

Browse files
author
israel.ekpo
committed
Adding more stuff to the configure.ac file
Also added and made changes to the LICENSE file M trunk/csv_parser-config.in M trunk/configure M trunk/LICENSE M trunk/configure.ac The csv_parser-config file has also be fine tuned to actual usage
1 parent d7e49de commit 38adc40

File tree

4 files changed

+131
-72
lines changed

4 files changed

+131
-72
lines changed

‎LICENSE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ Redistribution and use in source and binary forms, with or without modification,
1010

1111
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1212

13+

‎configure

Lines changed: 71 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
99
# This configure script is free software; the Free Software Foundation
1010
# gives unlimited permission to copy, distribute and modify it.
11+
#
12+
# Copyright (C) 2008 - 2009, Israel Ekpo, <[email protected]>
1113
## --------------------- ##
1214
## M4sh Initialization. ##
1315
## --------------------- ##
@@ -1574,6 +1576,8 @@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
15741576
2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
15751577
This configure script is free software; the Free Software Foundation
15761578
gives unlimited permission to copy, distribute and modify it.
1579+
1580+
Copyright (C) 2008 - 2009, Israel Ekpo, <[email protected]>
15771581
_ACEOF
15781582
exit
15791583
fi
@@ -4902,7 +4906,7 @@ ia64-*-hpux*)
49024906
;;
49034907
*-*-irix6*)
49044908
# Find out which ABI we are using.
4905-
echo '#line 4905 "configure"' > conftest.$ac_ext
4909+
echo '#line 4909 "configure"' > conftest.$ac_ext
49064910
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
49074911
(eval $ac_compile) 2>&5
49084912
ac_status=$?
@@ -7486,11 +7490,11 @@ else
74867490
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
74877491
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
74887492
-e 's:$: $lt_compiler_flag:'`
7489-
(eval echo "\"\$as_me:7489: $lt_compile\"" >&5)
7493+
(eval echo "\"\$as_me:7493: $lt_compile\"" >&5)
74907494
(eval "$lt_compile" 2>conftest.err)
74917495
ac_status=$?
74927496
cat conftest.err >&5
7493-
echo "$as_me:7493: \$? = $ac_status" >&5
7497+
echo "$as_me:7497: \$? = $ac_status" >&5
74947498
if (exit $ac_status) && test -s "$ac_outfile"; then
74957499
# The compiler can only warn and ignore the option if not recognized
74967500
# So say no if there are warnings other than the usual output.
@@ -7776,11 +7780,11 @@ else
77767780
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
77777781
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
77787782
-e 's:$: $lt_compiler_flag:'`
7779-
(eval echo "\"\$as_me:7779: $lt_compile\"" >&5)
7783+
(eval echo "\"\$as_me:7783: $lt_compile\"" >&5)
77807784
(eval "$lt_compile" 2>conftest.err)
77817785
ac_status=$?
77827786
cat conftest.err >&5
7783-
echo "$as_me:7783: \$? = $ac_status" >&5
7787+
echo "$as_me:7787: \$? = $ac_status" >&5
77847788
if (exit $ac_status) && test -s "$ac_outfile"; then
77857789
# The compiler can only warn and ignore the option if not recognized
77867790
# So say no if there are warnings other than the usual output.
@@ -7880,11 +7884,11 @@ else
78807884
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
78817885
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
78827886
-e 's:$: $lt_compiler_flag:'`
7883-
(eval echo "\"\$as_me:7883: $lt_compile\"" >&5)
7887+
(eval echo "\"\$as_me:7887: $lt_compile\"" >&5)
78847888
(eval "$lt_compile" 2>out/conftest.err)
78857889
ac_status=$?
78867890
cat out/conftest.err >&5
7887-
echo "$as_me:7887: \$? = $ac_status" >&5
7891+
echo "$as_me:7891: \$? = $ac_status" >&5
78887892
if (exit $ac_status) && test -s out/conftest2.$ac_objext
78897893
then
78907894
# The compiler can only warn and ignore the option if not recognized
@@ -10257,7 +10261,7 @@ else
1025710261
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1025810262
lt_status=$lt_dlunknown
1025910263
cat > conftest.$ac_ext <<EOF
10260-
#line 10260 "configure"
10264+
#line 10264 "configure"
1026110265
#include "confdefs.h"
1026210266

1026310267
#if HAVE_DLFCN_H
@@ -10357,7 +10361,7 @@ else
1035710361
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1035810362
lt_status=$lt_dlunknown
1035910363
cat > conftest.$ac_ext <<EOF
10360-
#line 10360 "configure"
10364+
#line 10364 "configure"
1036110365
#include "confdefs.h"
1036210366

1036310367
#if HAVE_DLFCN_H
@@ -12758,11 +12762,11 @@ else
1275812762
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1275912763
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1276012764
-e 's:$: $lt_compiler_flag:'`
12761-
(eval echo "\"\$as_me:12761: $lt_compile\"" >&5)
12765+
(eval echo "\"\$as_me:12765: $lt_compile\"" >&5)
1276212766
(eval "$lt_compile" 2>conftest.err)
1276312767
ac_status=$?
1276412768
cat conftest.err >&5
12765-
echo "$as_me:12765: \$? = $ac_status" >&5
12769+
echo "$as_me:12769: \$? = $ac_status" >&5
1276612770
if (exit $ac_status) && test -s "$ac_outfile"; then
1276712771
# The compiler can only warn and ignore the option if not recognized
1276812772
# So say no if there are warnings other than the usual output.
@@ -12862,11 +12866,11 @@ else
1286212866
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1286312867
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1286412868
-e 's:$: $lt_compiler_flag:'`
12865-
(eval echo "\"\$as_me:12865: $lt_compile\"" >&5)
12869+
(eval echo "\"\$as_me:12869: $lt_compile\"" >&5)
1286612870
(eval "$lt_compile" 2>out/conftest.err)
1286712871
ac_status=$?
1286812872
cat out/conftest.err >&5
12869-
echo "$as_me:12869: \$? = $ac_status" >&5
12873+
echo "$as_me:12873: \$? = $ac_status" >&5
1287012874
if (exit $ac_status) && test -s out/conftest2.$ac_objext
1287112875
then
1287212876
# The compiler can only warn and ignore the option if not recognized
@@ -14460,11 +14464,11 @@ else
1446014464
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1446114465
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1446214466
-e 's:$: $lt_compiler_flag:'`
14463-
(eval echo "\"\$as_me:14463: $lt_compile\"" >&5)
14467+
(eval echo "\"\$as_me:14467: $lt_compile\"" >&5)
1446414468
(eval "$lt_compile" 2>conftest.err)
1446514469
ac_status=$?
1446614470
cat conftest.err >&5
14467-
echo "$as_me:14467: \$? = $ac_status" >&5
14471+
echo "$as_me:14471: \$? = $ac_status" >&5
1446814472
if (exit $ac_status) && test -s "$ac_outfile"; then
1446914473
# The compiler can only warn and ignore the option if not recognized
1447014474
# So say no if there are warnings other than the usual output.
@@ -14564,11 +14568,11 @@ else
1456414568
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1456514569
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1456614570
-e 's:$: $lt_compiler_flag:'`
14567-
(eval echo "\"\$as_me:14567: $lt_compile\"" >&5)
14571+
(eval echo "\"\$as_me:14571: $lt_compile\"" >&5)
1456814572
(eval "$lt_compile" 2>out/conftest.err)
1456914573
ac_status=$?
1457014574
cat out/conftest.err >&5
14571-
echo "$as_me:14571: \$? = $ac_status" >&5
14575+
echo "$as_me:14575: \$? = $ac_status" >&5
1457214576
if (exit $ac_status) && test -s out/conftest2.$ac_objext
1457314577
then
1457414578
# The compiler can only warn and ignore the option if not recognized
@@ -16784,11 +16788,11 @@ else
1678416788
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1678516789
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1678616790
-e 's:$: $lt_compiler_flag:'`
16787-
(eval echo "\"\$as_me:16787: $lt_compile\"" >&5)
16791+
(eval echo "\"\$as_me:16791: $lt_compile\"" >&5)
1678816792
(eval "$lt_compile" 2>conftest.err)
1678916793
ac_status=$?
1679016794
cat conftest.err >&5
16791-
echo "$as_me:16791: \$? = $ac_status" >&5
16795+
echo "$as_me:16795: \$? = $ac_status" >&5
1679216796
if (exit $ac_status) && test -s "$ac_outfile"; then
1679316797
# The compiler can only warn and ignore the option if not recognized
1679416798
# So say no if there are warnings other than the usual output.
@@ -17074,11 +17078,11 @@ else
1707417078
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1707517079
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1707617080
-e 's:$: $lt_compiler_flag:'`
17077-
(eval echo "\"\$as_me:17077: $lt_compile\"" >&5)
17081+
(eval echo "\"\$as_me:17081: $lt_compile\"" >&5)
1707817082
(eval "$lt_compile" 2>conftest.err)
1707917083
ac_status=$?
1708017084
cat conftest.err >&5
17081-
echo "$as_me:17081: \$? = $ac_status" >&5
17085+
echo "$as_me:17085: \$? = $ac_status" >&5
1708217086
if (exit $ac_status) && test -s "$ac_outfile"; then
1708317087
# The compiler can only warn and ignore the option if not recognized
1708417088
# So say no if there are warnings other than the usual output.
@@ -17178,11 +17182,11 @@ else
1717817182
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1717917183
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1718017184
-e 's:$: $lt_compiler_flag:'`
17181-
(eval echo "\"\$as_me:17181: $lt_compile\"" >&5)
17185+
(eval echo "\"\$as_me:17185: $lt_compile\"" >&5)
1718217186
(eval "$lt_compile" 2>out/conftest.err)
1718317187
ac_status=$?
1718417188
cat out/conftest.err >&5
17185-
echo "$as_me:17185: \$? = $ac_status" >&5
17189+
echo "$as_me:17189: \$? = $ac_status" >&5
1718617190
if (exit $ac_status) && test -s out/conftest2.$ac_objext
1718717191
then
1718817192
# The compiler can only warn and ignore the option if not recognized
@@ -19908,6 +19912,8 @@ fi
1990819912

1990919913

1991019914

19915+
19916+
1991119917
ac_config_files="$ac_config_files Makefile"
1991219918

1991319919
cat >confcache <<\_ACEOF
@@ -22476,3 +22482,45 @@ if test "$no_create" != yes; then
2247622482
$ac_cs_success || { (exit 1); exit 1; }
2247722483
fi
2247822484

22485+
22486+
{ echo "$as_me:$LINENO:
22487+
22488+
Environment configuration has completed successfully.
22489+
22490+
You are now ready to run make and make install.
22491+
22492+
This will install your csv_parser library object code into $prefix/lib and your development header files into $prefix/include/csv_parser
22493+
22494+
+------------------------------------------------------------------------+
22495+
| License: |
22496+
| This software is subject to the new BSD License, available in this |
22497+
| distribution in the file LICENSE. By continuing this installation |
22498+
| process, you are bound by the terms of this license agreement. |
22499+
| If you do not agree with the terms of this license, you must abort |
22500+
| the installation process at this point. |
22501+
+------------------------------------------------------------------------+
22502+
22503+
Thank you for using csv_parser.
22504+
22505+
" >&5
22506+
echo "$as_me:
22507+
22508+
Environment configuration has completed successfully.
22509+
22510+
You are now ready to run make and make install.
22511+
22512+
This will install your csv_parser library object code into $prefix/lib and your development header files into $prefix/include/csv_parser
22513+
22514+
+------------------------------------------------------------------------+
22515+
| License: |
22516+
| This software is subject to the new BSD License, available in this |
22517+
| distribution in the file LICENSE. By continuing this installation |
22518+
| process, you are bound by the terms of this license agreement. |
22519+
| If you do not agree with the terms of this license, you must abort |
22520+
| the installation process at this point. |
22521+
+------------------------------------------------------------------------+
22522+
22523+
Thank you for using csv_parser.
22524+
22525+
" >&6;}
22526+

‎configure.ac

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,33 @@ AC_PROG_LIBTOOL
4141
dnl Grab the path where libtool is installed
4242
AC_CHECK_PROG(libtool_path, libtool, true, false)
4343

44+
dnl Insert the copyright notice
45+
AC_COPYRIGHT([Copyright (C) 2008 - 2009, Israel Ekpo, <[email protected]>])
46+
4447
dnl Save the settings into the Makefile
4548
AC_OUTPUT(Makefile)
4649

4750
dnl Save the changes into the csv_parser-config file
4851
AC_OUTPUT(csv_parser-config)
52+
53+
AC_MSG_NOTICE([
54+
55+
Environment configuration has completed successfully.
56+
57+
You are now ready to run make and make install.
58+
59+
This will install your csv_parser library object code into $prefix/lib and your development header files into $prefix/include/csv_parser
60+
61+
+------------------------------------------------------------------------+
62+
| License: |
63+
| This software is subject to the new BSD License, available in this |
64+
| distribution in the file LICENSE. By continuing this installation |
65+
| process, you are bound by the terms of this license agreement. |
66+
| If you do not agree with the terms of this license, you must abort |
67+
| the installation process at this point. |
68+
+------------------------------------------------------------------------+
69+
70+
Thank you for using csv_parser.
71+
72+
])
73+

‎csv_parser-config.in

Lines changed: 34 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,47 @@
11
#! /bin/sh
22

3-
includedir=@includedir@
4-
libdir=@libdir@
3+
pkgincludedir="@prefix@/include/csv_parser"
54

6-
usage()
7-
{
8-
cat <<EOF
9-
Usage: csv_parser-config [OPTION]
5+
pkglibdir="@prefix@/lib"
106

11-
Known values for OPTION are:
7+
version=@PACKAGE_VERSION@
128

13-
--libs print library linking information
14-
--cflags print pre-processor and compiler flags
15-
--help display this help and exit
16-
--version output version information
17-
EOF
9+
cxxflags="-I$pkgincludedir"
1810

19-
exit $1
20-
}
11+
include="-I$pkgincludedir"
12+
13+
libs="-L$pkglibdir -lcsv_parser"
14+
15+
# Displays how csv_parser-config is used
16+
usage () {
17+
cat <<EOF
2118
22-
if test $# -eq 0; then
23-
usage 1
24-
fi
19+
Usage: $0 [OPTIONS]
20+
21+
Available values for OPTIONS include the following :
22+
23+
--cflags [$cxxflags]
24+
--cxxflags [$cxxflags]
25+
--include [$include]
26+
--libs [$libs]
27+
--version [$version]
28+
EOF
29+
exit 1
30+
}
2531

26-
cflags=false
27-
libs=false
32+
if test $# -le 0; then usage; fi
2833

2934
while test $# -gt 0; do
30-
case "$1" in
31-
-*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
32-
*) optarg= ;;
33-
esac
34-
35-
case "$1" in
36-
--version)
37-
echo @VERSION@
38-
exit 0
39-
;;
40-
41-
--help)
42-
usage 0
43-
;;
44-
45-
--cflags)
46-
echo @XML_INCLUDEDIR@ @XML_CFLAGS@
47-
;;
48-
49-
--libs)
50-
echo @libdir@
51-
exit 0
52-
;;
53-
54-
*)
55-
usage
56-
exit 1
57-
;;
58-
esac
59-
shift
35+
case $1 in
36+
--cflags) echo "$cxxflags" ;;
37+
--cxxflags) echo "$cxxflags" ;;
38+
--include) echo "$include" ;;
39+
--libs) echo "$libs" ;;
40+
--version) echo "$version" ;;
41+
*) usage ;;
42+
esac
43+
44+
shift
6045
done
6146

6247
exit 0

0 commit comments

Comments
 (0)