Skip to content

Commit 8498bd9

Browse files
author
Paul Ramsey
committed
Autoconf getting closer
1 parent c145740 commit 8498bd9

File tree

3 files changed

+53
-7
lines changed

3 files changed

+53
-7
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@ autom4te.cache
55
configure
66
config.log
77
confdefs.h
8+
aclocal.m4
9+
config.status

autogen.sh

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#!/bin/sh
2+
#
3+
giveup()
4+
{
5+
echo
6+
echo " Something went wrong, giving up!"
7+
echo
8+
exit 1
9+
}
10+
11+
OSTYPE=`uname -s`
12+
13+
AUTOCONF=`which autoconf 2>/dev/null`
14+
if [ ! ${AUTOCONF} ]; then
15+
echo "Missing autoconf!"
16+
exit
17+
fi
18+
AUTOCONF_VER=`${AUTOCONF} --version | grep -E "^.*[0-9]$" | sed 's/^.* //'`
19+
20+
for aclocal in aclocal aclocal-1.10 aclocal-1.9; do
21+
ACLOCAL=`which $aclocal 2>/dev/null`
22+
if test -x "${ACLOCAL}"; then
23+
break;
24+
fi
25+
done
26+
if [ ! ${ACLOCAL} ]; then
27+
echo "Missing aclocal!"
28+
exit
29+
fi
30+
ACLOCAL_VER=`${ACLOCAL} --version | grep -E "^.*[0-9]$" | sed 's/^.* //'`
31+
32+
echo "* Running $ACLOCAL (${ACLOCAL_VER})"
33+
${ACLOCAL} -I macros || giveup
34+
35+
echo "* Running ${AUTOCONF} (${AUTOCONF_VER})"
36+
${AUTOCONF} || giveup
37+
38+
if test -f "${PWD}/configure"; then
39+
echo "======================================"
40+
echo "Now you are ready to run './configure'"
41+
echo "======================================"
42+
else
43+
echo " Failed to generate ./configure script!"
44+
giveup
45+
fi

configure.ac

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
dnl **********************************************************************
22
dnl * configure.ac
33
dnl *
4-
dnl * Pointclound buildb configuration.
4+
dnl * Pointclound build configuration.
55
dnl *
66
dnl * Copyright (c) 2012, OpenGeo
77
dnl *
88
dnl ***********************************************************************/
99

1010

1111
AC_INIT()
12-
dnl AC_CONFIG_HEADERS([postgis_config.h])
1312
AC_CONFIG_MACRO_DIR([macros])
1413

1514
dnl
@@ -229,9 +228,9 @@ CPPFLAGS="$PROJ_CPPFLAGS"
229228
AC_CHECK_HEADER([proj_api.h], [], [AC_MSG_ERROR([could not find proj_api.h - you may need to specify the directory of a PROJ.4 installation using --with-projdir])])
230229

231230
dnl Return the PROJ.4 version number
232-
AC_PROJ_VERSION([PROJ_VERSION])
233-
AC_DEFINE_UNQUOTED([PROJ_VERSION], [$PROJ_VERSION], [PROJ library version])
234-
AC_SUBST([PROJ_VERSION])
231+
AC_PROJ_VERSION([PC_PROJ_VERSION])
232+
AC_DEFINE_UNQUOTED([PC_PROJ_VERSION], [$PC_PROJ_VERSION], [PROJ library version])
233+
AC_SUBST([PC_PROJ_VERSION])
235234
CPPFLAGS="$CPPFLAGS_SAVE"
236235

237236
AC_SUBST([PROJ_CPPFLAGS])
@@ -257,8 +256,8 @@ dnl Output the relevant files
257256
dnl ===========================================================================
258257

259258
AC_OUTPUT([
260-
core/Makefile
261-
core/cunit/Makefile
259+
libpc/Makefile
260+
libpc/cunit/Makefile
262261
])
263262

264263
dnl ===========================================================================

0 commit comments

Comments
 (0)