X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/999d9a9f795cfc745681989ae0f30e531cde059f..ce8897bbff9d364dbef319bdec3db1126eb7fd92:/contrib/configure?ds=sidebyside diff --git a/contrib/configure b/contrib/configure index 5f5ab2decd..a3631abeb1 100755 --- a/contrib/configure +++ b/contrib/configure @@ -523,11 +523,15 @@ fi +if test "x$wx_cv_path_ifs" = "x"; then + { echo "configure: error: Please run configure from the top level directory." 1>&2; exit 1; } +fi + ESD_LINK= echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:531: checking how to run the C preprocessor" >&5 +echo "configure:535: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -542,13 +546,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:552: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:556: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -559,13 +563,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:573: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -576,13 +580,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:590: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -608,17 +612,17 @@ echo "$ac_t""$CPP" 1>&6 ac_safe=`echo "esd.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for esd.h""... $ac_c" 1>&6 -echo "configure:612: checking for esd.h" >&5 +echo "configure:616: checking for esd.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:626: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -636,7 +640,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for esd_close in -lesd""... $ac_c" 1>&6 -echo "configure:640: checking for esd_close in -lesd" >&5 +echo "configure:644: checking for esd_close in -lesd" >&5 ac_lib_var=`echo esd'_'esd_close | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -644,7 +648,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lesd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -691,6 +695,16 @@ fi PATH_IFS=$wx_cv_path_ifs WX_TARGET_LIBRARY=$wx_cv_target_library WX_TARGET_LIBRARY_TYPE=$wx_cv_target_libtype +WX_LIBRARY_BASENAME=$wx_cv_library_basename +WX_RELEASE=$wx_cv_release +WX_CURRENT=$wx_cv_current +WX_REVISION=$wx_cv_revision +WX_AGE=$wx_cv_age + + + + + @@ -812,32 +826,45 @@ done ac_given_srcdir=$srcdir trap 'rm -fr `echo " - Makefile src/Makefile + src/deprecated/Makefile src/ogl/Makefile src/mmedia/Makefile src/stc/Makefile + src/svg/Makefile src/xrc/Makefile - src/canvas/Makefile src/gizmos/Makefile src/plot/Makefile src/applet/Makefile + src/fl/Makefile + src/net/Makefile samples/Makefile + samples/deprecated/Makefile + samples/deprecated/proplist/Makefile + samples/deprecated/resource/Makefile + samples/deprecated/treelay/Makefile samples/mmedia/Makefile samples/ogl/Makefile samples/ogl/ogledit/Makefile samples/ogl/studio/Makefile samples/stc/Makefile - samples/canvas/Makefile - samples/canvas/test/Makefile - samples/canvas/simple/Makefile + samples/svg/Makefile samples/gizmos/Makefile + samples/gizmos/editlbox/Makefile + samples/gizmos/dynsash/Makefile + samples/gizmos/dynsash_switch/Makefile samples/gizmos/multicell/Makefile samples/gizmos/splittree/Makefile - samples/gizmos/editlbox/Makefile + samples/gizmos/led/Makefile samples/xrc/Makefile samples/plot/Makefile samples/applet/Makefile + samples/fl/Makefile + samples/fl/fl_demo1/Makefile + samples/fl/fl_demo2/Makefile + samples/fl/fl_sample1/Makefile + samples/fl/fl_sample2/Makefile + samples/fl/fl_sample3/Makefile utils/Makefile utils/wxrc/Makefile utils/wxrcedit/Makefile @@ -879,6 +906,11 @@ s%@PATH_IFS@%$PATH_IFS%g s%@ESD_LINK@%$ESD_LINK%g s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g s%@WX_TARGET_LIBRARY_TYPE@%$WX_TARGET_LIBRARY_TYPE%g +s%@WX_LIBRARY_BASENAME@%$WX_LIBRARY_BASENAME%g +s%@WX_RELEASE@%$WX_RELEASE%g +s%@WX_CURRENT@%$WX_CURRENT%g +s%@WX_REVISION@%$WX_REVISION%g +s%@WX_AGE@%$WX_AGE%g CEOF EOF @@ -920,32 +952,45 @@ EOF cat >> $CONFIG_STATUS <