Changeset 130633c for configure.ac


Ignore:
Timestamp:
Jul 17, 2009, 9:46:45 PM (12 years ago)
Author:
Nelson Elhage <nelhage@mit.edu>
Branches:
master, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9
Children:
2f2a643, f9c93cd
Parents:
a52d13a (diff), c08a725 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:
Merge branch 'automake'

Conflicts:
	Makefile.in
	libfaim/Makefile.in
	owl.h
File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    r4097723 r130633c  
    11dnl $Id$
    22dnl Process this file with autoconf to produce a configure script.
    3 AC_INIT(owl.c)
     3AC_INIT([BarnOwl],[1.3],[bug-barnowl@mit.edu])
     4AM_INIT_AUTOMAKE([-Wall foreign])
    45
    5 AC_CONFIG_HEADER(config.h)
     6AC_CONFIG_HEADER([config.h])
    67
    78AC_PROG_CC
    8 
    9 dnl If we're using GCC, enable all warnings
    10 if test "$GCC" = yes; then
    11      CFLAGS="$CFLAGS -Wall -g";
    12 fi
    139
    1410dnl Check for Athena
     
    9793   ])])
    9894
    99 AC_ARG_ENABLE([athstatic], AS_HELP_STRING([--enable-athstatic],
    100                                           [Statically link libraries in /usr/athena/lib]),
    101                                           [ATHSTATIC=./athstatic],
    102                                           [ATHSTATIC=])
    103 
    10495AC_CHECK_FUNCS(use_default_colors resizeterm des_string_to_key des_key_sched des_ecb_encrypt)
    10596AC_CHECK_FUNCS(                            DES_string_to_key  DES_ecb_encrypt DES_key_sched)
     
    143134dnl Add LDFLAGS for embedded perl
    144135FOO=`perl -MExtUtils::Embed -e ldopts`
    145 AC_MSG_NOTICE([Adding perl LDFLAGS ${FOO}])
    146 LDFLAGS=${LDFLAGS}\ ${FOO}
     136AC_MSG_NOTICE([Adding perl LIBS ${FOO}])
     137LIBS=${LIBS}\ ${FOO}
    147138
    148139dnl Add CFLAGS and LDFLAGS for glib-2.0
     
    154145LDFLAGS="${GLIB_LIBS} ${LDFLAGS}"
    155146
     147if test "x${prefix}" = "xNONE"; then
     148   prefix="${ac_default_prefix}"
     149fi
     150
     151AC_DEFINE_UNQUOTED([DATADIR],["${prefix}/share/${PACKAGE}"],
     152                   [Package data directory])
     153
    156154dnl Checks for typedefs, structures, and compiler characteristics.
    157 
    158 dnl Support --program-{prefix,suffix,transform}
    159 AC_ARG_PROGRAM
    160155
    161156AC_SUBST(XSUBPPDIR)
    162157AC_SUBST(XSUBPPFLAGS)
    163 AC_SUBST(ATHSTATIC)
    164158
    165159AC_PROG_INSTALL
     160AC_PROG_RANLIB
    166161
    167 AC_CONFIG_SUBDIRS(libfaim)
    168 
    169 AC_OUTPUT(Makefile)
     162AC_CONFIG_FILES([Makefile libfaim/Makefile])
     163AC_OUTPUT([perl/modules/Makefile])
Note: See TracChangeset for help on using the changeset viewer.