more samples are being built and samples/Makefiles uses SAMPLES_SUBDIRS

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index f2a77092c54f82e863a706c35e5eee704015946e..5e5ada0afb8542c1b9a34b87a2f2b67273eba160 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -440,6 +440,11 @@ USE_CYGWIN=
 USE_MINGW=
 USE_DATA_GENERAL=
 
 USE_MINGW=
 USE_DATA_GENERAL=
 

+dnl on some platforms xxx_r() functions are declared inside "#ifdef
+dnl _REENTRANT" and it's easier to just define this symbol for these platforms
+dnl than checking it during run-time
+NEEDS_D_REENTRANT_FOR_R_FUNCS=0
+

 dnl the list of all available toolkits
 ALL_TOOLKITS="CYGWIN GTK MINGW MOTIF WINE"
 
 dnl the list of all available toolkits
 ALL_TOOLKITS="CYGWIN GTK MINGW MOTIF WINE"
 


@@ -462,6 +467,7 @@ case "${host}" in
   *-hp-hpux* )
     USE_HPUX=1
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   *-hp-hpux* )
     USE_HPUX=1
     DEFAULT_DEFAULT_wxUSE_MOTIF=1

+    NEEDS_D_REENTRANT_FOR_R_FUNCS=1

     AC_DEFINE(__HPUX__)
   ;;
   *-*-linux* )
     AC_DEFINE(__HPUX__)
   ;;
   *-*-linux* )


@@ -489,6 +495,7 @@ case "${host}" in
     AC_DEFINE(__SOLARIS__)
     AC_DEFINE(__SVR4__)
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
     AC_DEFINE(__SOLARIS__)
     AC_DEFINE(__SVR4__)
     DEFAULT_DEFAULT_wxUSE_MOTIF=1

+    NEEDS_D_REENTRANT_FOR_R_FUNCS=1

   ;;
   *-*-sunos4* )
     USE_SUN=1
   ;;
   *-*-sunos4* )
     USE_SUN=1


@@ -2128,17 +2135,13 @@ else
   dnl on some systems, _REENTRANT should bedefined if we want to use any _r()
   dnl functions - add tests for other functions here as well
   if test "$ac_cv_func_strtok_r" = "yes"; then
   dnl on some systems, _REENTRANT should bedefined if we want to use any _r()
   dnl functions - add tests for other functions here as well
   if test "$ac_cv_func_strtok_r" = "yes"; then

-    dnl and now try with C++
-    unset ac_cv_func_strtok_r
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-    AC_CHECK_FUNCS(strtok_r)
-    AC_LANG_RESTORE
-
-    if test "$ac_cv_func_strtok_r" != "yes"; then
-      ac_cv_func_strtok_r=yes
-      CFLAGS="${CFLAGS} -D_REENTRANT"
-      CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
+    AC_MSG_CHECKING(if -D_REENTRANT is needed)
+    if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then
+        CFLAGS="${CFLAGS} -D_REENTRANT"
+        CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
+        AC_MSG_RESULT(yes)
+    else
+        AC_MSG_RESULT(no)

     fi
   fi
 fi
     fi
   fi
 fi


@@ -2367,6 +2370,7 @@ fi
 
 if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
   AC_DEFINE(wxUSE_DIALUP_MANAGER)
 
 if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
   AC_DEFINE(wxUSE_DIALUP_MANAGER)

+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS nettest"

 fi
 
 if test "$wxUSE_STREAMS" = "yes" ; then
 fi
 
 if test "$wxUSE_STREAMS" = "yes" ; then


@@ -2760,7 +2764,7 @@ fi
 
 if test "$wxUSE_SCROLLBAR" = "yes"; then
     AC_DEFINE(wxUSE_SCROLLBAR)
 
 if test "$wxUSE_SCROLLBAR" = "yes"; then
     AC_DEFINE(wxUSE_SCROLLBAR)

-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"

 fi
 
 if test "$wxUSE_SLIDER" = "yes"; then
 fi
 
 if test "$wxUSE_SLIDER" = "yes"; then


@@ -3049,6 +3053,7 @@ AC_OUTPUT([
             samples/dnd/Makefile
             samples/drawing/Makefile
             samples/forty/Makefile
             samples/dnd/Makefile
             samples/drawing/Makefile
             samples/forty/Makefile

+            samples/font/Makefile

             samples/fractal/Makefile
             samples/image/Makefile
             samples/internat/Makefile
             samples/fractal/Makefile
             samples/image/Makefile
             samples/internat/Makefile