Merge pull request #24 from physicalist/master

Require configure prefix to be set

Author: dbeeman

.travis.yml

@@ -6,7 +6,7 @@ compiler:
 
 install:
   - cd src
-  - ./configure
+  - ./configure --prefix=`pwd`
   - make nxgenesis
   - cp startup/travis_simrc $HOME/.simrc
 

src/Makefile.BASE

@@ -10,7 +10,9 @@ RNG_CFLAGS ?= -O3 -D$(MACHINE) # -DLittleEndian has no effect
 ifeq ($(ARCH), powerpc)
   RNG_CFLAGS += -DBIGENDIAN
   CFLAGS += -DBIGENDIAN
-  LIBS += $(XPRELIBS)    # X11 backwards compatibility on 10.3.9
+  ifeq ($(MACHINE), Darwin)
+    LIBS += -lSM -lICE    # X11 backwards compatibility on 10.3.9
+  endif
 endif
 ifeq ($(ARCH), ppc64)
   RNG_CFLAGS += -DBIGENDIAN

src/Makefile.dist

@@ -4,6 +4,8 @@
 #		    The General Neural Simulation System
 #				 Version 2.4
 #
+VERSION = 2.4
+#
 # SYNOPSIS: This is the top-level Makefile for GENESIS.  
 #           YOU MUST EDIT THIS FILE BEFORE RUNNING "make".
 #           Please follow the procedure given below.
@@ -65,9 +67,15 @@
 # ----------------------------------------------------------------------
 
 # The following variable determines where GENESIS is placed by the
-# "make install" command. Substituting the full path here is preferable
-# to using `pwd`.
-INSTALLDIR	=	`pwd`/..
+# "make install" command. It can be changed by the user by calling
+# INSTALLDIR=<path> make install
+# Supplying PREFIX=<path> make install will install genesis to the
+# directory "<path>/genesis-2.4"
+ifdef $(PREFIX)
+  INSTALLDIR = $(PREFIX)/genesis-$(VERSION)
+else
+  INSTALLDIR ?= `pwd`/..
+endif
 
 # If /tmp is not big enough to contain compile-produced object files,
 # choose a different location here.
@@ -1557,7 +1565,7 @@ nxinstall: makedirs
 mininstall: makedirs
 	@make -f $(MF) MF="$(MF)" INSTALLDIR="$(INSTALLDIR)" INSTALLBIN="$(INSTALLBIN)" SPRNG_LIB="$(SPRNG_LIB)" MINSUBDIR="$(MINSUBDIR)" RANLIB="$(RANLIB)" mininstall
 
-VERSNAME="genesis-2.4"
+VERSNAME="genesis-$(VERSION)"
 bindist: genesis nxgenesis
 	make INSTALLDIR="`pwd`/../distributions/$(VERSNAME)/genesis" install
 	cp nxgenesis "../distributions/$(VERSNAME)/genesis"

src/Makefile.in

@@ -16,7 +16,7 @@ CC=@CC@
 CPP=@CPP@ -P
 LD=ld
 
-CFLAGS+=-D__NO_MATH_INLINES
+CFLAGS += -O2 -D__NO_MATH_INLINES
 
 RANLIB=@RANLIB@
 AR=ar
@@ -31,11 +31,11 @@ ifneq (@X_LIB@,)
 endif
 
 # X11's ICE, SM libraries break netcdf on OSX
-# (needed for backward compatibility?)
+# (uncomment if needed for backward compatibility)
 XPRELIBS=@X_PRE_LIBS@
-ifneq ($(MACHINE), Darwin)
-	LIBS += $(XPRELIBS)
-endif
+#ifneq ($(MACHINE), Darwin)
+#	LIBS += $(XPRELIBS)
+#endif
 
 
 # TODO:
@@ -51,7 +51,7 @@ TERMOPT=-DTERMIO -DDONT_USE_SIGIO
 
 # The following variable determines where GENESIS is placed by the
 # "make install" command
-INSTALLDIR ?= @prefix@/genesis
+INSTALLDIR ?= @prefix@/genesis-@PACKAGE_VERSION@
 
 # If /tmp is not big enough to contain compile-produced object files,
 # choose a different location here.

src/configure

@@ -1,6 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for genesis version-2.4g.
+# Generated by GNU Autoconf 2.69 for genesis 2.4.
+#
+# Report bugs to <genesis@genesis-sim.org>.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -264,10 +266,11 @@ fi
     $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and
+$0: genesis@genesis-sim.org about your system, including
+$0: any error possibly output before this message. Then
+$0: install a modern shell, or manually run the script
+$0: under such a shell if you do have one."
   fi
   exit 1
 fi
@@ -577,9 +580,9 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='genesis'
 PACKAGE_TARNAME='genesis'
-PACKAGE_VERSION='version-2.4g'
-PACKAGE_STRING='genesis version-2.4g'
-PACKAGE_BUGREPORT=''
+PACKAGE_VERSION='2.4'
+PACKAGE_STRING='genesis 2.4'
+PACKAGE_BUGREPORT='genesis@genesis-sim.org'
 PACKAGE_URL=''
 
 # Factoring default headers for most tests.
@@ -1239,7 +1242,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures genesis version-2.4g to adapt to many kinds of systems.
+\`configure' configures genesis 2.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1304,7 +1307,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of genesis version-2.4g:";;
+     short | recursive ) echo "Configuration of genesis 2.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1333,7 +1336,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to the package provider.
+Report bugs to <genesis@genesis-sim.org>.
 _ACEOF
 ac_status=$?
 fi
@@ -1396,7 +1399,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-genesis configure version-2.4g
+genesis configure 2.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1857,7 +1860,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by genesis $as_me version-2.4g, which was
+It was created by genesis $as_me 2.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2206,6 +2209,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+# If the user did not supply --prefix, we fail loudly
+# (taken from NEST's configure.ac)
+if test $prefix = NONE; then
+  echo "Please supply a valid installation prefix!"
+  echo "Example: ./configure --prefix=\$HOME/opt"
+  exit 1
+fi
+
+# check for correct compiler & libraries
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3995,7 +4007,6 @@ fi
     as_fn_error $? "bison|byacc|yacc not found. Please install _bison_ in order to compile Genesis." "$LINENO" 5
   fi
 fi
-
 for ac_prog in flex lex
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -5052,7 +5063,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by genesis $as_me version-2.4g, which was
+This file was extended by genesis $as_me 2.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5099,13 +5110,13 @@ Usage: $0 [OPTION]... [TAG]...
 Configuration files:
 $config_files
 
-Report bugs to the package provider."
+Report bugs to <genesis@genesis-sim.org>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-genesis config.status version-2.4g
+genesis config.status 2.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

src/configure.ac

@@ -1,8 +1,18 @@
-AC_INIT(genesis, version-2.4g)
+AC_PREREQ(2.52)
+AC_INIT([genesis], [2.4], [genesis@genesis-sim.org])
 
+# If the user did not supply --prefix, we fail loudly
+# (taken from NEST's configure.ac)
+if test $prefix = NONE; then
+  echo "Please supply a valid installation prefix!"
+  echo "Example: ./configure --prefix=\$HOME/opt"
+  exit 1
+fi
+
+# check for correct compiler & libraries
 AC_PROG_CC
 AC_PROG_CPP
-AC_PATH_X 
+AC_PATH_X
 AC_PATH_XTRA
 AC_PROG_RANLIB
 AC_PROG_YACC
@@ -12,7 +22,6 @@ if test x"$YACC" = "xyacc"; then
     AC_MSG_ERROR([[bison|byacc|yacc not found. Please install _bison_ in order to compile Genesis.]])
   fi
 fi
-
 AC_PROG_LEX
 if test x"$LEX" == x":" ; then
     AC_MSG_ERROR([flex|lex not found. Please install _flex_ in order to compile Genesis.])
@@ -26,8 +35,8 @@ AC_SUBST(X_LIB, $x_libraries)
 AC_SUBST(LEX, $LEX)
 AC_SUBST(LEXLIB, $LEXLIB)
 
-AC_CHECK_SIZEOF([long int]) 
-AS_IF([test "$ac_cv_sizeof_long_int" -eq 8], 
+AC_CHECK_SIZEOF([long int])
+AS_IF([test "$ac_cv_sizeof_long_int" -eq 8],
     [AC_DEFINE([LONGWORDS])])
 
 AC_OUTPUT(Makefile)