Skip to content

Commit 9733e34

Browse files
author
Jordan Bieder
committed
Last adjustments
1 parent a69cb2f commit 9733e34

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

autogen.sh

+6-1
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,12 @@ EOF
265265
cat configure.tmp configure2 > configure.ac
266266
rm configure.tmp
267267

268-
LIBTOOLIZE=$(which glibtoolize libtoolize)
268+
LIBTOOLIZE=$(which glibtoolize 2> /dev/null || which libtoolize 2> /dev/null)
269+
if [ -z "$LIBTOOLIZE" ]
270+
then
271+
echo "Missign libtoolize or glibtoolize"
272+
exit 1
273+
fi
269274
#if test "$OSTYPE" = "darwin*"
270275
#then
271276
# LIBTOOLIZE=glibtoolize

src/base/utils.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,6 @@ std::string agateVersion(){
483483

484484
std::string agateLatestVersion(){
485485
#ifdef HAVE_CURL
486-
#if defined(__GNUC__) && __GNUC_PREREQ(4,9)
487486
static std::string latest;
488487
if ( latest.empty() ) {
489488
latest = PACKAGE_VERSION;
@@ -521,9 +520,6 @@ std::string agateLatestVersion(){
521520
#else
522521
return PACKAGE_VERSION;
523522
#endif
524-
#else
525-
return PACKAGE_VERSION;
526-
#endif
527523
}
528524

529525
std::string spglibVersion(){

0 commit comments

Comments
 (0)