PennMUSH Community

Changeset 1207

Show
Ignore:
Timestamp:
01/20/08 21:06:13 (7 months ago)
Author:
shawnw
Message:

Tweaks to configure.iin and Makefile (Need to rebuild configure on an autoconf 2.61 system)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • 1.8.3/branches/devel/Makefile.in

    r1166 r1207  
    2121SQL_LDFLAGS=@MYSQL_LDFLAGS@ @POSTGRESQL_LDFLAGS@ @SQLITE3_LDFLAGS@ 
    2222 
    23 CCFLAGS=@CFLAGS@ -I.. -I../hdrs @PCRE_CFLAGS@ 
     23CCFLAGS=@CFLAGS@ -I.. -I../hdrs @CPPFLAGS@ @PCRE_CFLAGS@ 
    2424LDFLAGS=@LDFLAGS@  
    2525CLIBS=@LIBS@ @PCRE_LIBS@ 

  • 1.8.3/branches/devel/configure.in

    r1195 r1207  
    3030AC_PROG_LN_S 
    3131AC_PATH_PROG(MAKE, make) 
     32 
    3233AC_PATH_PROG(PERL, perl) 
     34if test "${PERL+set}" != "set"; then 
     35   AC_MSG_ERROR([perl is required to build and run PennMUSH]) 
     36fi 
     37 
    3338AC_PATH_PROG(TEST, test) 
    3439AC_PATH_PROG(TOUCH, touch) 
    3540AC_PATH_PROG(RM, rm) 
    36 # AC_PATH_PROG(EXPAND, expand) 
    3741AC_PATH_PROG(INDENT, indent) 
    3842AC_PATH_PROG(CTAGS, ctags) 
    …… 
    4549# maybe use them instead? 
    4650if test $DEFAULT_CFLAGS = yes; then 
    47  if test "x$GDB" != x; then 
    48   if test "x$ac_cv_c_compiler_gnu" = xyes; then 
     51 if test "${GDB+set}" = "set"; then 
     52  if test "${ac_cv_c_compiler_gnu+set}" = "set"; then 
    4953CFLAGS="-ggdb $CFLAGS -W -Wall -pedantic -Wno-comment" 
    5054   else 
    …… 
    5963   CFLAGS="$CFLAGS -fstack-protector" 
    6064], []) 
    61                     
    62 if test $build_os = darwin -a $build_cpu = powerpc; then 
    63   AX_GCC_OPTION([-mdynamic-no-pic], [], [], [ 
    64      CFLAGS="$CFLAGS -mdynamic-no-pic" 
    65   ], []) 
    66 fi 
    67  
    68  
    69 if test "x$CTAGS" = x -a "x$EXCTAGS" != x; then 
     65 
     66case "${build_cpu}-${build_os}" in 
     67  powerpc*-darwin*)  
     68   AX_GCC_OPTION([-mdynamic-no-pic], [], [], [ 
     69      CFLAGS="$CFLAGS -mdynamic-no-pic" 
     70   ], []) 
     71  ;; 
     72csac 
     73 
     74if test "${CTAGS+set}" != "set" -a "${EXCTAGS+set}" = "set"; then 
    7075    CTAGS=$EXCTAGS 
    7176fi 
    7277 
    73 if test "x$ETAGS" = x -a "x$EXCTAGS" != x; then 
     78if test "${ETAGS+set}" != "set" -a "${EXCTAGS+set}" = "set"; then 
    7479    ETAGS="$EXCTAGS -e" 
    7580fi 
    7681 
    7782AC_PATH_PROG(UPTIME, uptime) 
    78 if test "x$UPTIME" != x; then 
     83if test "${UPTIME+set}" = "set"; then 
    7984 AC_DEFINE([HAVE_UPTIME]) 
    8085 AC_DEFINE_UNQUOTED([UPTIME], "$UPTIME") 
    …… 
    8388AC_ARG_VAR(SENDMAIL, Path to sendmail) 
    8489AC_PATH_PROG(SENDMAIL, sendmail) 
    85 if test "x$SENDMAIL" != x; then 
     90if test "${SENDMAIL+set}" = "set"; then 
    8691 AC_DEFINE([HAVE_SENDMAIL]) 
    8792 AC_DEFINE_UNQUOTED([SENDMAIL], "$SENDMAIL") 
    …… 
    166171# system libpcre 
    167172AX_PATH_LIB_PCRE() 
    168 if test "no$PCRE_LIBS" != "no"; then 
     173if test "${PCRE_LIBS+set}" = "set"; then 
    169174   AC_DEFINE(HAVE_PCRE) 
    170175fi 
    …… 
    291296 
    292297### Misc features 
    293 AC_ARG_ENABLE(ipv6,  AS_HELP_STRING([--disable-ipv6], [Don't use IPv6 networking]), enable_ipv6=$enableval, enable_ipv6=yes) 
     298AC_ARG_ENABLE(ipv6,  AS_HELP_STRING([--disable-ipv6], 
     299      [Don't use IPv6 networking]), enable_ipv6=$enableval, enable_ipv6=yes) 
    294300 
    295301if test "$enable_ipv6" = "no"; then 
    …… 
    297303fi 
    298304 
    299 AC_ARG_ENABLE(nls, AS_HELP_STRING([--disable-nls], [Don't use message-translation]), enable_nls=$enableval, enable_nls=yes) 
     305AC_ARG_ENABLE(nls, AS_HELP_STRING([--disable-nls], 
     306  [Don't use message-translation]), enable_nls=$enableval, enable_nls=yes) 
    300307 
    301308if test "$enable_nls" = "no"; then