Skip to content

Commit

Permalink
smurf: use subdir-objects as suggested by autoconf, various other sug…
Browse files Browse the repository at this point in the history
…gested tweaks
  • Loading branch information
pwdraper committed Feb 26, 2014
1 parent 5c22b80 commit 8fb372e
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions applications/smurf/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ dnl Process this file with autoconf to produce a configure script
AC_REVISION($Revision$)

dnl Initialisation: package name and version number
AC_INIT(smurf, 1.5.0, scuba2dr@phas.ubc.ca)
AC_INIT([smurf],[1.5.0],[scuba2dr@phas.ubc.ca])
PACKAGE_UPCASE='SMURF'
AC_DEFINE( [PACKAGE_UPCASE], "SMURF", [Upper cased package name] )
AC_SUBST(PACKAGE_UPCASE)

dnl Require autoconf-2.50 at least
AC_PREREQ(2.50)
AM_INIT_AUTOMAKE(1.8.2-starlink)
AC_PREREQ([2.69])
AM_INIT_AUTOMAKE([1.8.2-starlink subdir-objects])

dnl Sanity-check: name a file in the source directory -- if this
dnl isn't found then configure will complain
Expand All @@ -24,7 +24,7 @@ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_INTEGER], $PACKAGE_VERSION_INTEGER,
dnl Find required versions of the programs we need for configuration
AC_PROG_CC
AC_PROG_FC
AC_PROG_LIBTOOL
LT_INIT

STAR_MONOLITHS
STAR_CHECK_PROGS( ifd2star )
Expand Down Expand Up @@ -60,7 +60,7 @@ if test "$GCC" = "yes"; then
AC_MSG_CHECKING([whether ${CC} accepts -fstack-protector])
fsp_old_cflags="$CFLAGS"
CFLAGS="$CFLAGS -fstack-protector -pedantic-errors"
AC_TRY_COMPILE(,,,[have_fsp=no])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[],[have_fsp=no])
echo $have_fsp
if test "$have_fsp" = "no"; then
CFLAGS="$fsp_old_cflags $SMURF_CFLAGS"
Expand Down

0 comments on commit 8fb372e

Please sign in to comment.