Diff of /satellite/satellite4/aclocal.m4

OSDN > Find Software > SATELLITE : System Analysis Total Environment

 Browse CVS Repository



/[OSDN]/satellite/satellite4/aclocal.m4




Diff of /satellite/satellite4/aclocal.m4



 Parent Directory

|  Revision Log


|  Revision Graph


|  Patch














revision 1.4 by orrisroot,
Thu Jul 29 15:13:34 2004 UTC




revision 1.5 by orrisroot,
Wed Feb 23 09:14:48 2005 UTC






#

Line 7059 
 dnl


Line 7059 
 dnl












7059
 AC_DEFUN(AM_PATH_XTOOLKIT,
 AC_DEFUN(AM_PATH_XTOOLKIT,

















7060
 [dnl
 [dnl

















7061
 
 














 
 













7062
 # Change these status
 # Change these status

















7063
 
 

















7064
 # check_motif="no"
 # check_motif="no"











#

Line 7094 
 have_xaw="no"


Line 7093 
 have_xaw="no"












7093
 
 

















7094
 AC_PATH_XTRA
 AC_PATH_XTRA

















7095
 
 















7096


 dnl TODO: stop at error


 if test "x$check_xaw3d" = xyes; then













7097


 


 AC_ARG_WITH(xaw3d,













7098


 


             [  --with-xaw3d[[=prefix]]   use Xaw3d for X widget set],













7099


 


             with_xaw3d=yes && xaw3d_prefix="$withval", 













7100


 


             with_xaw3d=no  && xaw3d_prefix="")













7101


 


   if test "x$with_xaw3d" = xyes; then













7102


 


     check_xaw="no"













7103


 


     check_xaw3d_error="yes"













7104


 


   fi













7105


 


   if test "x$xaw3d_prefix" = x ; then













7106


 


     XAW3D_INCLUDES=""













7107


 


     XAW3D_LFLAGS=""













7108


 


   else













7109


 


     XAW3D_INCLUDES="-I$xaw3d_prefix/include"













7110


 


     XAW3D_LFLAGS="-L$xaw3d_prefix/lib"













7111


 


   fi













7112


 


 fi















7113
 
 

















7114
 
 

















7115
 #
 #











#

Line 7231 
 if test "x$check_xaw3d" = xyes; then


Line 7246 
 if test "x$check_xaw3d" = xyes; then












7246
 #
 #

















7247
   save_cflags="$CFLAGS"
   save_cflags="$CFLAGS"

















7248
   save_libs="$LIBS"
   save_libs="$LIBS"















7249


   CFLAGS="$save_cflags $X_CFLAGS"


   CFLAGS="$save_cflags $X_CFLAGS $XAW3D_INCLUDES"













7250


   LIBS="$X_LIBS $XEXTLIB $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $save_libs"


   LIBS="$X_LIBS $XAW3D_LFLAGS $XEXTLIB $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $save_libs"















7251
   AC_CHECK_LIB(Xpm, XpmCreatePixmapFromBuffer, XPMLIB="-lXpm", XPMLIB="", $LIBS)
   AC_CHECK_LIB(Xpm, XpmCreatePixmapFromBuffer, XPMLIB="-lXpm", XPMLIB="", $LIBS)

















7252
   CFLAGS="$save_cflags"
   CFLAGS="$save_cflags"

















7253
   LIBS="$save_libs"
   LIBS="$save_libs"











#

Line 7243 
 if test "x$check_xaw3d" = xyes; then


Line 7258 
 if test "x$check_xaw3d" = xyes; then












7258
 #
 #

















7259
   save_cflags="$CFLAGS"
   save_cflags="$CFLAGS"

















7260
   save_libs="$LIBS"
   save_libs="$LIBS"















7261


   CFLAGS="$save_cflags $X_CFLAGS"


   CFLAGS="$save_cflags $X_CFLAGS $XAW3D_INCLUDES"













7262


   LIBS="$X_LIBS $XPMLIB $XMULIB $XTLIB $XEXTLIB $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $save_libs"


   LIBS="$X_LIBS  $XAW3D_LFLAGS $XPMLIB $XMULIB $XTLIB $XEXTLIB $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $save_libs"















7263
   AC_CHECK_LIB(Xaw3d, main, XAW3DLIB="-lXaw3d", XAW3DLIB="", $LIBS)
   AC_CHECK_LIB(Xaw3d, main, XAW3DLIB="-lXaw3d", XAW3DLIB="", $LIBS)

















7264
   CFLAGS="$save_cflags"
   CFLAGS="$save_cflags"

















7265
   LIBS="$save_libs"
   LIBS="$save_libs"











#

Line 7257 
 if test "x$check_xaw3d" = xyes; then


Line 7272 
 if test "x$check_xaw3d" = xyes; then












7272
   else
   else

















7273
     have_xaw3d="yes"
     have_xaw3d="yes"

















7274
     XAW3D_CFLAGS="-DHAVE_XAW3D $X_CFLAGS"
     XAW3D_CFLAGS="-DHAVE_XAW3D $X_CFLAGS"















7275


     XAW3D_LIBS="$X_LIBS $XAW3DLIB $XPMLIB $XMULIB $XTLIB $XEXTLIB $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"


     XAW3D_LIBS="$X_LIBS $XAW3D_LFLAGS $XAW3DLIB $XPMLIB $XMULIB $XTLIB $XEXTLIB $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"















7276
   fi
   fi

















7277
 fi
 fi

















7278
 # end of check_xaw3d
 # end of check_xaw3d











#

Line 7266 
 fi


Line 7281 
 fi












7281
 
 

















7282
 
 

















7283
 # set XTOOLKIT_CFLAGS and XTOOLKIT_LIBS variables
 # set XTOOLKIT_CFLAGS and XTOOLKIT_LIBS variables












7284
 
 AC_MSG_CHECKING(for X Toolkit)












7285
 if test "x$have_motif" = xyes; then
 if test "x$have_motif" = xyes; then

















7286
   XTOOLKIT_CFLAGS="$XM_CFLAGS"
   XTOOLKIT_CFLAGS="$XM_CFLAGS"

















7287
   XTOOLKIT_LIBS="$XM_LIBS"
   XTOOLKIT_LIBS="$XM_LIBS"












7288
 
   AC_MSG_RESULT([Motif : libraries $XTOOLKIT_LIBS, cflags $XTOOLKIT_CFLAGS])












7289
 elif test "x$have_xaw3d" = xyes; then
 elif test "x$have_xaw3d" = xyes; then

















7290
   XTOOLKIT_CFLAGS="$XAW3D_CFLAGS"
   XTOOLKIT_CFLAGS="$XAW3D_CFLAGS"

















7291
   XTOOLKIT_LIBS="$XAW3D_LIBS"
   XTOOLKIT_LIBS="$XAW3D_LIBS"












7292
 
   AC_MSG_RESULT([Xaw3d : libraries $XTOOLKIT_LIBS, cflags $XTOOLKIT_CFLAGS])












7293
 elif test "x$have_xaw" = xyes; then
 elif test "x$have_xaw" = xyes; then

















7294
   XTOOLKIT_CFLAGS="$XAW_CFLAGS"
   XTOOLKIT_CFLAGS="$XAW_CFLAGS"

















7295
   XTOOLKIT_LIBS="$XAW_LIBS"
   XTOOLKIT_LIBS="$XAW_LIBS"












7296
 
   AC_MSG_RESULT([Xaw : libraries $XTOOLKIT_LIBS, cflags $XTOOLKIT_CFLAGS])












7297
 else
 else












7298
 
   AC_MSG_RESULT([no])












7299
   AC_MSG_ERROR([suitable Widget set could not be found])
   AC_MSG_ERROR([suitable Widget set could not be found])

















7300
 fi
 fi














 
 













7301
 AC_SUBST(XTOOLKIT_CFLAGS)
 AC_SUBST(XTOOLKIT_CFLAGS)

















7302
 AC_SUBST(XTOOLKIT_LIBS)
 AC_SUBST(XTOOLKIT_LIBS)

















7303
 
 





























Legend:



Removed from v.1.4
 


changed lines


 
Added in v.1.5













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[OSDN]/satellite/satellite4/aclocal.m4
-revision 1.4 by orrisroot,
Thu Jul 29 15:13:34 2004 UTC
+revision 1.5 by orrisroot,
Wed Feb 23 09:14:48 2005 UTC
 Line 7059 
 dnl
  AC_DEFUN(AM_PATH_XTOOLKIT,
  [dnl
  # Change these status
  # check_motif="no"
-Line 7094 
 have_xaw="no"
+Line 7093 
 have_xaw="no"
  AC_PATH_XTRA
- dnl TODO: stop at error
+ if test "x$check_xaw3d" = xyes; then
+ AC_ARG_WITH(xaw3d,
+             [  --with-xaw3d[[=prefix]]   use Xaw3d for X widget set],
+             with_xaw3d=yes && xaw3d_prefix="$withval",
+             with_xaw3d=no  && xaw3d_prefix="")
+   if test "x$with_xaw3d" = xyes; then
+     check_xaw="no"
+     check_xaw3d_error="yes"
+   fi
+   if test "x$xaw3d_prefix" = x ; then
+     XAW3D_INCLUDES=""
+     XAW3D_LFLAGS=""
+   else
+     XAW3D_INCLUDES="-I$xaw3d_prefix/include"
+     XAW3D_LFLAGS="-L$xaw3d_prefix/lib"
+   fi
+ fi
  #
-Line 7231 
 if test "x$check_xaw3d" = xyes; then
+Line 7246 
 if test "x$check_xaw3d" = xyes; then
  #
    save_cflags="$CFLAGS"
    save_libs="$LIBS"
-   CFLAGS="$save_cflags $X_CFLAGS"
+   CFLAGS="$save_cflags $X_CFLAGS $XAW3D_INCLUDES"
-   LIBS="$X_LIBS $XEXTLIB $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $save_libs"
+   LIBS="$X_LIBS $XAW3D_LFLAGS $XEXTLIB $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $save_libs"
    AC_CHECK_LIB(Xpm, XpmCreatePixmapFromBuffer, XPMLIB="-lXpm", XPMLIB="", $LIBS)
    CFLAGS="$save_cflags"
    LIBS="$save_libs"
-Line 7243 
 if test "x$check_xaw3d" = xyes; then
+Line 7258 
 if test "x$check_xaw3d" = xyes; then
  #
    save_cflags="$CFLAGS"
    save_libs="$LIBS"
-   CFLAGS="$save_cflags $X_CFLAGS"
+   CFLAGS="$save_cflags $X_CFLAGS $XAW3D_INCLUDES"
-   LIBS="$X_LIBS $XPMLIB $XMULIB $XTLIB $XEXTLIB $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $save_libs"
+   LIBS="$X_LIBS  $XAW3D_LFLAGS $XPMLIB $XMULIB $XTLIB $XEXTLIB $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $save_libs"
    AC_CHECK_LIB(Xaw3d, main, XAW3DLIB="-lXaw3d", XAW3DLIB="", $LIBS)
    CFLAGS="$save_cflags"
    LIBS="$save_libs"
-Line 7257 
 if test "x$check_xaw3d" = xyes; then
+Line 7272 
 if test "x$check_xaw3d" = xyes; then
    else
      have_xaw3d="yes"
      XAW3D_CFLAGS="-DHAVE_XAW3D $X_CFLAGS"
-     XAW3D_LIBS="$X_LIBS $XAW3DLIB $XPMLIB $XMULIB $XTLIB $XEXTLIB $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+     XAW3D_LIBS="$X_LIBS $XAW3D_LFLAGS $XAW3DLIB $XPMLIB $XMULIB $XTLIB $XEXTLIB $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
    fi
  fi
  # end of check_xaw3d
-Line 7266 
 fi
+Line 7281 
 fi
  # set XTOOLKIT_CFLAGS and XTOOLKIT_LIBS variables
+ AC_MSG_CHECKING(for X Toolkit)
  if test "x$have_motif" = xyes; then
    XTOOLKIT_CFLAGS="$XM_CFLAGS"
    XTOOLKIT_LIBS="$XM_LIBS"
+   AC_MSG_RESULT([Motif : libraries $XTOOLKIT_LIBS, cflags $XTOOLKIT_CFLAGS])
  elif test "x$have_xaw3d" = xyes; then
    XTOOLKIT_CFLAGS="$XAW3D_CFLAGS"
    XTOOLKIT_LIBS="$XAW3D_LIBS"
+   AC_MSG_RESULT([Xaw3d : libraries $XTOOLKIT_LIBS, cflags $XTOOLKIT_CFLAGS])
  elif test "x$have_xaw" = xyes; then
    XTOOLKIT_CFLAGS="$XAW_CFLAGS"
    XTOOLKIT_LIBS="$XAW_LIBS"
+   AC_MSG_RESULT([Xaw : libraries $XTOOLKIT_LIBS, cflags $XTOOLKIT_CFLAGS])
  else
+   AC_MSG_RESULT([no])
    AC_MSG_ERROR([suitable Widget set could not be found])
  fi
  AC_SUBST(XTOOLKIT_CFLAGS)
  AC_SUBST(XTOOLKIT_LIBS)
 Legend:



Removed from v.1.4
 


changed lines


 
Added in v.1.5
 Legend:



Removed from v.1.4
 


changed lines


 
Added in v.1.5
-Removed from v.1.4
+Added in v.1.5
-Back to OSDN">Back to OSDN
+ViewVC Help
 Powered by ViewVC 1.1.26

Develop and Download Open Source Software

SATELLITE : System Analysis Total Environment

Browse CVS Repository