2 Комити 43ca91c848 ... c8b933a210

Аутор SHA1 Порука Датум
  Menche c8b933a210 improve the build script a bit пре 9 година
  Menche 4c0392af74 add some line breaks to the license file пре 9 година
2 измењених фајлова са 29 додато и 37 уклоњено
  1. 10 2
      LICENSE
  2. 19 35
      configure

+ 10 - 2
LICENSE

@@ -1,5 +1,13 @@
 Copyright © 2015 Menche
 
-Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
 
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.

+ 19 - 35
configure

@@ -1,50 +1,34 @@
 #! /bin/sh
 
-if which ncursesw5-config >/dev/null
+if which ncurses5-config >/dev/null
 then
-
-echo "# automatically generated build configuration
-
-NCURSES_FLAGS  = $(ncursesw5-config --cflags)
-NCURSES_LIBS   = $(ncursesw5-config --libs)
-
-CPPFLAGS += \$(NCURSES_FLAGS)
-LDFLAGS  += \$(NCURSES_LIBS)
-
-CC ?= cc" > config.mk
-
+	echo 'using ncurses autoconfiguration script.'
+	NCURSES_FLAGS=$(ncurses5-config --cflags)
+	NCURSES_LIBS=$(ncurses5-config --libs)
 elif which pkg-config >/dev/null
 then
-
-echo 'ncurses autoconfiguration script not found!
-trying pkg-config…'
-
-echo "# automatically generated build configuration
-
-NCURSES_FLAGS  = $(pkg-config ncursesw --cflags)
-NCURSES_LIBS   = $(pkg-config ncursesw --libs)
-
-CPPFLAGS += \$(NCURSES_FLAGS)
-LDFLAGS  += \$(NCURSES_LIBS)
-
-CC ?= cc" > config.mk
-
+	echo 'ncurses autoconfiguration script not found!  trying pkg-config…'
+	NCURSES_FLAGS=$(pkg-config ncurses --cflags)
+	NCURSES_LIBS=$(pkg-config ncurses --libs)
 else
+	echo 'can not configure! you will have to manually specify flags.'
+	NCURSES_FLAGS='# manual configuration required'
+	NCURSES_LIBS='# manual configuration required'
+fi
 
-echo 'ncurses configuration failed!
-manual configuration will be required.'
+if [ $(uname -s) == 'FreeBSD' ]
+then
+	NCURSES_FLAGS="-I/usr/local/include $NCURSES_FLAGS"
+fi
 
 echo "# automatically generated build configuration
 
-NCURSES_FLAGS  = $(pkg-config ncursesw --cflags)
-NCURSES_LIBS   = $(pkg-config ncursesw --libs)
+NCURSES_FLAGS  = $NCURSES_FLAGS
+NCURSES_LIBS   = $NCURSES_LIBS
 
-CPPFLAGS += \$(NCURSES_FLAGS)
+CPPFLAGS += -Iincs \$(NCURSES_FLAGS)
 LDFLAGS  += \$(NCURSES_LIBS)
 
 CC ?= cc" > config.mk
-
-fi
-
-echo 'wrote config.mk'
+echo 'wrote config.mk.'