From 47e96a0c583df722f4d37ee42afcdc59b215f650 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 18 May 2007 04:22:46 +0000 Subject: [PATCH] Don't let PERL_PATH be ''. (#356769, Joseph Sacco) 2007-05-18 Michael Natterer * configure.in: Don't let PERL_PATH be ''. (#356769, Joseph Sacco) svn path=/trunk/; revision=5502 --- ChangeLog | 4 ++++ configure.in | 19 ++++++------------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a91228..4d4bf44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-05-18 Michael Natterer + + * configure.in: Don't let PERL_PATH be ''. (#356769, Joseph Sacco) + 2007-05-17 Michael Natterer * configure.in: hotfix: revert last change to fix the build on OS X. diff --git a/configure.in b/configure.in index 336f52d..6cd4bdb 100644 --- a/configure.in +++ b/configure.in @@ -350,7 +350,8 @@ AC_SUBST(REBUILD) # if test "x$PERL" != x ; then AC_PATH_PROG(PERL_PATH, [$PERL]) -else +fi +if test "x$PERL_PATH" = x ; then PERL_PATH="/usr/bin/env perl" fi AC_SUBST(PERL_PATH) @@ -2508,26 +2509,18 @@ _______EOF fi - if test x$g_have_gnuc_visibility = xyes ; then cat >>$outfile <<_______EOF #if __GNUC__ == 2 && __GNUC_MINOR__ == 95 #define G_GNUC_INTERNAL -#else +#elif defined (__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303) #define G_HAVE_GNUC_VISIBILITY 1 #define G_GNUC_INTERNAL __attribute__((visibility("hidden"))) -#endif -_______EOF - else - if test x$g_have_sunstudio_visibility = xyes ; then - cat >>$outfile <<_______EOF +#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550) #define G_GNUC_INTERNAL __hidden -_______EOF - else - cat >>$outfile <<_______EOF +#else #define G_GNUC_INTERNAL +#endif _______EOF - fi - fi echo >>$outfile -- 2.7.4